MC-4244: Skip URL rewrites multiplication

duhon · duhon · commit f9329d8402dd · 2019-05-14T16:57:18.000-05:00
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
@@ -28,9 +28,11 @@ protected function prepareSelect(array $data)
         }
 
         $select = $this->connection->select();
-        $select->from([
-            'url_rewrite' => $this->resource->getTableName(self::TABLE_NAME)
-        ]);
+        $select->from(
+            [
+                'url_rewrite' => $this->resource->getTableName(self::TABLE_NAME)
+            ]
+        );
         $select->joinLeft(
             ['relation' => $this->resource->getTableName(Product::TABLE_NAME)],
             'url_rewrite.url_rewrite_id = relation.url_rewrite_id',
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
@@ -67,9 +67,11 @@ protected function prepareSelect(array $data)
             unset($data[UrlRewrite::METADATA]);
         }
         $select = $this->connection->select();
-        $select->from([
-            'url_rewrite' => $this->resource->getTableName(self::TABLE_NAME)
-        ]);
+        $select->from(
+            [
+                'url_rewrite' => $this->resource->getTableName(self::TABLE_NAME)
+            ]
+        );
         $select->joinLeft(
             ['relation' => $this->resource->getTableName(Product::TABLE_NAME)],
             'url_rewrite.url_rewrite_id = relation.url_rewrite_id'
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteMovingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteMovingObserverTest.php
@@ -98,12 +98,15 @@ public function testCategoryProcessUrlRewriteAfterMovingWithChangedParentId()
             ->disableOriginalConstructor()
             ->setMethods(['getCategory'])
             ->getMock();
-        $categoryMock = $this->createPartialMock(Category::class, [
-            'dataHasChangedFor',
-            'getEntityId',
-            'getStoreId',
-            'setData'
-        ]);
+        $categoryMock = $this->createPartialMock(
+            Category::class,
+            [
+                'dataHasChangedFor',
+                'getEntityId',
+                'getStoreId',
+                'setData'
+            ]
+        );
 
         $categoryMock->expects($this->once())->method('dataHasChangedFor')->with('parent_id')
             ->willReturn(true);
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php
@@ -76,13 +76,16 @@ protected function setUp()
             \Magento\Framework\Event\Observer::class,
             ['getEvent', 'getData']
         );
-        $this->category = $this->createPartialMock(Category::class, [
-            'hasData',
-            'getParentId',
-            'getStoreId',
-            'dataHasChangedFor',
-            'getChangedProductIds',
-        ]);
+        $this->category = $this->createPartialMock(
+            Category::class,
+            [
+                'hasData',
+                'getParentId',
+                'getStoreId',
+                'dataHasChangedFor',
+                'getChangedProductIds',
+            ]
+        );
         $this->observer->expects($this->any())
             ->method('getEvent')
             ->willReturnSelf();
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -146,9 +146,11 @@ protected function redirect($request, $url, $code)
      */
     protected function getRewrite($requestPath, $storeId)
     {
-        return $this->urlFinder->findOneByData([
-            UrlRewrite::REQUEST_PATH => ltrim($requestPath, '/'),
-            UrlRewrite::STORE_ID => $storeId,
-        ]);
+        return $this->urlFinder->findOneByData(
+            [
+                UrlRewrite::REQUEST_PATH => ltrim($requestPath, '/'),
+                UrlRewrite::STORE_ID => $storeId,
+            ]
+        );
     }
 }
diff --git a/app/code/Magento/UrlRewrite/Model/CompositeUrlFinder.php b/app/code/Magento/UrlRewrite/Model/CompositeUrlFinder.php
@@ -105,9 +105,12 @@ public function findOneByData(array $data)
      */
     private function getChildren(): array
     {
-        uasort($this->children, function ($first, $second) {
-            return (int)$first['sortOrder'] <=> (int)$second['sortOrder'];
-        });
+        uasort(
+            $this->children,
+            function ($first, $second) {
+                return (int)$first['sortOrder'] <=> (int)$second['sortOrder'];
+            }
+        );
         return $this->children;
     }
 }
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
@@ -140,15 +140,17 @@ public function testRewriteAfterStoreSwitcher()
         $this->urlFinder
             ->expects($this->any())
             ->method('findOneByData')
-            ->willReturnMap([
+            ->willReturnMap(
                 [
                     [
-                        UrlRewrite::REQUEST_PATH => $initialRequestPath,
-                        UrlRewrite::STORE_ID     => $currentStoreId,
-                    ],
-                    $urlRewrite,
+                        [
+                            UrlRewrite::REQUEST_PATH => $initialRequestPath,
+                            UrlRewrite::STORE_ID     => $currentStoreId,
+                        ],
+                        $urlRewrite,
+                    ]
                 ]
-            ]);
+            );
         $this->actionFactory
             ->expects($this->once())
             ->method('create')
