AC-2391: Remove legacy variable resolver from email template processor

Author: dvoskoboinikov

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

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Email\Model\Plugin;
+
+use Magento\Store\Model\Store;
+
+class StoreAddress
+{
+    /**
+     * Make formatted store address accessible for templates
+     *
+     * @param Store $subject
+     * @param string $key
+     * @param string|int $index
+     * @return null
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeGetData(Store $subject, $key = '', $index = null)
+    {
+        if ($key === 'formatted_address') {
+            $subject->setData('formatted_address', $subject->getFormattedAddress());
+        }
+
+        return null;
+    }
+}

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

@@ -93,4 +93,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Store\Model\Store">
+        <plugin name="EmailTemplateStoreAddress" type="Magento\Email\Model\Plugin\StoreAddress"/>
+    </type>
 </config>

dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php

@@ -870,4 +870,31 @@ public function testSetOptions()
         $this->model->setOptions($options);
         $this->assertEquals($options, $this->model->getDesignConfig()->getData());
     }
+
+    /**
+     * @magentoConfigFixture default_store general/store_information/name Test Store
+     * @magentoConfigFixture default_store general/store_information/street_line1 Street 1
+     * @magentoConfigFixture default_store general/store_information/street_line2 Street 2
+     * @magentoConfigFixture default_store general/store_information/city Austin
+     * @magentoConfigFixture default_store general/store_information/zip 78758
+     * @magentoConfigFixture default_store general/store_information/country_id US
+     * @magentoConfigFixture default_store general/store_information/region_id 57
+     */
+    public function testStoreFormattedAddress()
+    {
+        $this->mockModel();
+        $this->model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
+
+        /* See app/design/frontend/Magento/luma/Magento_Email/email/footer.html */
+        $template = '{{var store.formatted_address|raw}}';
+        $this->model->setTemplateText($template);
+
+        $result = $this->model->getProcessedTemplate();
+        $this->assertStringContainsString('Test Store', $result);
+        $this->assertStringContainsString('Street 1', $result);
+        $this->assertStringContainsString('Street 2', $result);
+        $this->assertStringContainsString('Austin', $result);
+        $this->assertStringContainsString('Texas', $result);
+        $this->assertStringContainsString('United States', $result);
+    }
 }

dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/SimpleDirectiveTest.php

@@ -74,7 +74,6 @@ public function testDefaultFiltersAreUsed()
     public function testParametersAreParsed()
     {
         $filter = $this->objectManager->create(Template::class);
-        $filter->setStrictMode(false);
 
         $processor = $this->createWithProcessorsAndFilters(
             ['mydir' => $this->objectManager->create(MyDirProcessor::class)],