Use constructor property promotion in module Ui

app/code/Magento/Ui/Block/Component/StepsWizard.php

@@ -5,13 +5,16 @@
  */
 namespace Magento\Ui\Block\Component;
 
+use Magento\Framework\View\Element\Template;
+use Magento\Ui\Block\Component\StepsWizard\StepInterface;
+
 /**
  * Multi steps wizard block
  *
  * @api
  * @since 100.0.2
  */
-class StepsWizard extends \Magento\Framework\View\Element\Template
+class StepsWizard extends Template
 {
     /**
      * Wizard step template
@@ -26,12 +29,12 @@ class StepsWizard extends \Magento\Framework\View\Element\Template
     protected $initData = [];
 
     /**
-     * @var null|\Magento\Ui\Block\Component\StepsWizard\StepInterface[]
+     * @var null|StepInterface[]
      */
     private $steps;
 
     /**
-     * @return \Magento\Ui\Block\Component\StepsWizard\StepInterface[]
+     * @return StepInterface[]
      */
     public function getSteps()
     {

app/code/Magento/Ui/Block/Component/StepsWizard/StepAbstract.php

@@ -5,10 +5,12 @@
  */
 namespace Magento\Ui\Block\Component\StepsWizard;
 
+use Magento\Framework\View\Element\Template;
+
 /**
  * Abstract block for multi-step wizard UI
  */
-abstract class StepAbstract extends \Magento\Framework\View\Element\Template implements StepInterface
+abstract class StepAbstract extends Template implements StepInterface
 {
     /**
      * @inheritdoc

app/code/Magento/Ui/Block/Component/StepsWizard/StepInterface.php

@@ -5,13 +5,15 @@
  */
 namespace Magento\Ui\Block\Component\StepsWizard;
 
+use Magento\Framework\View\Element\BlockInterface;
+
 /**
  * Interface for multi-step wizard blocks
  *
  * @api
  * @since 100.0.2
  */
-interface StepInterface extends \Magento\Framework\View\Element\BlockInterface
+interface StepInterface extends BlockInterface
 {
     /**
      * Get step caption

app/code/Magento/Ui/Block/Logger.php

@@ -16,23 +16,17 @@
  */
 class Logger extends Template
 {
-    /**
-     * @var Config
-     */
-    protected $config;
-
     /**
      * @param Template\Context $context
      * @param Config $config
      * @param array $data
      */
     public function __construct(
         Template\Context $context,
-        Config $config,
+        protected readonly Config $config,
         array $data = []
     ) {
         parent::__construct($context, $data);
-        $this->config = $config;
     }
 
     /**

app/code/Magento/Ui/Block/Wrapper.php

@@ -7,28 +7,27 @@
 
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Ui\Component\AbstractComponent;
 use Magento\Ui\Model\UiComponentGenerator;
 
 /**
  * This block is wrapper for UI component, this done in order to save compatibility with old widgets mechanism
  */
-class Wrapper extends \Magento\Framework\View\Element\Template
+class Wrapper extends Template
 {
-    /**
-     * @var UiComponentGenerator
-     */
-    private $uiComponentGenerator;
-
     /**
      * Wrapper constructor.
      * @param Template\Context $context
      * @param UiComponentGenerator $uiComponentGenerator
      * @param array $data
      */
-    public function __construct(Template\Context $context, UiComponentGenerator $uiComponentGenerator, array $data = [])
+    public function __construct(
+        Template\Context $context,
+        private readonly UiComponentGenerator $uiComponentGenerator,
+        array $data = []
+    )
     {
         parent::__construct($context, $data);
-        $this->uiComponentGenerator = $uiComponentGenerator;
     }
 
     /**
@@ -86,7 +85,7 @@ private function addDataToChildComponents(UiComponentInterface $uiComponent, arr
      */
     public function renderApp($data = [])
     {
-        /** @var \Magento\Ui\Component\AbstractComponent $uiComponent */
+        /** @var AbstractComponent $uiComponent */
         $uiComponent = $this->uiComponentGenerator
             ->generateUiComponent($this->getData('uiComponent'), $this->getLayout());
         $this->injectDataInDataSource($uiComponent, $this->getData());

app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Ui\Block\Wysiwyg;
 
+use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Ui\Model;
@@ -15,20 +16,10 @@
  * @api
  * @since 101.1.0
  */
-class ActiveEditor extends \Magento\Framework\View\Element\Template
+class ActiveEditor extends Template
 {
     const DEFAULT_EDITOR_PATH = 'mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter';
 
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * @var array
-     */
-    private $availableAdapterPaths;
-
     /**
      * ActiveEditor constructor.
      * @param Context $context
@@ -38,13 +29,11 @@ class ActiveEditor extends \Magento\Framework\View\Element\Template
      */
     public function __construct(
         Context $context,
-        ScopeConfigInterface $scopeConfig,
-        $availableAdapterPaths = [],
+        private readonly ScopeConfigInterface $scopeConfig,
+        private $availableAdapterPaths = [],
         array $data = []
     ) {
         parent::__construct($context, $data);
-        $this->scopeConfig = $scopeConfig;
-        $this->availableAdapterPaths = $availableAdapterPaths;
     }
 
     /**

app/code/Magento/Ui/Component/AbstractComponent.php

@@ -22,18 +22,6 @@
  */
 abstract class AbstractComponent extends DataObject implements UiComponentInterface
 {
-    /**
-     * Render context
-     *
-     * @var ContextInterface
-     */
-    protected $context;
-
-    /**
-     * @var UiComponentInterface[]
-     */
-    protected $components;
-
     /**
      * @var array
      */
@@ -52,12 +40,10 @@ abstract class AbstractComponent extends DataObject implements UiComponentInterf
      * @param array $data
      */
     public function __construct(
-        ContextInterface $context,
-        array $components = [],
+        protected readonly ContextInterface $context,
+        protected array $components = [],
         array $data = []
     ) {
-        $this->context = $context;
-        $this->components = $components;
         $this->_data = array_replace_recursive($this->_data, $data);
         $this->initObservers($this->_data);
     }

app/code/Magento/Ui/Component/Action.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Ui\Component;
 
+use JsonSerializable;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
@@ -14,25 +15,19 @@ class Action extends AbstractComponent
 {
     const NAME = 'action';
 
-    /**
-     * @var array|\JsonSerializable
-     */
-    protected $actions;
-
     /**
      * @param ContextInterface $context
      * @param array $components
      * @param array $data
-     * @param array|\JsonSerializable $actions
+     * @param array|JsonSerializable $actions
      */
     public function __construct(
         ContextInterface $context,
         array $components = [],
         array $data = [],
-        $actions = null
+        protected $actions = null
     ) {
         parent::__construct($context, $components, $data);
-        $this->actions = $actions;
     }
 
     /**

app/code/Magento/Ui/Component/Bookmark.php

@@ -9,6 +9,7 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Api\BookmarkManagementInterface;
 use Magento\Ui\Api\BookmarkRepositoryInterface;
+use Magento\Ui\Api\Data\BookmarkInterface;
 
 /**
  * Class Bookmark
@@ -17,21 +18,11 @@ class Bookmark extends AbstractComponent
 {
     const NAME = 'bookmark';
 
-    /**
-     * @var BookmarkRepositoryInterface
-     */
-    protected $bookmarkRepository;
-
     /**
      * @var FilterBuilder
      */
     protected $filterBuilder;
 
-    /**
-     * @var BookmarkManagementInterface
-     */
-    protected $bookmarkManagement;
-
     /**
      * @param ContextInterface $context
      * @param BookmarkRepositoryInterface $bookmarkRepository
@@ -41,14 +32,12 @@ class Bookmark extends AbstractComponent
      */
     public function __construct(
         ContextInterface $context,
-        BookmarkRepositoryInterface $bookmarkRepository,
-        BookmarkManagementInterface $bookmarkManagement,
+        protected readonly BookmarkRepositoryInterface $bookmarkRepository,
+        protected readonly BookmarkManagementInterface $bookmarkManagement,
         array $components = [],
         array $data = []
     ) {
         parent::__construct($context, $components, $data);
-        $this->bookmarkRepository = $bookmarkRepository;
-        $this->bookmarkManagement = $bookmarkManagement;
     }
 
     /**
@@ -72,7 +61,7 @@ public function prepare()
         $config = [];
         if (!empty($namespace)) {
             $bookmarks = $this->bookmarkManagement->loadByNamespace($namespace);
-            /** @var \Magento\Ui\Api\Data\BookmarkInterface $bookmark */
+            /** @var BookmarkInterface $bookmark */
             foreach ($bookmarks->getItems() as $bookmark) {
                 if ($bookmark->isCurrent()) {
                     $config['activeIndex'] = $bookmark->getIdentifier();

app/code/Magento/Ui/Component/Control/ActionPool.php

@@ -21,27 +21,13 @@ class ActionPool implements ActionPoolInterface
      */
     const ACTIONS_PAGE_TOOLBAR = 'page.actions.toolbar';
 
-    /**
-     * Render context
-     *
-     * @var Context
-     */
-    protected $context;
-
     /**
      * Actions pool
      *
      * @var Item[]
      */
     protected $items;
 
-    /**
-     * Button factory
-     *
-     * @var ItemFactory
-     */
-    protected $itemFactory;
-
     /**
      * @var AbstractBlock
      */
@@ -53,10 +39,10 @@ class ActionPool implements ActionPoolInterface
      * @param Context $context
      * @param ItemFactory $itemFactory
      */
-    public function __construct(Context $context, ItemFactory $itemFactory)
-    {
-        $this->context = $context;
-        $this->itemFactory = $itemFactory;
+    public function __construct(
+        protected readonly Context $context,
+        protected readonly ItemFactory $itemFactory
+    ) {
     }
 
     /**
@@ -120,9 +106,9 @@ public function update($key, array $data)
     /**
      * Add html block
      *
-     * @param  string $type
-     * @param  string $name
-     * @param  array $arguments
+     * @param string $type
+     * @param string $name
+     * @param array $arguments
      * @return void
      */
     public function addHtmlBlock($type, $name = '', array $arguments = [])
@@ -144,7 +130,7 @@ public function addHtmlBlock($type, $name = '', array $arguments = [])
     protected function createContainer($key, UiComponentInterface $view)
     {
         $container = $this->context->getPageLayout()->createBlock(
-            \Magento\Ui\Component\Control\Container::class,
+            Container::class,
             'container-' . $view->getName() . '-' . $key,
             [
                 'data' => [

app/code/Magento/Ui/Component/Control/Button.php

@@ -17,11 +17,6 @@
  */
 class Button extends Template implements ControlInterface
 {
-    /**
-     * @var Random
-     */
-    private $random;
-
     /**
      * @var SecureHtmlRenderer
      */
@@ -36,7 +31,7 @@ class Button extends Template implements ControlInterface
     public function __construct(
         Context $context,
         array $data = [],
-        ?Random $random = null,
+        private ?Random $random = null,
         ?SecureHtmlRenderer $htmlRenderer = null
     ) {
         parent::__construct($context, $data);