ENGCOM-1928: Refactoring.

Author: p-bystritsky

app/code/Magento/Store/Block/Switcher.php

@@ -265,24 +265,4 @@ public function getTargetStorePostData(Store $store, $data = [])
             $data
         );
     }
-
-    /**
-     * Returns target store redirect url.
-     *
-     * @param Store $store
-     * @return string
-     */
-    public function getTargetStoreRedirectUrl(Store $store)
-    {
-        return $this->getUrl(
-            'stores/store/redirect',
-            [
-                '___store' => $store->getCode(),
-                '___from_store' => $this->getCurrentStoreCode(),
-                ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlHelper->getEncodedUrl(
-                    $store->getCurrentUrl(false)
-                ),
-            ]
-        );
-    }
 }

app/code/Magento/Store/ViewModel/Switcher.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Store\ViewModel;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Provides target store redirect url.
+ */
+class SwitcherUrlProvider implements \Magento\Framework\View\Element\Block\ArgumentInterface
+{
+    /**
+     * @var EncoderInterface
+     */
+    private $encoder;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @param EncoderInterface $encoder
+     * @param StoreManagerInterface $storeManager
+     * @param UrlInterface $urlBuilder
+     */
+    public function __construct(
+        EncoderInterface $encoder,
+        StoreManagerInterface $storeManager,
+        UrlInterface $urlBuilder
+    ) {
+        $this->encoder = $encoder;
+        $this->storeManager = $storeManager;
+        $this->urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * Returns target store redirect url.
+     *
+     * @param Store $store
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getTargetStoreRedirectUrl(Store $store): string
+    {
+        return $this->urlBuilder->getUrl(
+            'stores/store/redirect',
+            [
+                '___store' => $store->getCode(),
+                '___from_store' => $this->storeManager->getStore()->getCode(),
+                ActionInterface::PARAM_NAME_URL_ENCODED => $this->encoder->encode(
+                    $store->getCurrentUrl(false)
+                ),
+            ]
+        );
+    }
+}

app/code/Magento/Store/view/frontend/templates/switch/languages.phtml

@@ -27,7 +27,7 @@
             <?php foreach ($block->getStores() as $_lang): ?>
                 <?php if ($_lang->getId() != $block->getCurrentStoreId()): ?>
                     <li class="view-<?= $block->escapeHtml($_lang->getCode()) ?> switcher-option">
-                        <a href="<?= $block->escapeUrl($block->getTargetStoreRedirectUrl($_lang)) ?>">
+                        <a href="<?= $block->escapeUrl($block->getViewModel()->getTargetStoreRedirectUrl($_lang)) ?>">
                             <?= $block->escapeHtml($_lang->getName()) ?>
                         </a>
                     </li>

app/code/Magento/Theme/view/frontend/layout/default.xml

@@ -39,7 +39,11 @@
                             <argument name="label" translate="true" xsi:type="string">Skip to Content</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Store\Block\Switcher" name="store_language" as="store_language" template="Magento_Store::switch/languages.phtml"/>
+                    <block class="Magento\Store\Block\Switcher" name="store_language" as="store_language" template="Magento_Store::switch/languages.phtml">
+                        <arguments>
+                            <argument name="view_model" xsi:type="object">Magento\Store\ViewModel\SwitcherUrlProvider</argument>
+                        </arguments>
+                    </block>
                     <block class="Magento\Customer\Block\Account\Navigation" name="top.links">
                         <arguments>
                             <argument name="css_class" xsi:type="string">header links</argument>
@@ -82,6 +86,7 @@
                     <block class="Magento\Store\Block\Switcher" name="store.settings.language" template="Magento_Store::switch/languages.phtml">
                         <arguments>
                             <argument name="id_modifier" xsi:type="string">nav</argument>
+                            <argument name="view_model" xsi:type="object">Magento\Store\ViewModel\SwitcherUrlProvider</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Directory\Block\Currency" name="store.settings.currency" template="Magento_Directory::currency.phtml">