Merge branch 'ACP2E-1529' of https://github.com/magento-l3/magento2ce into PR-02142023

Author: chittima

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

@@ -8,6 +8,7 @@
 namespace Magento\Email\Model\Template;
 
 use Exception;
+use Magento\Backend\Model\Url as BackendModelUrl;
 use Magento\Cms\Block\Block;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -69,12 +70,14 @@ class Filter extends Template
     /**
      * @var bool
      * @deprecated SID is not being used as query parameter anymore.
+     * @see storeDirective
      */
     protected $_useSessionInUrl = false;
 
     /**
      * @var array
      * @deprecated 101.0.4 Use the new Directive Processor interfaces
+     * @see applyModifiers
      */
     protected $_modifiers = ['nl2br' => ''];
 
@@ -281,6 +284,7 @@ public function setUseAbsoluteLinks($flag)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @deprecated SID query parameter is not used in URLs anymore.
+     * @see setUseSessionInUrl
      */
     public function setUseSessionInUrl($flag)
     {
@@ -585,7 +589,9 @@ public function storeDirective($construction)
          * Pass extra parameter to distinguish stores urls for property Magento\Framework\Url $cacheUrl
          * in multi-store environment
          */
-        $this->urlModel->setScope($this->_storeManager->getStore());
+        if (!$this->urlModel instanceof BackendModelUrl) {
+            $this->urlModel->setScope($this->_storeManager->getStore());
+        }
         $params['_escape_params'] = $this->_storeManager->getStore()->getCode();
 
         return $this->urlModel->getUrl($path, $params);
@@ -688,6 +694,7 @@ public function varDirective($construction)
      * @param string $default assumed modifier if none present
      * @return array
      * @deprecated 101.0.4 Use the new FilterApplier or Directive Processor interfaces
+     * @see explodeModifiers
      */
     protected function explodeModifiers($value, $default = null)
     {
@@ -707,6 +714,7 @@ protected function explodeModifiers($value, $default = null)
      * @param string $modifiers
      * @return string
      * @deprecated 101.0.4 Use the new FilterApplier or Directive Processor interfaces
+     * @see applyModifiers
      */
     protected function applyModifiers($value, $modifiers)
     {
@@ -736,6 +744,7 @@ protected function applyModifiers($value, $modifiers)
      * @param string $type
      * @return string
      * @deprecated 101.0.4 Use the new FilterApplier or Directive Processor interfaces
+     * @see modifierEscape
      */
     public function modifierEscape($value, $type = 'html')
     {

app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php

@@ -8,6 +8,7 @@
 
 namespace Magento\Email\Test\Unit\Model\Template;
 
+use Magento\Backend\Model\Url as BackendModelUrl;
 use Magento\Backend\Model\UrlInterface;
 use Magento\Email\Model\Template\Css\Processor;
 use Magento\Email\Model\Template\Filter;
@@ -35,7 +36,6 @@
 use Magento\Framework\View\Asset\Repository;
 use Magento\Framework\View\LayoutFactory;
 use Magento\Framework\View\LayoutInterface;
-use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Variable\Model\Source\Variables;
@@ -575,4 +575,50 @@ public function testProtocolDirectiveWithInvalidSchema()
         ];
         $model->protocolDirective($data);
     }
+
+    /**
+     * @dataProvider dataProviderUrlModelCompanyRedirect
+     */
+    public function testStoreDirectiveForCompanyRedirect($className, $backendModelClass)
+    {
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->store);
+        $this->store->expects($this->any())->method('getCode')->willReturn('frvw');
+
+        $this->backendUrlBuilder = $this->getMockBuilder($className)
+            ->onlyMethods(['setScope','getUrl'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->backendUrlBuilder->expects($this->once())
+            ->method('getUrl')
+            ->willReturn('http://m246ceeeb2b.test/frvw/');
+
+        if ($backendModelClass) {
+            $this->backendUrlBuilder->expects($this->never())->method('setScope');
+        } else {
+            $this->backendUrlBuilder->expects($this->once())->method('setScope')->willReturnSelf();
+        }
+        $this->assertInstanceOf($className, $this->backendUrlBuilder);
+        $result = $this->getModel()->storeDirective(["{{store url=''}}",'store',"url=''"]);
+        $this->assertEquals('http://m246ceeeb2b.test/frvw/', $result);
+    }
+
+    /**
+     * @return array[]
+     */
+    public function dataProviderUrlModelCompanyRedirect(): array
+    {
+        return [
+            [
+                UrlInterface::class,
+                0
+            ],
+            [
+                BackendModelUrl::class,
+                1
+            ]
+        ];
+    }
 }