Merge pull request #8045 from magento-amigos/AC-7525

[Amigos] AC-7525: Provide backward compatible solution to resolve AC-7521

Author: sidolov

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -349,9 +349,10 @@
                         <field id="transport">smtp</field>
                     </depends>
                 </field>
-                <field id="password" translate="label comment" type="password" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="password" translate="label comment" type="obscure" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Password</label>
-                    <comment>Username</comment>
+                    <comment>Password</comment>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <depends>
                         <field id="transport">smtp</field>
                     </depends>

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

@@ -27,6 +27,7 @@
                 <disable>0</disable>
                 <host>localhost</host>
                 <port>25</port>
+                <password backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <set_return_path>0</set_return_path>
                 <transport>sendmail</transport>
                 <auth>none</auth>

app/code/Magento/Theme/Block/Html/Header.php

@@ -6,35 +6,37 @@
 
 namespace Magento\Theme\Block\Html;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Html page header block
  *
  * @api
  * @since 100.0.2
  */
-class Header extends \Magento\Framework\View\Element\Template
+class Header extends Template
 {
     /**
      * @var Escaper
      */
     private $escaper;
 
     /**
-     * Constructor
-     *
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param Magento\Framework\Escaper $escaper
+     * @param Context $context
      * @param array $data
+     * @param Escaper|null $escaper
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Framework\Escaper $escaper,
-        array $data = []
+        Context $context,
+        array $data = [],
+        Escaper $escaper = null
     ) {
-        $this->escaper = $escaper;
         parent::__construct($context, $data);
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
     }
 
     /**
@@ -54,7 +56,7 @@ public function getWelcome()
         if (empty($this->_data['welcome'])) {
             $this->_data['welcome'] = $this->_scopeConfig->getValue(
                 'design/header/welcome',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE
             );
         }
         $this->_data['welcome'] =  $this->escaper->escapeQuote($this->_data['welcome'], true);