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

Author: dvoskoboinikov

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

@@ -26,7 +26,7 @@
 use Magento\Framework\Filter\DirectiveProcessor\IfDirective;
 use Magento\Framework\Filter\DirectiveProcessor\LegacyDirective;
 use Magento\Framework\Filter\DirectiveProcessor\TemplateDirective;
-use Magento\Framework\Filter\VariableResolver\StrategyResolver;
+use Magento\Framework\Filter\VariableResolver\StrictResolver;
 use Magento\Framework\Stdlib\StringUtils;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Asset\ContentProcessorInterface;
@@ -137,7 +137,7 @@ class FilterTest extends TestCase
     private $pubDirectoryRead;
 
     /**
-     * @var MockObject|StrategyResolver
+     * @var MockObject|StrictResolver
      */
     private $variableResolver;
 
@@ -222,7 +222,7 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
         $this->variableResolver =
-            $this->getMockBuilder(StrategyResolver::class)
+            $this->getMockBuilder(StrictResolver::class)
                 ->disableOriginalConstructor()
                 ->getMock();
 

app/etc/di.xml

@@ -1837,7 +1837,7 @@
         <plugin name="execute_commit_callbacks" type="Magento\Framework\Model\ExecuteCommitCallbacks" />
     </type>
     <preference for="Magento\Framework\GraphQl\Query\ErrorHandlerInterface" type="Magento\Framework\GraphQl\Query\ErrorHandler"/>
-    <preference for="Magento\Framework\Filter\VariableResolverInterface" type="Magento\Framework\Filter\VariableResolver\StrategyResolver"/>
+    <preference for="Magento\Framework\Filter\VariableResolverInterface" type="Magento\Framework\Filter\VariableResolver\StrictResolver"/>
     <virtualType name="configured_block_cache" type="Magento\Framework\App\Cache">
         <arguments>
             <argument name="cacheIdentifier" xsi:type="string">block_html</argument>

dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/LegacyResolverTest.php

@@ -122,15 +122,13 @@ private function extractParameters(array $construction, Template $filter, array
         $tokenizer->setString($construction['parameters']);
         $parameters = $tokenizer->tokenize();
 
-        if (!$filter->isStrictMode()) {
-            foreach ($parameters as $key => $value) {
-                if (substr($value, 0, 1) === '$') {
-                    $parameters[$key] = $this->variableResolver->resolve(
-                        substr($value, 1),
-                        $filter,
-                        $templateVariables
-                    );
-                }
+        foreach ($parameters as $key => $value) {
+            if (substr($value, 0, 1) === '$') {
+                $parameters[$key] = $this->variableResolver->resolve(
+                    substr($value, 1),
+                    $filter,
+                    $templateVariables
+                );
             }
         }
 

lib/internal/Magento/Framework/Filter/DirectiveProcessor/SimpleDirective.php

@@ -418,6 +418,7 @@ public function setStrictMode(bool $strictMode): bool
      *
      * @return bool
      * @since 102.0.4
+     * @deprecated The method is not in use anymore.
      */
     public function isStrictMode(): bool
     {