Use constructor property promotion in module Tax

app/code/Magento/Tax/Block/Adminhtml/Frontend/Region/Updater.php

@@ -5,33 +5,31 @@
  */
 namespace Magento\Tax\Block\Adminhtml\Frontend\Region;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
-class Updater extends \Magento\Config\Block\System\Config\Form\Field
+class Updater extends Field
 {
     /**
-     * @var \Magento\Directory\Helper\Data
+     * @var DirectoryHelper
      */
     protected $_directoryHelper;
 
     /**
-     * @var SecureHtmlRenderer
-     */
-    private $secureRenderer;
-
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Directory\Helper\Data $directoryHelper
+     * @param Context $context
+     * @param DirectoryHelper $directoryHelper
      * @param array $data
      * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Directory\Helper\Data $directoryHelper,
+        Context $context,
+        DirectoryHelper $directoryHelper,
         array $data = [],
-        ?SecureHtmlRenderer $secureRenderer = null
+        private ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_directoryHelper = $directoryHelper;
         parent::__construct($context, $data);

app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Tax\Block\Adminhtml\Items\Price;
 
+use Magento\Backend\Block\Template;
+use Magento\Backend\Block\Template\Context;
+use Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn;
 use Magento\Sales\Model\Order\Creditmemo\Item as CreditmemoItem;
 use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem;
 use Magento\Sales\Model\Order\Item;
@@ -18,47 +21,35 @@
  * @api
  * @since 100.0.2
  */
-class Renderer extends \Magento\Backend\Block\Template
+class Renderer extends Template
 {
     /**
-     * @var \Magento\Tax\Helper\Data
+     * @var TaxHelper
      * @deprecated 100.3.0
      * Marked as deprecated as it is unused.
      */
     protected $taxHelper;
 
-    /**
-     * @var \Magento\Tax\Block\Item\Price\Renderer
-     */
-    protected $itemPriceRenderer;
-
-    /**
-     * @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
-     */
-    protected $defaultColumnRenderer;
-
     /**
      * @var Item|QuoteItem|InvoiceItem|CreditmemoItem
      */
     protected $item;
 
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $defaultColumnRenderer
+     * @param Context $context
+     * @param DefaultColumn $defaultColumnRenderer
      * @param TaxHelper $taxHelper
      * @param ItemPriceRenderer $itemPriceRenderer
      * @param array $data
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $defaultColumnRenderer,
+        Context $context,
+        protected readonly DefaultColumn $defaultColumnRenderer,
         TaxHelper $taxHelper,
-        ItemPriceRenderer $itemPriceRenderer,
+        protected readonly ItemPriceRenderer $itemPriceRenderer,
         array $data = []
     ) {
-        $this->defaultColumnRenderer = $defaultColumnRenderer;
-        $this->itemPriceRenderer = $itemPriceRenderer;
         $this->itemPriceRenderer->setZone('sales');
         parent::__construct($context, $data);
     }

app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php

@@ -13,10 +13,25 @@
 
 namespace Magento\Tax\Block\Adminhtml\Rate;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Block\Widget\Form\Generic;
 use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Directory\Model\Config\Source\Country;
+use Magento\Directory\Model\RegionFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Form as FormData;
+use Magento\Framework\Data\FormFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\Framework\View\Element\Template;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Tax\Api\TaxRateRepositoryInterface;
+use Magento\Tax\Block\Adminhtml\Rate\Title\FieldsetFactory;
 use Magento\Tax\Controller\RegistryConstants;
+use Magento\Tax\Helper\Data as TaxHelper;
+use Magento\Tax\Model\Calculation\Rate\Converter;
+use Magento\Tax\Model\Config;
+use Magento\Tax\Model\TaxRateCollection;
 
 /**
  * Tax rate form.
@@ -25,7 +40,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-class Form extends \Magento\Backend\Block\Widget\Form\Generic
+class Form extends Generic
 {
     const FORM_ELEMENT_ID = 'rate-form';
 
@@ -42,66 +57,66 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     /**
      * Tax data
      *
-     * @var \Magento\Tax\Helper\Data|null
+     * @var TaxHelper|null
      */
     protected $_taxData = null;
 
     /**
-     * @var \Magento\Tax\Block\Adminhtml\Rate\Title\FieldsetFactory
+     * @var FieldsetFactory
      */
     protected $_fieldsetFactory;
 
     /**
-     * @var \Magento\Directory\Model\Config\Source\Country
+     * @var Country
      */
     protected $_country;
 
     /**
-     * @var \Magento\Directory\Model\RegionFactory
+     * @var RegionFactory
      */
     protected $_regionFactory;
 
     /**
-     * @var \Magento\Tax\Api\TaxRateRepositoryInterface
+     * @var TaxRateRepositoryInterface
      */
     protected $_taxRateRepository;
 
     /**
-     * @var \Magento\Tax\Model\TaxRateCollection
+     * @var TaxRateCollection
      */
     protected $_taxRateCollection;
 
     /**
-     * @var \Magento\Tax\Model\Calculation\Rate\Converter
+     * @var Converter
      */
     protected $_taxRateConverter;
 
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Data\FormFactory $formFactory
-     * @param \Magento\Directory\Model\RegionFactory $regionFactory
-     * @param \Magento\Directory\Model\Config\Source\Country $country
-     * @param \Magento\Tax\Block\Adminhtml\Rate\Title\FieldsetFactory $fieldsetFactory
-     * @param \Magento\Tax\Helper\Data $taxData
-     * @param \Magento\Tax\Api\TaxRateRepositoryInterface $taxRateRepository
-     * @param \Magento\Tax\Model\TaxRateCollection $taxRateCollection
-     * @param \Magento\Tax\Model\Calculation\Rate\Converter $taxRateConverter
+     * @param Context $context
+     * @param Registry $registry
+     * @param FormFactory $formFactory
+     * @param RegionFactory $regionFactory
+     * @param Country $country
+     * @param FieldsetFactory $fieldsetFactory
+     * @param TaxHelper $taxData
+     * @param TaxRateRepositoryInterface $taxRateRepository
+     * @param TaxRateCollection $taxRateCollection
+     * @param Converter $taxRateConverter
      * @param array $data
      * @param DirectoryHelper|null $directoryHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Framework\Data\FormFactory $formFactory,
-        \Magento\Directory\Model\RegionFactory $regionFactory,
-        \Magento\Directory\Model\Config\Source\Country $country,
-        \Magento\Tax\Block\Adminhtml\Rate\Title\FieldsetFactory $fieldsetFactory,
-        \Magento\Tax\Helper\Data $taxData,
-        \Magento\Tax\Api\TaxRateRepositoryInterface $taxRateRepository,
-        \Magento\Tax\Model\TaxRateCollection $taxRateCollection,
-        \Magento\Tax\Model\Calculation\Rate\Converter $taxRateConverter,
+        Context $context,
+        Registry $registry,
+        FormFactory $formFactory,
+        RegionFactory $regionFactory,
+        Country $country,
+        FieldsetFactory $fieldsetFactory,
+        TaxHelper $taxData,
+        TaxRateRepositoryInterface $taxRateRepository,
+        TaxRateCollection $taxRateCollection,
+        Converter $taxRateConverter,
         array $data = [],
         ?DirectoryHelper $directoryHelper = null
     ) {
@@ -156,23 +171,23 @@ protected function _prepareForm()
             $formData['tax_postcode'] = $formData['zip_from'] . '-' . $formData['zip_to'];
         }
 
