Merge branch 'MC-17439' into MC-16618

Author: davemacaulay

app/code/Magento/AdminNotification/Model/Feed.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\AdminNotification\Model;
 
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 
 /**
@@ -26,7 +28,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
     const XML_LAST_UPDATE_PATH = 'system/adminnotification/last_update';
 
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     private $escaper;
 
@@ -82,7 +84,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @param \Magento\Framework\Escaper|null $escaper
+     * @param Escaper|null $escaper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -97,7 +99,7 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        \Magento\Framework\Escaper $escaper = null
+        Escaper $escaper = null
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
         $this->_backendConfig = $backendConfig;
@@ -106,8 +108,8 @@ public function __construct(
         $this->_deploymentConfig = $deploymentConfig;
         $this->productMetadata = $productMetadata;
         $this->urlBuilder = $urlBuilder;
-        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Escaper::class
+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
+            Escaper::class
         );
     }
 

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php

@@ -12,13 +12,15 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product;
 
+use Magento\Framework\Escaper;
+
 /**
  * Class Edit
  */
 class Edit extends \Magento\Backend\Block\Widget
 {
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     private $escaper;
 
@@ -55,7 +57,7 @@ class Edit extends \Magento\Backend\Block\Widget
      * @param \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Helper\Product $productHelper
-     * @param \Magento\Framework\Escaper $escaper
+     * @param Escaper $escaper
      * @param array $data
      */
     public function __construct(
@@ -64,7 +66,7 @@ public function __construct(
         \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory,
         \Magento\Framework\Registry $registry,
         \Magento\Catalog\Helper\Product $productHelper,
-        \Magento\Framework\Escaper $escaper,
+        Escaper $escaper,
         array $data = []
     ) {
         $this->_productHelper = $productHelper;

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php

@@ -5,13 +5,16 @@
  */
 namespace Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter\Grid\Renderer;
 
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Adminhtml newsletter queue grid block action item renderer
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     private $escaper;
 
@@ -26,17 +29,17 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
-     * @param \Magento\Framework\Escaper|null $escaper
+     * @param Escaper|null $escaper
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Framework\Registry $registry,
         array $data = [],
-        \Magento\Framework\Escaper $escaper = null
+        Escaper $escaper = null
     ) {
         $this->_coreRegistry = $registry;
-        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Escaper::class
+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
+            Escaper::class
         );
         parent::__construct($context, $data);
     }

app/code/Magento/Customer/Model/Address/Validator/Country.php

@@ -9,6 +9,8 @@
 use Magento\Customer\Model\Address\ValidatorInterface;
 use Magento\Directory\Helper\Data;
 use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
 
 /**
@@ -17,7 +19,7 @@
 class Country implements ValidatorInterface
 {
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     private $escaper;
 
@@ -34,17 +36,17 @@ class Country implements ValidatorInterface
     /**
      * @param Data $directoryData
      * @param AllowedCountries $allowedCountriesReader
-     * @param \Magento\Framework\Escaper|null $escaper
+     * @param Escaper|null $escaper
      */
     public function __construct(
         Data $directoryData,
         AllowedCountries $allowedCountriesReader,
-        \Magento\Framework\Escaper $escaper = null
+        Escaper $escaper = null
     ) {
         $this->directoryData = $directoryData;
         $this->allowedCountriesReader = $allowedCountriesReader;
-        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Escaper::class
+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
+            Escaper::class
         );
     }
 

app/code/Magento/Directory/Model/ResourceModel/Country.php

@@ -5,6 +5,10 @@
  */
 namespace Magento\Directory\Model\ResourceModel;
 
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Country Resource Model
  *
@@ -14,22 +18,22 @@
 class Country extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     private $escaper;
 
     /**
-     * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
+     * @param Context $context
      * @param null|string $connectionName
-     * @param \Magento\Framework\Escaper|null $escaper
+     * @param Escaper|null $escaper
      */
     public function __construct(
-        \Magento\Framework\Model\ResourceModel\Db\Context $context,
+        Context $context,
         ?string $connectionName = null,
-        \Magento\Framework\Escaper $escaper = null
+        Escaper $escaper = null
     ) {
-        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Escaper::class
+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
+            Escaper::class
         );
         parent::__construct($context, $connectionName);
     }

app/code/Magento/Reports/Block/Adminhtml/Grid.php

@@ -92,7 +92,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      * @param Data $backendHelper
      * @param array $data
      * @param DecoderInterface|null $urlDecoder
