Merge remote-tracking branch 'magento-l3/ACP2E-127' into L3_PR_21-09-30

Author: veloraven

app/code/Magento/Email/Model/Plugin/GetUrl.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Email\Model\Plugin;
+
+class GetUrl
+{
+    /**
+     * Generate unique Urls/links separated by store in \Magento\Email\Model\AbstractTemplate `getUrl` function.
+     *
+     * @param \Magento\Email\Model\AbstractTemplate $subject
+     * @param \Magento\Store\Model\Store $store
+     * @param string $route
+     * @param array $params
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeGetUrl(
+        \Magento\Email\Model\AbstractTemplate $subject,
+        \Magento\Store\Model\Store $store,
+        $route = '',
+        $params = []
+    ) {
+        /**
+         * Pass extra parameter to distinguish stores urls for property \Magento\Email\Model\AbstractTemplate `getUrl`
+         * in multi-store environment
+         */
+        $params['_escape_params'] = $store->getCode();
+
+        return [$store, $route, $params];
+    }
+}

app/code/Magento/Email/Model/Template/Filter.php

@@ -11,6 +11,7 @@
 use Magento\Cms\Block\Block;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\State;
 use Magento\Framework\Css\PreProcessor\Adapter\CssInliner;
 use Magento\Framework\Escaper;
@@ -30,14 +31,13 @@
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\LayoutFactory;
 use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\Information as StoreInformation;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Variable\Model\Source\Variables;
 use Magento\Variable\Model\Variable;
 use Magento\Variable\Model\VariableFactory;
 use Psr\Log\LoggerInterface;
-use Magento\Store\Model\Information as StoreInformation;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Core Email Template Filter Model
@@ -61,45 +61,33 @@ class Filter extends Template
     const TRANS_DIRECTIVE_REGEX = '/^\s*([\'"])([^\1]*?)(?<!\\\)\1(\s.*)?$/si';
 
     /**
-     * Use absolute links flag
-     *
      * @var bool
      */
     protected $_useAbsoluteLinks = false;
 
     /**
-     * Whether to allow SID in store directive: NO
-     *
      * @var bool
      * @deprecated SID is not being used as query parameter anymore.
      */
     protected $_useSessionInUrl = false;
 
     /**
-     * Modifier Callbacks
-     *
      * @var array
      * @deprecated 101.0.4 Use the new Directive Processor interfaces
      */
     protected $_modifiers = ['nl2br' => ''];
 
     /**
-     * Whether template being filtered is child of another template
-     *
      * @var bool
      */
     private $isChildTemplate = false;
 
     /**
-     * List of CSS files to inline
-     *
      * @var []
      */
     private $inlineCssFiles = [];
 
     /**
-     * Store id
-     *
      * @var int
      */
     protected $_storeId;
@@ -153,22 +141,16 @@ class Filter extends Template
     protected $_layoutFactory;
 
     /**
-     * Setup callbacks for filters
-     *
      * @var ScopeConfigInterface
      */
     protected $_scopeConfig;
 
     /**
-     * Layout directive params
-     *
      * @var array
      */
     protected $_directiveParams;
 
     /**
-     * App state
-     *
      * @var State
      */
     protected $_appState;
@@ -591,6 +573,13 @@ public function storeDirective($construction)
             unset($params['url']);
         }
 
+        /**
+         * Pass extra parameter to distinguish stores urls for property Magento\Framework\Url $cacheUrl
+         * in multi-store environment
+         */
+        $this->urlModel->setScope($this->_storeManager->getStore());
+        $params['_escape_params'] = $this->_storeManager->getStore()->getCode();
+
         return $this->urlModel->getUrl($path, $params);
     }
 
@@ -854,8 +843,8 @@ public function configDirective($construction)
             if ($params['path'] == $this->storeInformation::XML_PATH_STORE_INFO_COUNTRY_CODE) {
                 $configValue = $storeInformationObj->getData('country');
             } elseif ($params['path'] == $this->storeInformation::XML_PATH_STORE_INFO_REGION_CODE) {
-                $configValue = $storeInformationObj->getData('region')?
-                    $storeInformationObj->getData('region'):
+                $configValue = $storeInformationObj->getData('region') ?
+                    $storeInformationObj->getData('region') :
                     $configValue;
             }
         }

app/code/Magento/Email/Test/Unit/Model/Plugin/GetUrlTest.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Email\Test\Unit\Model\Plugin;
+
+use Magento\Email\Model\Plugin\GetUrl;
+use Magento\Store\Model\Store;
+use Magento\Email\Model\AbstractTemplate;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class GetUrlTest extends TestCase
+{
+    /** @var  Store|MockObject */
+    private $storeMock;
+
+    /** @var  GetUrl */
+    private $plugin;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->storeMock = $this->createMock(Store::class);
+
+        $this->plugin = new GetUrl();
+    }
+
+    /**
+     * Test if unique store parameter passed in third argument (`$params`) of `beforeGetUrl` function.
+     *
+     * @return void
+     */
+    public function testBeforeGetUrl(): void
+    {
+        $storeCode = 'second_store_view';
+        $params['_escape_params'] = $storeCode;
+        $route = '';
+
+        $abstractTemplateMock = $this->getMockBuilder(AbstractTemplate::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeMock->expects($this->once())
+            ->method('getCode')
+            ->willReturn($storeCode);
+
+        $this->assertEquals(
+            [$this->storeMock, $route, $params],
+            $this->plugin->beforeGetUrl($abstractTemplateMock, $this->storeMock, $route, [])
+        );
+    }
+}

app/code/Magento/Email/etc/di.xml

@@ -61,6 +61,9 @@
         <plugin name="WindowsSmtpConfig" type="Magento\Email\Model\Plugin\WindowsSmtpConfig" />
         <plugin name="EmailDisable" type="Magento\Email\Model\Mail\TransportInterfacePlugin" />
     </type>
+    <type name="Magento\Email\Model\AbstractTemplate">
+        <plugin name="EmailTemplateLinkUrl" type="Magento\Email\Model\Plugin\GetUrl"/>
+    </type>
     <type name="Magento\Config\Model\Config\TypePool">
         <arguments>
             <argument name="sensitive" xsi:type="array">