MC-4244: Skip URL rewrites multiplication

Author: slopukhov

app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php

@@ -14,6 +14,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Tests\NamingConvention\true\string;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Model\Storage\DbStorage as BaseDbStorage;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
@@ -140,7 +141,7 @@ protected function doFindAllByData(array $data)
      * @param int $storeId
      * @return string
      */
-    private function getCategoryUrlSuffix($storeId = null)
+    private function getCategoryUrlSuffix($storeId = null): string
     {
         return $this->config->getValue(
             CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
@@ -155,7 +156,7 @@ private function getCategoryUrlSuffix($storeId = null)
      * @param array $data
      * @return array|null
      */
-    private function findProductRewriteByRequestPath(array $data)
+    private function findProductRewriteByRequestPath(array $data): ?array
     {
         $requestPath = $data[UrlRewrite::REQUEST_PATH] ?? null;
 
@@ -210,7 +211,7 @@ private function findProductRewriteByRequestPath(array $data)
      * @param array $data
      * @return array
      */
-    private function findProductRewritesByFilter(array $data)
+    private function findProductRewritesByFilter(array $data): array
     {
         if (empty($data[UrlRewrite::ENTITY_TYPE])) {
             return [];
@@ -248,9 +249,9 @@ private function findProductRewritesByFilter(array $data)
      * Return base name for path
      *
      * @param string|null $string
-     * @return mixed
+     * @return string
      */
-    private function getBaseName($string)
+    private function getBaseName($string): string
     {
         return preg_replace('|.*?([^/]+)$|', '\1', $string, 1);
     }

app/code/Magento/CatalogUrlRewrite/Plugin/DynamicCategoryRewrites.php

@@ -8,8 +8,6 @@
 namespace Magento\CatalogUrlRewrite\Plugin;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Api\StoreResolverInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\CatalogUrlRewrite\Model\Storage\DynamicStorage;
 use Magento\CatalogUrlRewrite\Model\Storage\DbStorage;
@@ -29,32 +27,24 @@ class DynamicCategoryRewrites
      */
     private $dynamicStorage;
 
-    /**
-     * @var StoreResolverInterface
-     */
-    private $storeResolver;
-
     /**
      * @param ScopeConfigInterface|null $config
-     * @param StoreResolverInterface $storeResolver
      * @param DynamicStorage $dynamicStorage
      */
     public function __construct(
         ScopeConfigInterface $config,
-        StoreResolverInterface $storeResolver,
         DynamicStorage $dynamicStorage
     ) {
         $this->config = $config;
         $this->dynamicStorage = $dynamicStorage;
-        $this->storeResolver = $storeResolver;
     }
 
     /**
      * Check config value of generate_category_product_rewrites
      *
      * @return bool
      */
-    private function isCategoryRewritesEnabled()
+    private function isCategoryRewritesEnabled(): bool
     {
         return (bool)$this->config->getValue('catalog/seo/generate_category_product_rewrites');
     }

app/code/Magento/UrlRewrite/Model/CompositeUrlFinder.php

@@ -9,10 +9,7 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Store\Api\StoreResolverInterface;
-use Magento\Store\Model\ScopeInterface;
-use \Magento\UrlRewrite\Model\MergeDataProviderFactory;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\UrlRewrite\Model\MergeDataProviderFactory;
 
 /**
  * Class CompositeUrlFinder
@@ -33,43 +30,36 @@ class CompositeUrlFinder implements UrlFinderInterface
      * @var MergeDataProviderFactory
      */
     private $mergeDataProviderFactory;
+
     /**
      * @var ScopeConfigInterface
      */
     private $config;
 
-    /**
-     * @var StoreResolverInterface
-     */
-    private $storeResolver;
-
     /**
      * @param array $children
      * @param ObjectManagerInterface $objectManager
      * @param MergeDataProviderFactory $mergeDataProviderFactory
      * @param ScopeConfigInterface $config
-     * @param StoreResolverInterface $storeResolver
      */
     public function __construct(
         array $children,
         ObjectManagerInterface $objectManager,
         MergeDataProviderFactory $mergeDataProviderFactory,
-        ScopeConfigInterface $config,
-        StoreResolverInterface $storeResolver
+        ScopeConfigInterface $config
     ) {
         $this->children = $children;
         $this->objectManager = $objectManager;
         $this->mergeDataProviderFactory = $mergeDataProviderFactory;
         $this->config = $config;
-        $this->storeResolver = $storeResolver;
     }
 
     /**
      * Check config value of generate_category_product_rewrites
      *
      * @return bool
      */
-    private function isCategoryRewritesEnabled()
+    private function isCategoryRewritesEnabled(): bool
     {
         return (bool)$this->config->getValue('catalog/seo/generate_category_product_rewrites');
     }
@@ -113,7 +103,7 @@ public function findOneByData(array $data)
      *
      * @return array
      */
-    private function getChildren()
+    private function getChildren(): array
     {
         uasort($this->children, function ($first, $second) {
             return (int)$first['sortOrder'] <=> (int)$second['sortOrder'];