-     * @param Parameters $parameters
+     * @param Parameters|null $parameters
      */
     public function __construct(
         Context $context,

app/code/Magento/Translation/Model/Inline/Parser.php

@@ -6,6 +6,15 @@
 
 namespace Magento\Translation\Model\Inline;
 
+use Magento\Translation\Model\ResourceModel\StringUtilsFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\Translate\InlineInterface;
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Translation\Model\Inline\CacheManager;
+
 /**
  * Parse content, applying necessary html element wrapping and client scripts for inline translation.
  *
@@ -19,7 +28,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
     const DATA_TRANSLATE = 'data-translate';
 
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     private $escaper;
 
@@ -101,7 +110,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
     protected $_resourceFactory;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -111,22 +120,22 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
     protected $_inputFilter;
 
     /**
-     * @var \Magento\Framework\App\State
+     * @var State
      */
     protected $_appState;
 
     /**
-     * @var \Magento\Framework\Translate\InlineInterface
+     * @var InlineInterface
      */
     protected $_translateInline;
 
     /**
-     * @var \Magento\Framework\App\Cache\TypeListInterface
+     * @var TypeListInterface
      */
     protected $_appCache;
 
     /**
-     * @var \Magento\Translation\Model\Inline\CacheManager
+     * @var CacheManager
      */
     private $cacheManager;
 
@@ -138,15 +147,15 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
     /**
      * Return cache manager
      *
-     * @return \Magento\Translation\Model\Inline\CacheManager
+     * @return CacheManager
      *
      * @deprecated 100.1.0
      */
     private function getCacheManger()
     {
-        if (!$this->cacheManager instanceof \Magento\Translation\Model\Inline\CacheManager) {
-            $this->cacheManager = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                \Magento\Translation\Model\Inline\CacheManager::class
+        if (!$this->cacheManager instanceof CacheManager) {
+            $this->cacheManager = ObjectManager::getInstance()->get(
+                CacheManager::class
             );
         }
         return $this->cacheManager;
@@ -155,24 +164,24 @@ private function getCacheManger()
     /**
      * Initialize base inline translation model
      *
-     * @param \Magento\Translation\Model\ResourceModel\StringUtilsFactory $resource
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param StringUtilsFactory $resource
+     * @param StoreManagerInterface $storeManager
      * @param \Zend_Filter_Interface $inputFilter
-     * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\App\Cache\TypeListInterface $appCache
-     * @param \Magento\Framework\Translate\InlineInterface $translateInline
+     * @param State $appState
+     * @param TypeListInterface $appCache
+     * @param InlineInterface $translateInline
      * @param array $relatedCacheTypes
-     * @param \Magento\Framework\Escaper|null $escaper
+     * @param Escaper|null $escaper
      */
     public function __construct(
-        \Magento\Translation\Model\ResourceModel\StringUtilsFactory $resource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        StringUtilsFactory $resource,
+        StoreManagerInterface $storeManager,
         \Zend_Filter_Interface $inputFilter,
-        \Magento\Framework\App\State $appState,
-        \Magento\Framework\App\Cache\TypeListInterface $appCache,
-        \Magento\Framework\Translate\InlineInterface $translateInline,
+        State $appState,
+        TypeListInterface $appCache,
+        InlineInterface $translateInline,
         array $relatedCacheTypes = [],
-        \Magento\Framework\Escaper $escaper = null
+        Escaper $escaper = null
     ) {
         $this->_resourceFactory = $resource;
         $this->_storeManager = $storeManager;
@@ -181,8 +190,8 @@ public function __construct(
         $this->_appCache = $appCache;
         $this->_translateInline = $translateInline;
         $this->relatedCacheTypes = $relatedCacheTypes;
-        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Escaper::class
+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
+            Escaper::class
         );
     }
 

app/code/Magento/Translation/Model/ResourceModel/StringUtils.php

@@ -5,13 +5,16 @@
  */
 namespace Magento\Translation\Model\ResourceModel;
 
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * String translation utilities
  */
 class StringUtils extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     private $escaper;
 
@@ -36,21 +39,21 @@ class StringUtils extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param string $connectionName
      * @param string|null $scope
-     * @param \Magento\Framework\Escaper|null $escaper
+     * @param Escaper|null $escaper
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
         $connectionName = null,
         $scope = null,
-        \Magento\Framework\Escaper $escaper = null
+        Escaper $escaper = null
     ) {
         $this->_localeResolver = $localeResolver;
         $this->scopeResolver = $scopeResolver;
         $this->scope = $scope;
-        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Escaper::class
+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(
+            Escaper::class
         );
         parent::__construct($context, $connectionName);
     }