-        /** @var \Magento\Framework\Data\Form $form */
+        /** @var FormData $form */
         $form = $this->_formFactory->create();
 
         $countries = $this->_country->toOptionArray(false, 'US');
         unset($countries[0]);
 
         if (!isset($formData['tax_country_id'])) {
             $formData['tax_country_id'] = $this->_scopeConfig->getValue(
-                \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
+                ScopeInterface::SCOPE_STORE
             );
         }
 
         if (!isset($formData['tax_region_id'])) {
             $formData['tax_region_id'] = $this->_scopeConfig->getValue(
-                \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                Config::CONFIG_XML_PATH_DEFAULT_REGION,
+                ScopeInterface::SCOPE_STORE
             );
         }
 
@@ -226,8 +241,8 @@ protected function _prepareForm()
 
         if (!isset($formData['tax_postcode'])) {
             $formData['tax_postcode'] = $this->_scopeConfig->getValue(
-                \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_POSTCODE,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                Config::CONFIG_XML_PATH_DEFAULT_POSTCODE,
+                ScopeInterface::SCOPE_STORE
             );
         }
 
@@ -313,7 +328,7 @@ protected function _prepareForm()
         $this->setChild(
             'form_after',
             $this->getLayout()->createBlock(
-                \Magento\Framework\View\Element\Template::class
+                Template::class
             )->setTemplate('Magento_Tax::rate/js.phtml')
         );
 

app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Data.php

@@ -11,6 +11,8 @@
  */
 namespace Magento\Tax\Block\Adminhtml\Rate\Grid\Renderer;
 
-class Data extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
+use Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer;
+
+class Data extends AbstractRenderer
 {
 }

app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php

@@ -6,14 +6,19 @@
 
 namespace Magento\Tax\Block\Adminhtml\Rate;
 
+use Magento\Framework\Registry;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Store\Model\StoreFactory;
+use Magento\Tax\Api\TaxRateRepositoryInterface;
 use Magento\Tax\Controller\RegistryConstants;
 
 /**
  * Tax Rate Titles Renderer
  *
  * @author Magento Core Team <[email protected]>
  */
-class Title extends \Magento\Framework\View\Element\Template
+class Title extends Template
 {
     /**
      * @var array
@@ -26,34 +31,34 @@ class Title extends \Magento\Framework\View\Element\Template
     protected $_template = 'Magento_Tax::rate/title.phtml';
 
     /**
-     * @var \Magento\Store\Model\StoreFactory
+     * @var StoreFactory
      */
     protected $_storeFactory;
 
     /**
-     * @var \Magento\Framework\Registry
+     * @var Registry
      */
     protected $_coreRegistry;
 
     /**
-     * @var \Magento\Tax\Api\TaxRateRepositoryInterface
+     * @var TaxRateRepositoryInterface
      */
     protected $_taxRateRepository;
 
     /**
      * Initialize dependencies
      *
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Store\Model\StoreFactory $storeFactory
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Tax\Api\TaxRateRepositoryInterface $taxRateRepository
+     * @param Context $context
+     * @param StoreFactory $storeFactory
+     * @param Registry $coreRegistry
+     * @param TaxRateRepositoryInterface $taxRateRepository
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Store\Model\StoreFactory $storeFactory,
-        \Magento\Framework\Registry $coreRegistry,
-        \Magento\Tax\Api\TaxRateRepositoryInterface $taxRateRepository,
+        Context $context,
+        StoreFactory $storeFactory,
+        Registry $coreRegistry,
+        TaxRateRepositoryInterface $taxRateRepository,
         array $data = []
     ) {
         $this->_coreRegistry = $coreRegistry;