Use constructor property promotion in module TaxImportExport

app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/Grid/Renderer/Country.php

@@ -9,15 +9,18 @@
  */
 namespace Magento\TaxImportExport\Block\Adminhtml\Rate\Grid\Renderer;
 
-class Country extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Country
+use Magento\Backend\Block\Widget\Grid\Column\Renderer\Country as ColumnRendererCountry;
+use Magento\Framework\DataObject;
+
+class Country extends ColumnRendererCountry
 {
     /**
      * Render column for export
      *
-     * @param \Magento\Framework\DataObject $row
+     * @param DataObject $row
      * @return string
      */
-    public function renderExport(\Magento\Framework\DataObject $row)
+    public function renderExport(DataObject $row)
     {
         return $row->getData($this->getColumn()->getIndex());
     }

app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php

@@ -5,22 +5,25 @@
  */
 namespace Magento\TaxImportExport\Block\Adminhtml\Rate;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Block\Widget;
+
 /**
  * @api
  * @since 100.0.2
  */
-class ImportExport extends \Magento\Backend\Block\Widget
+class ImportExport extends Widget
 {
     /**
      * @var string
      */
     protected $_template = 'Magento_TaxImportExport::importExport.phtml';
 
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
+     * @param Context $context
      * @param array $data
      */
-    public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
+    public function __construct(Context $context, array $data = [])
     {
         parent::__construct($context, $data);
         $this->setUseContainer(true);

app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php

@@ -9,7 +9,9 @@
  */
 namespace Magento\TaxImportExport\Block\Adminhtml\Rate;
 
-class ImportExportHeader extends \Magento\Backend\Block\Widget
+use Magento\Backend\Block\Widget;
+
+class ImportExportHeader extends Widget
 {
     /**
      * Block's template

app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate.php

@@ -5,10 +5,14 @@
  */
 namespace Magento\TaxImportExport\Controller\Adminhtml;
 
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Response\Http\FileFactory;
+
 /**
  * Adminhtml tax rate controller
  */
-abstract class Rate extends \Magento\Backend\App\Action
+abstract class Rate extends Action
 {
     /**
      * Authorization level of a basic admin session
@@ -18,19 +22,13 @@ abstract class Rate extends \Magento\Backend\App\Action
     const ADMIN_RESOURCE = 'Magento_Tax::manage_tax';
 
     /**
-     * @var \Magento\Framework\App\Response\Http\FileFactory
-     */
-    protected $fileFactory;
-
-    /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param Context $context
+     * @param FileFactory $fileFactory
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+        Context $context,
+        protected readonly FileFactory $fileFactory
     ) {
-        $this->fileFactory = $fileFactory;
         parent::__construct($context);
     }
 }

app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php

@@ -8,8 +8,10 @@
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\View\Result\Layout;
+use Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
-class ExportCsv extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
+class ExportCsv extends Rate
 {
     /**
      * Export rates grid to CSV format
@@ -18,7 +20,7 @@ class ExportCsv extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
      */
     public function execute()
     {
-        /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+        /** @var Layout $resultLayout */
         $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
         $content = $resultLayout->getLayout()->getChildBlock('adminhtml.tax.rate.grid', 'grid.export');
 

app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php

@@ -7,8 +7,13 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\DataObject;
+use Magento\Store\Model\Store;
+use Magento\Tax\Model\Calculation\Rate\Title;
+use Magento\Tax\Model\ResourceModel\Calculation\Rate\Collection;
+use Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
-class ExportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
+class ExportPost extends Rate
 {
     /**
      * Export action from import/export tax
@@ -18,7 +23,7 @@ class ExportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
     public function execute()
     {
         /** start csv content and set template */
-        $headers = new \Magento\Framework\DataObject(
+        $headers = new DataObject(
             [
                 'code' => __('Code'),
                 'country_name' => __('Country'),
@@ -38,7 +43,7 @@ public function execute()
         $taxCalculationRateTitleDict = [];
 
         foreach ($this->_objectManager->create(
-            \Magento\Store\Model\Store::class
+            Store::class
         )->getCollection()->setLoadDefault(
             false
         ) as $store) {
@@ -52,7 +57,7 @@ public function execute()
         $content .= "\n";
 
         foreach ($this->_objectManager->create(
-            \Magento\Tax\Model\Calculation\Rate\Title::class
+            Title::class
         )->getCollection() as $title) {
             $rateId = $title->getTaxCalculationRateId();
 
@@ -65,7 +70,7 @@ public function execute()
         unset($title);
 
         $collection = $this->_objectManager->create(
-            \Magento\Tax\Model\ResourceModel\Calculation\Rate\Collection::class
+            Collection::class
         )->joinCountryTable()->joinRegionTable();
 
         while ($rate = $collection->fetchItem()) {

app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php

@@ -8,8 +8,10 @@
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\View\Result\Layout;
+use Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
-class ExportXml extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
+class ExportXml extends Rate
 {
     /**
      * Export rates grid to XML format
@@ -18,7 +20,7 @@ class ExportXml extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
      */
     public function execute()
     {
-        /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+        /** @var Layout $resultLayout */
         $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
         $content = $resultLayout->getLayout()->getChildBlock('adminhtml.tax.rate.grid', 'grid.export');
 

app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php

@@ -5,10 +5,14 @@
  */
 namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
+use Magento\Backend\Model\View\Result\Page;
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport as RateImportExport;
+use Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExportHeader;
+use Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
-class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate implements HttpGetActionInterface
+class ImportExport extends Rate implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -20,21 +24,21 @@ class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate im
     /**
      * Import and export Page
      *
-     * @return \Magento\Backend\Model\View\Result\Page
+     * @return Page
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        /** @var Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
 
         $resultPage->setActiveMenu('Magento_TaxImportExport::system_convert_tax');
         $resultPage->addContent(
             $resultPage->getLayout()->createBlock(
-                \Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExportHeader::class
+                ImportExportHeader::class
             )
         );
         $resultPage->addContent(
-            $resultPage->getLayout()->createBlock(\Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport::class)
+            $resultPage->getLayout()->createBlock(RateImportExport::class)
         );
         $resultPage->getConfig()->getTitle()->prepend(__('Tax Zones and Rates'));
         $resultPage->getConfig()->getTitle()->prepend(__('Import and Export Tax Rates'));

app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php

@@ -5,36 +5,41 @@
  */
 namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
+use Exception;
+use Magento\Backend\Model\View\Result\Redirect as ResultRedirect;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\TaxImportExport\Controller\Adminhtml\Rate;
+use Magento\TaxImportExport\Model\Rate\CsvImportHandler;
 
-class ImportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
+class ImportPost extends Rate
 {
     /**
      * import action from import/export tax
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return ResultRedirect
      */
     public function execute()
     {
         $importRatesFile = $this->getRequest()->getFiles('import_rates_file');
         if ($this->getRequest()->isPost() && isset($importRatesFile['tmp_name'])) {
             try {
-                /** @var $importHandler \Magento\TaxImportExport\Model\Rate\CsvImportHandler */
+                /** @var CsvImportHandler $importHandler */
                 $importHandler = $this->_objectManager->create(
-                    \Magento\TaxImportExport\Model\Rate\CsvImportHandler::class
+                    CsvImportHandler::class
                 );
                 $importHandler->importFromCsvFile($importRatesFile);
 
                 $this->messageManager->addSuccess(__('The tax rate has been imported.'));
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            } catch (LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 $this->messageManager->addError(__('Invalid file upload attempt'));
             }
         } else {
             $this->messageManager->addError(__('Invalid file upload attempt'));
         }
-        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        /** @var ResultRedirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setUrl($this->_redirect->getRedirectUrl());
         return $resultRedirect;