Conflict resolve for catalogsearch index file

Author: engcom-Dash

app/code/Magento/CatalogSearch/Controller/Result/Index.php

@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Controller\Result;
 
-use Magento\Catalog\Model\Product\ProductList\Toolbar;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Catalog\Model\Layer\Resolver;
 use Magento\Catalog\Model\Session;
@@ -15,6 +14,8 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\PopularSearchTerms;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
+use Magento\Catalog\Model\Product\ProductList\Toolbar;
 
 /**
  * Search result.
@@ -27,6 +28,8 @@ class Index extends \Magento\Framework\App\Action\Action implements HttpGetActio
     public const DEFAULT_NO_RESULT_HANDLE = 'catalogsearch_result_index_noresults';
 
     /**
+     * Catalog session for storing catalog-related data
+     *
      * @var Session
      */
     protected $_catalogSession;
@@ -42,29 +45,40 @@ class Index extends \Magento\Framework\App\Action\Action implements HttpGetActio
     private $_queryFactory;
 
     /**
+     * Catalog Layer Resolver
+     *
      * @var Resolver
      */
     private $layerResolver;
 
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
     /**
      * @param Context $context
      * @param Session $catalogSession
      * @param StoreManagerInterface $storeManager
      * @param QueryFactory $queryFactory
      * @param Resolver $layerResolver
+     * @param ToolbarMemorizer|null $toolbarMemorizer
      */
     public function __construct(
         Context $context,
         Session $catalogSession,
         StoreManagerInterface $storeManager,
         QueryFactory $queryFactory,
-        Resolver $layerResolver
+        Resolver $layerResolver,
+        ?ToolbarMemorizer $toolbarMemorizer = null
     ) {
         parent::__construct($context);
         $this->_storeManager = $storeManager;
         $this->_catalogSession = $catalogSession;
         $this->_queryFactory = $queryFactory;
         $this->layerResolver = $layerResolver;
+        $this->toolbarMemorizer = $toolbarMemorizer ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ToolbarMemorizer::class);
     }
 
     /**
@@ -111,6 +125,11 @@ public function execute()
             $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
         }
 
+        if ($this->shouldRedirectOnToolbarAction()) {
+            $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
+            return;
+        }
+
         if (empty($getAdditionalRequestParameters) &&
             $this->_objectManager->get(PopularSearchTerms::class)->isCacheable($queryText, $storeId)
         ) {
@@ -173,4 +192,21 @@ private function getNotCacheableResult($catalogSearchHelper, $query, $handles)
         $this->getResponse()->setNoCacheHeaders();
         $this->_view->renderLayout();
     }
+
+    /**
+     * Checks for toolbar actions
+     *
+     * @return bool
+     */
+    private function shouldRedirectOnToolbarAction(): bool
+    {
+        $params = $this->getRequest()->getParams();
+
+        return $this->toolbarMemorizer->isMemorizingAllowed() && empty(array_intersect([
+                Toolbar::ORDER_PARAM_NAME,
+                Toolbar::DIRECTION_PARAM_NAME,
+                Toolbar::MODE_PARAM_NAME,
+                Toolbar::LIMIT_PARAM_NAME
+            ], array_keys($params))) === false;
+    }
 }