Merge pull request #9603 from magento-gl/spartans_pr_18022025

[Spartans] BugFixes Delivery

Author: glo71317

app/code/Magento/Catalog/Plugin/Model/CategoryRepositoryPlugin.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Plugin\Model;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\CategoryRepository;
+
+/**
+ * Plugin for category repository
+ */
+class CategoryRepositoryPlugin
+{
+    private const ATTRIBUTES_TO_PROCESS = [
+        'url_key',
+        'url_path'
+    ];
+
+    /**
+     * Formats category url key and path using the default formatter.
+     *
+     * @param CategoryRepository $subject
+     * @param CategoryInterface $category
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSave(CategoryRepository $subject, CategoryInterface $category): array
+    {
+        foreach (self::ATTRIBUTES_TO_PROCESS as $attributeKey) {
+            $attribute = $category->getCustomAttribute($attributeKey);
+            if ($attribute !== null) {
+                $value = $category->getData($attributeKey);
+                $formattedValue = $category->formatUrlKey($value);
+                $attribute->setValue($formattedValue);
+            }
+        }
+        return [$category];
+    }
+}

app/code/Magento/Catalog/Test/Unit/Plugin/Model/CategoryRepositoryPluginTest.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Plugin\Model;
+
+use Magento\Catalog\Plugin\Model\CategoryRepositoryPlugin;
+use Magento\Catalog\Model\CategoryRepository;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\Api\AttributeInterface;
+use Magento\Catalog\Model\Category;
+
+class CategoryRepositoryPluginTest extends TestCase
+{
+    /**
+     * @var CategoryRepositoryPlugin
+     */
+    private $categoryRepositoryPluginMock;
+
+    /**
+     * @var CategoryRepository|MockObject
+     */
+    private $categoryRepositoryMock;
+
+    /**
+     * @var Category|MockObject
+     */
+    private $categoryMock;
+
+    protected function setUp(): void
+    {
+        $this->categoryRepositoryMock = $this->createMock(CategoryRepository::class);
+        $this->categoryMock = $this->createMock(Category::class);
+        $this->categoryRepositoryPluginMock = new CategoryRepositoryPlugin();
+    }
+
+    /**
+     * Test beforeSave method
+     */
+    public function testBeforeSave()
+    {
+        $attributeMock = $this->createMock(AttributeInterface::class);
+        $urlKey = 'new test Cat (1)!';
+        $formattedUrlKey = 'new-test-cat-1';
+        $this->categoryMock->method('getCustomAttribute')
+            ->willReturnMap([
+                ['url_key', $attributeMock],
+                ['url_path', $attributeMock],
+            ]);
+
+        $this->categoryMock->method('getData')
+            ->willReturn($urlKey);
+
+        $this->categoryMock->method('formatUrlKey')
+            ->willReturn($formattedUrlKey);
+
+        $result = $this->categoryRepositoryPluginMock->beforeSave($this->categoryRepositoryMock, $this->categoryMock);
+        $this->assertSame([$this->categoryMock], $result);
+    }
+}

app/code/Magento/Catalog/etc/webapi_rest/di.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 -->
 
@@ -44,4 +44,7 @@
         <plugin name="reindex_after_save_product_links" type="Magento\Catalog\Plugin\Api\ProductLinkRepositoryInterface\ReindexAfterSaveProductLinksPlugin"/>
         <plugin name="reindex_after_delete_by_id_product_links" type="Magento\Catalog\Plugin\Api\ProductLinkRepositoryInterface\ReindexAfterDeleteByIdProductLinksPlugin"/>
     </type>
+    <type name="Magento\Catalog\Model\CategoryRepository">
+        <plugin name="format_category_url_key_rest_api" type="Magento\Catalog\Plugin\Model\CategoryRepositoryPlugin" />
+    </type>
 </config>

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductName.php

@@ -34,8 +34,8 @@ public function resolve(
         Field $field,
         $context,
         ResolveInfo $info,
-        array $value = null,
-        array $args = null
+        ?array $value = null,
+        ?array $args = null
     ): string {
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));