MAGETWO-89905: Categories of the Main menu in the different Store View not updated when varnish enabled

- Moved plugin to UrlRewrite module;

Author: adifucan

app/code/Magento/CatalogUrlRewrite/etc/frontend/di.xml

@@ -105,7 +105,6 @@ public function __construct(
      */
     public function execute()
     {
-        $currentActiveStore = $this->storeManager->getStore();
         $storeCode = $this->_request->getParam(
             StoreResolver::PARAM_NAME,
             $this->storeCookieManager->getStoreCodeFromCookie()
@@ -141,18 +140,6 @@ public function execute()
             $this->storeCookieManager->setStoreCookie($store);
         }
 
-        if ($store->isUseStoreInUrl()) {
-            // Change store code in redirect url
-            if (strpos($redirectUrl, $currentActiveStore->getBaseUrl()) !== false) {
-                $redirectUrl = str_replace(
-                    $currentActiveStore->getBaseUrl(),
-                    $store->getBaseUrl(),
-                    $redirectUrl
-                );
-            } else {
-                $redirectUrl = $store->getBaseUrl();
-            }
-        }
         $this->getResponse()->setRedirect($redirectUrl);
     }
 }

app/code/Magento/Store/Controller/Store/SwitchAction.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\CatalogUrlRewrite\Plugin\Store\Controller\Store;
+namespace Magento\UrlRewrite\Plugin\Store\Controller\Store;
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
@@ -19,8 +19,7 @@
 use Magento\Framework\App\ResponseInterface;
 
 /**
- * Plugin makes connection between Store and UrlRewrite modules
- * because Magento\Store\Controller\Store\SwitchAction should not know about UrlRewrite module functionality
+ * Plugin handles url rewrites for redirect url
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -101,22 +100,16 @@ public function afterExecute(\Magento\Store\Controller\Store\SwitchAction $subje
 
             if ($store->isUseStoreInUrl()) {
                 // Remove store code in redirect url for correct rewrite search
-                $urlPath = str_replace(
-                    $store->getCode() . '/',
-                    '',
-                    $urlPath
-                );
+                $storeCode = $store->getCode() . '/';
+                $pattern = "@^($storeCode)@";
+                $urlPath = preg_replace($pattern, '', $urlPath);
             }
 
             try {
                 $oldStoreId = $this->storeRepository->get($fromStore)->getId();
                 $oldRewrite = $this->urlFinder->findOneByData([
                     UrlRewrite::REQUEST_PATH => $urlPath,
                     UrlRewrite::STORE_ID => $oldStoreId,
-                    UrlRewrite::ENTITY_TYPE => [
-                        \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator::ENTITY_TYPE,
-                        \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator::ENTITY_TYPE,
-                    ]
                 ]);
             } catch (NoSuchEntityException $exception) {
                 $oldRewrite = null;

…/Store/Controller/Store/SwitchAction.php …/Store/Controller/Store/SwitchAction.phpapp/code/Magento/CatalogUrlRewrite/Plugin/Store/Controller/Store/SwitchAction.php renamed to app/code/Magento/UrlRewrite/Plugin/Store/Controller/Store/SwitchAction.php app/code/Magento/CatalogUrlRewrite/Plugin/Store/Controller/Store/SwitchAction.php renamed to app/code/Magento/UrlRewrite/Plugin/Store/Controller/Store/SwitchAction.php

@@ -17,4 +17,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Store\Controller\Store\SwitchAction">
+        <plugin name="store_switcher_plugin" type="Magento\UrlRewrite\Plugin\Store\Controller\Store\SwitchAction"/>
+    </type>
 </config>