ENGCOM-7144: #26708 Fix: ORDER BY has two similar conditions in the S…

…QL query #27263
magento · Mar 20, 2020 · dda8385 · dda8385
2 parents 9c4e021 + ac524c4
commit dda8385
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -355,6 +355,7 @@ public function getIdentities()
         }
 
         foreach ($this->_getProductCollection() as $item) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $identities = array_merge($identities, $item->getIdentities());
         }
 
@@ -475,8 +476,6 @@ private function initializeProductCollection()
             $layer->setCurrentCategory($origCategory);
         }
 
-        $this->addToolbarBlock($collection);
-
         $this->_eventManager->dispatch(
             'catalog_block_product_list_collection',
             ['collection' => $collection]

diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
@@ -187,10 +187,6 @@ public function testGetIdentities()
             ->method('getProductCollection')
             ->will($this->returnValue($this->prodCollectionMock));
 
-        $this->layoutMock->expects($this->once())
-            ->method('getBlock')
-            ->will($this->returnValue($this->toolbarMock));
-
         $this->assertEquals(
             [$categoryTag, $productTag],
             $this->block->getIdentities()