Merge remote-tracking branch 'origin/MC-30229' into 2.4-develop-pr10

Author: serhii-balko

app/code/Magento/Catalog/Controller/Product/Compare/Index.php

@@ -12,6 +12,8 @@
 use Magento\Framework\View\Result\PageFactory;
 
 /**
+ * View products compare in frontend
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Index extends \Magento\Catalog\Controller\Product\Compare implements HttpGetActionInterface
@@ -74,23 +76,12 @@ public function __construct(
      */
     public function execute()
     {
-        $items = $this->getRequest()->getParam('items');
-
         $beforeUrl = $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED);
         if ($beforeUrl) {
             $this->_catalogSession->setBeforeCompareUrl(
                 $this->urlDecoder->decode($beforeUrl)
             );
         }
-
-        if ($items) {
-            $items = explode(',', $items);
-            /** @var \Magento\Catalog\Model\Product\Compare\ListCompare $list */
-            $list = $this->_catalogProductCompareList;
-            $list->addProducts($items);
-            $resultRedirect = $this->resultRedirectFactory->create();
-            return $resultRedirect->setPath('*/*/*');
-        }
         return $this->resultPageFactory->create();
     }
 }

app/code/Magento/Catalog/Helper/Product/Compare.php

@@ -14,6 +14,7 @@
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Compare extends \Magento\Framework\Url\Helper\Data
@@ -145,16 +146,9 @@ public function __construct(
      */
     public function getListUrl()
     {
-        $itemIds = [];
-        foreach ($this->getItemCollection() as $item) {
-            $itemIds[] = $item->getId();
-        }
-
         $params = [
-            'items' => implode(',', $itemIds),
             \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl()
         ];
-
         return $this->_getUrl('catalog/product_compare', $params);
     }
 

app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php

@@ -129,7 +129,6 @@ public function testExecute()
             ->method('getParam')
             ->willReturnMap(
                 [
-                    ['items', null, null],
                     ['uenc', null, $beforeUrl],
                 ]
             );
@@ -141,34 +140,7 @@ public function testExecute()
             ->method('setBeforeCompareUrl')
             ->with($beforeUrl . '1')
             ->willReturnSelf();
-        $this->listCompareMock->expects($this->never())->method('addProducts');
         $this->redirectFactoryMock->expects($this->never())->method('create');
         $this->index->execute();
     }
-
-    public function testExecuteWithItems()
-    {
-        $this->request->expects($this->any())
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['items', null, '1,2,3'],
-                    ['uenc', null, null],
-                ]
-            );
-        $this->decoderMock->expects($this->never())->method('decode');
-        $this->catalogSession->expects($this->never())->method('setBeforeCompareUrl');
-
-        $this->listCompareMock->expects($this->once())
-            ->method('addProducts')
-            ->with([1, 2, 3]);
-        $redirect = $this->createPartialMock(\Magento\Framework\Controller\Result\Redirect::class, ['setPath']);
-        $redirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/*');
-        $this->redirectFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($redirect);
-        $this->index->execute();
-    }
 }

dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php

@@ -96,22 +96,6 @@ public function testAddActionForDisabledProduct(): void
         $this->_assertCompareListEquals([]);
     }
 
-    /**
-     * Test comparing a product.
-     *
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    public function testIndexActionAddProducts()
-    {
-        $this->_requireVisitorWithNoProducts();
-        $product = $this->productRepository->get('simple_product_2');
-        $this->dispatch('catalog/product_compare/index/items/' . $product->getEntityId());
-
-        $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/catalog/product_compare/index/'));
-
-        $this->_assertCompareListEquals([$product->getEntityId()]);
-    }
-
     /**
      * Test removing a product from compare list.
      *

dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/CompareTest.php

@@ -23,24 +23,11 @@ protected function setUp()
         $this->_helper = $this->_objectManager->get(\Magento\Catalog\Helper\Product\Compare::class);
     }
 
-    /**
-     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
-     * @magentoDbIsolation disabled
-     */
     public function testGetListUrl()
     {
         /** @var $empty \Magento\Catalog\Helper\Product\Compare */
         $empty = $this->_objectManager->create(\Magento\Catalog\Helper\Product\Compare::class);
         $this->assertContains('/catalog/product_compare/index/', $empty->getListUrl());
-
-        $this->_populateCompareList();
-        $productRepository = $this->_objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-        $id1 = $productRepository->get('simple1')->getId();
-        $id2 = $productRepository->get('simple2')->getId();
-        $this->assertRegExp(
-            '#/catalog/product_compare/index/items/(?:' . $id1 . '%2C' . $id2 . '|' . $id2 . '%2C' . $id1. ')/#',
-            $this->_helper->getListUrl()
-        );
     }
 
     public function testGetAddUrl()