@@ -204,21 +206,23 @@ public function testNoRewriteAfterStoreSwitcherWhenOldRewriteEqualsToNewOne()
         $urlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('old-request-path'));
 
         $this->urlFinder->expects($this->any())->method('findOneByData')->will(
-            $this->returnValueMap([
-                [
-                    [UrlRewrite::REQUEST_PATH => 'request-path', UrlRewrite::STORE_ID => 'old-store-id'],
-                    $oldUrlRewrite,
-                ],
+            $this->returnValueMap(
                 [
                     [
-                        UrlRewrite::ENTITY_TYPE => 'entity-type',
-                        UrlRewrite::ENTITY_ID => 'entity-id',
-                        UrlRewrite::STORE_ID => 'current-store-id',
-                        UrlRewrite::IS_AUTOGENERATED => 1,
+                        [UrlRewrite::REQUEST_PATH => 'request-path', UrlRewrite::STORE_ID => 'old-store-id'],
+                        $oldUrlRewrite,
                     ],
-                    $urlRewrite
-                ],
-            ])
+                    [
+                        [
+                            UrlRewrite::ENTITY_TYPE => 'entity-type',
+                            UrlRewrite::ENTITY_ID => 'entity-id',
+                            UrlRewrite::STORE_ID => 'current-store-id',
+                            UrlRewrite::IS_AUTOGENERATED => 1,
+                        ],
+                        $urlRewrite
+                    ],
+                ]
+            )
         );
 
         $this->assertNull($this->router->match($this->request));
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
@@ -46,10 +46,13 @@ public function testGenerateWithSpecificCategoryUrlKey()
         $generator = $this->objectManager->get(ProductUrlRewriteGenerator::class);
         $urls = $generator->generate($product);
 
-        $actualUrls = array_map(function ($url) {
-            /** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite $url */
-            return $url->getRequestPath();
-        }, $urls);
+        $actualUrls = array_map(
+            function ($url) {
+                /** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite $url */
+                return $url->getRequestPath();
+            },
+            $urls
+        );
 
         self::assertTrue(in_array('p002.html', $actualUrls));
         self::assertTrue(in_array('cat-1/p002.html', $actualUrls));
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
@@ -61,9 +61,14 @@ public function testGenerateProductUrlRewrites()
             ->setAnchorsAbove(false);
 
         $generatedUrls = $this->handler->generateProductUrlRewrites($category);
-        $actual = array_values(array_map(function (UrlRewrite $urlRewrite) {
-            return $urlRewrite->getRequestPath();
-        }, $generatedUrls));
+        $actual = array_values(
+            array_map(
+                function (UrlRewrite $urlRewrite) {
+                    return $urlRewrite->getRequestPath();
+                },
+                $generatedUrls
+            )
+        );
 
         $expected = [
             'store-1-key.html', // the Default store

Original file line number	Diff line number	Diff line change
`@@ -146,9 +146,11 @@ protected function redirect($request, $url, $code)`
`146`	`146`	`*/`
`147`	`147`	`protected function getRewrite($requestPath, $storeId)`
`148`	`148`	`{`
`149`		`- return $this->urlFinder->findOneByData([`
`150`		`- UrlRewrite::REQUEST_PATH => ltrim($requestPath, '/'),`
`151`		`- UrlRewrite::STORE_ID => $storeId,`
`152`		`- ]);`
	`149`	`+ return $this->urlFinder->findOneByData(`
	`150`	`+ [`
	`151`	`+ UrlRewrite::REQUEST_PATH => ltrim($requestPath, '/'),`
	`152`	`+ UrlRewrite::STORE_ID => $storeId,`
	`153`	`+ ]`
	`154`	`+ );`
`153`	`155`	`}`
`154`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,12 @@ public function findOneByData(array $data)`
`105`	`105`	`*/`
`106`	`106`	`private function getChildren(): array`
`107`	`107`	`{`
`108`		`- uasort($this->children, function ($first, $second) {`
`109`		`- return (int)$first['sortOrder'] <=> (int)$second['sortOrder'];`
`110`		`- });`
	`108`	`+ uasort(`
	`109`	`+ $this->children,`
	`110`	`+ function ($first, $second) {`
	`111`	`+ return (int)$first['sortOrder'] <=> (int)$second['sortOrder'];`
	`112`	`+ }`
	`113`	`+ );`
`111`	`114`	`return $this->children;`
`112`	`115`	`}`
`113`	`116`	`}`