Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3900' into PR_2025_06_25_muntianu

Author: katmoon

app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php

@@ -8,6 +8,7 @@
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\Product;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\CatalogUrlRewrite\Model\ObjectRegistry;
@@ -18,6 +19,8 @@
 use Magento\CatalogUrlRewrite\Model\Map\UrlRewriteFinder;
 use Magento\Framework\App\ObjectManager;
 use Magento\UrlRewrite\Model\MergeDataProviderFactory;
+use Magento\CatalogUrlRewrite\Block\UrlKeyRenderer;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -27,18 +30,21 @@ class CurrentUrlRewritesRegenerator
     /**
      * @var Product
      * @deprecated 100.1.0
+     * @see not used
      */
     protected $product;
 
     /**
      * @var ObjectRegistry
      * @deprecated 100.1.0
+     * @see not used
      */
     protected $productCategories;
 
     /**
      * @var UrlFinderInterface
      * @deprecated 100.1.0
+     * @see not used
      */
     protected $urlFinder;
 
@@ -72,21 +78,28 @@ class CurrentUrlRewritesRegenerator
      */
     private $categoryRepository;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private ScopeConfigInterface $scopeConfig;
+
     /**
      * @param UrlFinderInterface $urlFinder
      * @param ProductUrlPathGenerator $productUrlPathGenerator
      * @param UrlRewriteFactory $urlRewriteFactory
      * @param UrlRewriteFinder|null $urlRewriteFinder
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
      * @param CategoryRepository|null $categoryRepository
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         UrlFinderInterface $urlFinder,
         ProductUrlPathGenerator $productUrlPathGenerator,
         UrlRewriteFactory $urlRewriteFactory,
         ?UrlRewriteFinder $urlRewriteFinder = null,
         ?MergeDataProviderFactory $mergeDataProviderFactory = null,
-        ?CategoryRepository $categoryRepository = null
+        ?CategoryRepository $categoryRepository = null,
+        ?ScopeConfigInterface $scopeConfig = null
     ) {
         $this->urlFinder = $urlFinder;
         $this->productUrlPathGenerator = $productUrlPathGenerator;
@@ -98,6 +111,7 @@ public function __construct(
         }
         $this->categoryRepository = $categoryRepository ?: ObjectManager::getInstance()->get(CategoryRepository::class);
         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -119,6 +133,14 @@ public function generate($storeId, Product $product, ObjectRegistry $productCate
             $rootCategoryId
         );
 
+        $isSaveHistory = $this->scopeConfig->isSetFlag(
+            UrlKeyRenderer::XML_PATH_SEO_SAVE_HISTORY,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+
+        $product->setData('save_rewrites_history', $isSaveHistory);
+
         foreach ($currentUrlRewrites as $currentUrlRewrite) {
             $category = $this->retrieveCategoryFromMetadata($currentUrlRewrite, $productCategories);
             if ($category === false) {
@@ -158,10 +180,12 @@ public function generateAnchor(
             ProductUrlRewriteGenerator::ENTITY_TYPE,
             $rootCategoryId
         );
-
-        foreach ($productCategories->getList() as $productCategory) {
-            $anchorCategoryIds = array_merge($productCategory->getAnchorsAbove(), $anchorCategoryIds);
-        }
+        $anchorCategoryIds = array_merge(
+            ...array_map(
+                fn($productCategory) => $productCategory->getAnchorsAbove(),
+                $productCategories->getList()
+            )
+        );
 
         foreach ($currentUrlRewrites as $currentUrlRewrite) {
             $metadata = $currentUrlRewrite->getMetadata();
@@ -181,6 +205,8 @@ public function generateAnchor(
     }
 
     /**
+     * Generate URL rewrites for autogenerated URLs
+     *
      * @param UrlRewrite $url
      * @param int $storeId
      * @param Category|null $category
@@ -209,6 +235,8 @@ protected function generateForAutogenerated($url, $storeId, $category, $product
     }
 
     /**
+     * Generate URL rewrites for custom URLs
+     *
      * @param UrlRewrite $url
      * @param int $storeId
      * @param Category|null $category
@@ -237,6 +265,8 @@ protected function generateForCustom($url, $storeId, $category, $product = null)
     }
 
     /**
+     * Retrieve category from URL metadata
+     *
      * @param UrlRewrite $url
      * @param ObjectRegistry|null $productCategories
      * @return Category|null|bool

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -278,8 +278,11 @@ public function testProductUrlRewritePerStoreViews(): void
             $product
         );
         $urlRewriteItems = $this->getEntityRewriteCollection($product->getId())->getItems();
-        $this->assertTrue(count($urlRewriteItems) == 2);
+        $this->assertTrue(count($urlRewriteItems) == 3);
         foreach ($urlRewriteItems as $item) {
+            if ((int) $item->getRedirectType() == OptionProvider::PERMANENT) {
+                continue;
+            }
             $item->getData('store_id') == $secondStoreId
                 ? $this->assertEquals($urlKeySecondStore . $this->suffix, $item->getRequestPath())
                 : $this->assertEquals($urlKeyFirstStore . $this->suffix, $item->getRequestPath());

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php

@@ -82,7 +82,8 @@ function (UrlRewrite $urlRewrite) {
 
         $expected = [
             'store-1-key.html',
-            'cat-1/store-1-key.html'
+            'cat-1/store-1-key.html',
+            'p002.html'
         ];
         self::assertEquals($expected, $actual, 'Generated URLs rewrites do not match.');
     }
@@ -118,16 +119,17 @@ function (UrlRewrite $urlRewrite) {
                 $generatedUrls
             )
         );
+        sort($actual);
 
         $expected = [
-            'store-1-key.html', // the Default store
-            'store-1-key.html', // the Secondary store
+            'cat-1-2/p002.html', // the Secondary store with Category URL key, first store view
+            'cat-1-2/p002.html', // the Secondary store with Category URL key, second store view
             'cat-1/store-1-key.html', // the Default store with Category URL key, first store view
             'cat-1/store-1-key.html', // the Default store with Category URL key, second store view
-            'p002.html', // the Default store
             'p002.html', // the Secondary store
-            'cat-1-2/p002.html', // the Secondary store with Category URL key, first store view
-            'cat-1-2/p002.html', // the Secondary store with Category URL key, second store view
+            'p002.html', // the Default store
+            'store-1-key.html', // the Default store
+            'store-1-key.html', // the Secondary store
         ];
         self::assertEquals($expected, $actual, 'Generated URLs rewrites do not match.');
     }