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

Author: dvoskoboinikov

app/code/Magento/Email/Model/AbstractTemplate.php

@@ -31,32 +31,32 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
     /**
      * Default design area for emulation
      */
-    const DEFAULT_DESIGN_AREA = 'frontend';
+    public const DEFAULT_DESIGN_AREA = 'frontend';
 
     /**
      * Default path to email logo
      */
-    const DEFAULT_LOGO_FILE_ID = 'Magento_Email::logo_email.png';
+    public const DEFAULT_LOGO_FILE_ID = 'Magento_Email::logo_email.png';
 
     /**
      * Email logo url
      */
-    const XML_PATH_DESIGN_EMAIL_LOGO = 'design/email/logo';
+    public const XML_PATH_DESIGN_EMAIL_LOGO = 'design/email/logo';
 
     /**
      * Email logo alt text
      */
-    const XML_PATH_DESIGN_EMAIL_LOGO_ALT = 'design/email/logo_alt';
+    public const XML_PATH_DESIGN_EMAIL_LOGO_ALT = 'design/email/logo_alt';
 
     /**
      * Email logo width
      */
-    const XML_PATH_DESIGN_EMAIL_LOGO_WIDTH = 'design/email/logo_width';
+    public const XML_PATH_DESIGN_EMAIL_LOGO_WIDTH = 'design/email/logo_width';
 
     /**
      * Email logo height
      */
-    const XML_PATH_DESIGN_EMAIL_LOGO_HEIGHT = 'design/email/logo_height';
+    public const XML_PATH_DESIGN_EMAIL_LOGO_HEIGHT = 'design/email/logo_height';
 
     /**
      * Configuration of design package for template
@@ -144,8 +144,6 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
     protected $filesystem;
 
     /**
-     * Scope config
-     *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
     protected $scopeConfig;

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

@@ -45,21 +45,21 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
      * @deprecated
      * @see \Magento\Email\Model\Transport::XML_PATH_SENDING_SET_RETURN_PATH
      */
-    const XML_PATH_SENDING_SET_RETURN_PATH = 'system/smtp/set_return_path';
+    public const XML_PATH_SENDING_SET_RETURN_PATH = 'system/smtp/set_return_path';
 
     /**
      * Configuration path for custom Return-Path email
      * @deprecated
      * @see \Magento\Email\Model\Transport::XML_PATH_SENDING_RETURN_PATH_EMAIL
      */
-    const XML_PATH_SENDING_RETURN_PATH_EMAIL = 'system/smtp/return_path_email';
+    public const XML_PATH_SENDING_RETURN_PATH_EMAIL = 'system/smtp/return_path_email';
 
     /**
      * Config path to mail sending setting that shows if email communications are disabled
      * @deprecated
      * @see https://github.com/magento/magento2/issues/5988
      */
-    const XML_PATH_SYSTEM_SMTP_DISABLE = 'system/smtp/disable';
+    public const XML_PATH_SYSTEM_SMTP_DISABLE = 'system/smtp/disable';
 
     /**
      * BCC list
@@ -69,8 +69,6 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
     protected $_bcc = [];
 
     /**
-     * Return path
-     *
      * @var string
      */
     protected $_returnPath = '';

app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php

@@ -14,7 +14,7 @@
 class Preview extends \Magento\Newsletter\Block\Adminhtml\Template\Preview
 {
     /**
-     * {@inheritdoc}
+     * @var string
      */
     protected $profilerName = "newsletter_queue_proccessing";
 

app/code/Magento/Newsletter/Model/Template.php

@@ -40,8 +40,9 @@ class Template extends \Magento\Email\Model\AbstractTemplate
     /**
      * Mail object
      *
-     * @deprecated 100.3.0 Unused property
+     * @var \Zend_Mail
      *
+     * @deprecated 100.3.0 Unused property
      */
     protected $_mail;
 
@@ -60,8 +61,6 @@ class Template extends \Magento\Email\Model\AbstractTemplate
     protected $_request;
 
     /**
-     * Filter factory
-     *
      * @var \Magento\Newsletter\Model\Template\FilterFactory
      */
     protected $_filterFactory;

lib/internal/Magento/Framework/Filter/Template.php

@@ -33,37 +33,39 @@ class Template implements \Zend_Filter_Interface
      *
      * @deprecated Use the new Directive processors
      */
-    const CONSTRUCTION_PATTERN = '/{{([a-z]{0,10})(.*?)}}(?:(.*?)(?:{{\/(?:\\1)}}))?/si';
+    public const CONSTRUCTION_PATTERN = '/{{([a-z]{0,10})(.*?)}}(?:(.*?)(?:{{\/(?:\\1)}}))?/si';
 
     /**
      * Construction `depend` regular expression
      *
      * @deprecated Use the new Directive processors
      */
-    const CONSTRUCTION_DEPEND_PATTERN = '/{{depend\s*(.*?)}}(.*?){{\\/depend\s*}}/si';
+    public const CONSTRUCTION_DEPEND_PATTERN = '/{{depend\s*(.*?)}}(.*?){{\\/depend\s*}}/si';
 
     /**
      * Construction `if` regular expression
      *
      * @deprecated Use the new Directive processors
      */
-    const CONSTRUCTION_IF_PATTERN = '/{{if\s*(.*?)}}(.*?)({{else}}(.*?))?{{\\/if\s*}}/si';
+    public const CONSTRUCTION_IF_PATTERN = '/{{if\s*(.*?)}}(.*?)({{else}}(.*?))?{{\\/if\s*}}/si';
 
     /**
      * Construction `template` regular expression
      *
      * @deprecated Use the new Directive processors
      */
-    const CONSTRUCTION_TEMPLATE_PATTERN = '/{{(template)(.*?)}}/si';
+    public const CONSTRUCTION_TEMPLATE_PATTERN = '/{{(template)(.*?)}}/si';
 
     /**
      * Construction `for` regular expression
      *
      * @deprecated Use the new Directive processors
      */
-    const LOOP_PATTERN = '/{{for(?P<loopItem>.*? )(in)(?P<loopData>.*?)}}(?P<loopBody>.*?){{\/for}}/si';
+    public const LOOP_PATTERN = '/{{for(?P<loopItem>.*? )(in)(?P<loopData>.*?)}}(?P<loopBody>.*?){{\/for}}/si';
 
-    /**#@-*/
+    /**
+     * @var array
+     */
     private $afterFilterCallbacks = [];
 
     /**
@@ -74,8 +76,6 @@ class Template implements \Zend_Filter_Interface
     protected $templateVars = [];
 
     /**
-     * Template processor
-     *
      * @var callable|null
      */
     protected $templateProcessor = null;