Use constructor property promotion in module Theme

app/code/Magento/Theme/Block/Adminhtml/Design/Config/Edit/Scope.php

@@ -18,21 +18,15 @@
  */
 class Scope extends Template
 {
-    /**
-     * @var ScopeResolverPool
-     */
-    private $scopeResolverPool;
-
     /**
      * @param Context $context
      * @param ScopeResolverPool $scopeResolverPool
      */
     public function __construct(
         Context $context,
-        ScopeResolverPool $scopeResolverPool
+        private readonly ScopeResolverPool $scopeResolverPool
     ) {
         parent::__construct($context);
-        $this->scopeResolverPool = $scopeResolverPool;
     }
 
     /**

app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php

@@ -5,13 +5,16 @@
  */
 namespace Magento\Theme\Block\Adminhtml\System\Design;
 
+use Magento\Backend\Block\Widget\Grid\Container;
+use Magento\Framework\Phrase;
+
 /**
  *  Container for theme grid
  *
  * @api
  * @since 100.0.2
  */
-class Theme extends \Magento\Backend\Block\Widget\Grid\Container
+class Theme extends Container
 {
     /**
      * Initialize grid container and prepare controls
@@ -33,7 +36,7 @@ public function _construct()
     /**
      * Prepare header for container
      *
-     * @return \Magento\Framework\Phrase
+     * @return Phrase
      */
     public function getHeaderText()
     {

app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php

@@ -9,27 +9,34 @@
  */
 namespace Magento\Theme\Block\Adminhtml\System\Design\Theme;
 
+use Magento\Backend\Block\Widget\Context;
+use Magento\Backend\Block\Widget\Form\Container;
+use Magento\Framework\Registry;
+use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Theme\Model\Theme;
+
 /**
  * @api
  * @since 100.0.2
  */
-class Edit extends \Magento\Backend\Block\Widget\Form\Container
+class Edit extends Container
 {
     /**
      * Core registry
      *
-     * @var \Magento\Framework\Registry
+     * @var Registry
      */
     protected $_coreRegistry = null;
 
     /**
-     * @param \Magento\Backend\Block\Widget\Context $context
-     * @param \Magento\Framework\Registry $registry
+     * @param Context $context
+     * @param Registry $registry
      * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Widget\Context $context,
-        \Magento\Framework\Registry $registry,
+        Context $context,
+        Registry $registry,
         array $data = []
     ) {
         $this->_coreRegistry = $registry;
@@ -39,7 +46,7 @@ public function __construct(
     /**
      * Prepare layout
      *
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     * @return AbstractBlock
      */
     protected function _prepareLayout()
     {
@@ -51,7 +58,7 @@ protected function _prepareLayout()
             $this->getLayout()->getBlock('page.title')->setPageTitle($this->getHeaderText());
         }
 
-        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        /** @var ThemeInterface $theme */
         $theme = $this->_getCurrentTheme();
         if ($theme) {
             if ($theme->isEditable()) {
@@ -98,7 +105,7 @@ protected function _prepareLayout()
      */
     public function getHeaderText()
     {
-        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        /** @var ThemeInterface $theme */
         $theme = $this->_getCurrentTheme();
         if ($theme->getId()) {
             $header = __('Theme: %1', $theme->getThemeTitle());
@@ -111,7 +118,7 @@ public function getHeaderText()
     /**
      * Get current theme
      *
-     * @return \Magento\Theme\Model\Theme
+     * @return Theme
      */
     protected function _getCurrentTheme()
     {

app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/AbstractTab.php

@@ -5,39 +5,46 @@
  */
 namespace Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Block\Widget\Form\Generic;
+use Magento\Backend\Block\Widget\Tab\TabInterface;
+use Magento\Framework\Data\FormFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Theme\Model\Theme;
+
 /**
  * Theme form tab abstract block
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
-abstract class AbstractTab extends \Magento\Backend\Block\Widget\Form\Generic implements
-    \Magento\Backend\Block\Widget\Tab\TabInterface
+abstract class AbstractTab extends Generic implements TabInterface
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $_objectManager;
 
     /**
      * Core registry
      *
-     * @var \Magento\Framework\Registry
+     * @var Registry
      */
     protected $_coreRegistry = null;
 
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Data\FormFactory $formFactory
-     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param Context $context
+     * @param Registry $registry
+     * @param FormFactory $formFactory
+     * @param ObjectManagerInterface $objectManager
      * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Framework\Data\FormFactory $formFactory,
-        \Magento\Framework\ObjectManagerInterface $objectManager,
+        Context $context,
+        Registry $registry,
+        FormFactory $formFactory,
+        ObjectManagerInterface $objectManager,
         array $data = []
     ) {
         parent::__construct($context, $registry, $formFactory, $data);
@@ -47,7 +54,7 @@ public function __construct(
     /**
      * Get theme that is edited currently
      *
-     * @return \Magento\Theme\Model\Theme
+     * @return Theme
      */
     protected function _getCurrentTheme()
     {

app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form.php

@@ -5,21 +5,26 @@
  */
 namespace Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit;
 
+use Magento\Backend\Block\Widget\Form as WidgetForm;
+use Magento\Backend\Block\Widget\Form\Generic;
+use Magento\Framework\Data\Form as FormData;
+use Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Form as SystemDesignThemeEditForm;
+
 /**
  * Theme Edit Form
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
-class Form extends \Magento\Backend\Block\Widget\Form\Generic
+class Form extends Generic
 {
     /**
      * Initialize theme form
      *
-     * @return \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Form|\Magento\Backend\Block\Widget\Form
+     * @return SystemDesignThemeEditForm|WidgetForm
      */
     protected function _prepareForm()
     {
-        /** @var \Magento\Framework\Data\Form $form */
+        /** @var FormData $form */
         $form = $this->_formFactory->create(
             [
                 'data' => [

app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/File.php

@@ -9,7 +9,9 @@
  */
 namespace Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Form\Element;
 
-class File extends \Magento\Framework\Data\Form\Element\File
+use Magento\Framework\Data\Form\Element\File as FormElementFile;
+
+class File extends FormElementFile
 {
     /**
      * Additional html attributes

app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Image.php

@@ -6,12 +6,14 @@
 
 namespace Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Form\Element;
 
+use Magento\Framework\Data\Form\Element\Image as FormElementImage;
+
 /**
  * Image form element that generates correct thumbnail image URL for theme preview image
  *
  * @method \Magento\Theme\Model\Theme getTheme()
  */
-class Image extends \Magento\Framework\Data\Form\Element\Image
+class Image extends FormElementImage
 {
     /**
      * Get image preview url

app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form/Element/Links.php

@@ -11,18 +11,23 @@
  */
 namespace Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Form\Element;
 
-class Links extends \Magento\Framework\Data\Form\Element\AbstractElement
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Escaper;
+
+class Links extends AbstractElement
 {
     /**
-     * @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
-     * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
-     * @param \Magento\Framework\Escaper $escaper
+     * @param Factory $factoryElement
+     * @param CollectionFactory $factoryCollection
+     * @param Escaper $escaper
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\Data\Form\Element\Factory $factoryElement,
-        \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
-        \Magento\Framework\Escaper $escaper,
+        Factory $factoryElement,
+        CollectionFactory $factoryCollection,
+        Escaper $escaper,
         $data = []
     ) {
         parent::__construct($factoryElement, $factoryCollection, $escaper, $data);