Introducing dynamic generic type definitions in php docblocks, to imp…

app/code/Magento/ProductAlert/Helper/Data.php

@@ -110,8 +110,12 @@ public function getSaveUrl($type)
     /**
      * Create block instance
      *
-     * @param string|\Magento\Framework\View\Element\AbstractBlock $block
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     * @template T of \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @param class-string<T>|T $block
+     *
+     * @return T
+     *
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function createBlock($block)

lib/internal/Magento/Framework/View/Element/BlockFactory.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\View\Element;
 
@@ -33,9 +33,13 @@ public function __construct(ObjectManagerInterface $objectManager)
     /**
      * Create block
      *
-     * @param string $blockName
+     * @template T of BlockInterface
+     *
+     * @param class-string<T> $blockName
      * @param array $arguments
-     * @return \Magento\Framework\View\Element\BlockInterface
+     *
+     * @return T
+     *
      * @throws \LogicException
      */
     public function createBlock($blockName, array $arguments = [])

lib/internal/Magento/Framework/View/Layout.php

@@ -175,7 +175,7 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
     protected $appState;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var Logger
      */
     protected $logger;
 
@@ -204,8 +204,8 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * @param FrontendInterface $cache
      * @param ContextFactory $readerContextFactory
      * @param Layout\Generator\ContextFactory $generatorContextFactory
-     * @param State $appState
-     * @param LoggerInterface $logger
+     * @param AppState $appState
+     * @param Logger $logger
      * @param bool $cacheable
      * @param SerializerInterface|null $serializer
      * @param int|null $cacheLifetime
@@ -785,45 +785,56 @@ public function unsetElement($name)
     /**
      * Block Factory
      *
-     * @param string $type
+     * @template T of \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @param class-string<T> $type
      * @param string $name
      * @param array $arguments
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @return T
      */
     public function createBlock($type, $name = '', array $arguments = [])
     {
         $this->build();
         $name = $this->structure->createStructuralElement($name, Element::TYPE_BLOCK, $type);
         $block = $this->_createBlock($type, $name, $arguments);
         $block->setLayout($this);
+
         return $block;
     }
 
     /**
      * Create block and add to layout
      *
-     * @param string $type
+     * @template T of \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @param class-string<T> $type
      * @param string $name
      * @param array $arguments
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @return T
      */
     protected function _createBlock($type, $name, array $arguments = [])
     {
         /** @var \Magento\Framework\View\Layout\Generator\Block $blockGenerator */
         $blockGenerator = $this->generatorPool->getGenerator(Layout\Generator\Block::TYPE);
         $block = $blockGenerator->createBlock($type, $name, $arguments);
         $this->setBlock($name, $block);
+
         return $block;
     }
 
     /**
      * Add a block to registry, create new object if needed
      *
-     * @param string|\Magento\Framework\View\Element\AbstractBlock $block
+     * @template T of \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @param class-string<T>|T $block
      * @param string $name
      * @param string $parent
      * @param string $alias
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @return T
      */
     public function addBlock($block, $name = '', $parent = '', $alias = '')
     {
@@ -1012,8 +1023,12 @@ public function getMessagesBlock()
     /**
      * Get block singleton
      *
-     * @param string $type
-     * @return \Magento\Framework\App\Helper\AbstractHelper
+     * @template T of \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @param class-string<T> $type
+     *
+     * @return T
+     *
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getBlockSingleton($type)
@@ -1086,7 +1101,7 @@ public function executeRenderer($namespace, $staticType, $dynamicType, $data = [
         $this->build();
         if ($options = $this->getRendererOptions($namespace, $staticType, $dynamicType)) {
             $dictionary = [];
-            /** @var $block \Magento\Framework\View\Element\Template */
+            /** @var \Magento\Framework\View\Element\Template $block */
             $block = $this->createBlock($options['type'], '')
                 ->setData($data)
                 ->assign($dictionary)

lib/internal/Magento/Framework/View/Layout/Generator/Block.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\View\Layout\Generator;
 
@@ -20,7 +20,7 @@ class Block implements Layout\GeneratorInterface
     /**
      * Type of generator
      */
-    const TYPE = 'block';
+    public const TYPE = 'block';
 
     /**
      * @var \Magento\Framework\View\Element\BlockFactory
@@ -123,7 +123,7 @@ public function process(Layout\Reader\Context $readerContext, Layout\Generator\C
         $scheduledStructure = $readerContext->getScheduledStructure();
         $layout = $generatorContext->getLayout();
         $structure = $generatorContext->getStructure();
-        /** @var $blocks \Magento\Framework\View\Element\AbstractBlock[] */
+        /** @var \Magento\Framework\View\Element\AbstractBlock[] $blocks */
         $blocks = [];
         $blockActions = [];
         // Instantiate blocks and collect all actions data
@@ -242,10 +242,13 @@ protected function generateBlock(
     /**
      * Create block instance
      *
-     * @param string|\Magento\Framework\View\Element\AbstractBlock $block
+     * @template T of \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @param class-string<T>|T $block
      * @param string $name
      * @param array $arguments
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @return T
      */
     public function createBlock($block, $name, array $arguments = [])
     {
@@ -259,10 +262,14 @@ public function createBlock($block, $name, array $arguments = [])
     /**
      * Create block object instance based on block type
      *
-     * @param string|\Magento\Framework\View\Element\AbstractBlock $block
+     * @template T of \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @param class-string<T>|T $block
      * @param array $arguments
+     *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     *
+     * @return T
      */
     protected function getBlockInstance($block, array $arguments = [])
     {

lib/internal/Magento/Framework/View/LayoutInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\View;
 
@@ -187,21 +187,27 @@ public function getParentName($childName);
     /**
      * Block Factory
      *
-     * @param  string $type
-     * @param  string $name
-     * @param  array $arguments
-     * @return Element\BlockInterface
+     * @template T of Element\BlockInterface
+     *
+     * @param class-string<T> $type
+     * @param string $name
+     * @param array $arguments
+     *
+     * @return T
      */
     public function createBlock($type, $name = '', array $arguments = []);
 
     /**
      * Add a block to registry, create new object if needed
      *
-     * @param string|\Magento\Framework\View\Element\AbstractBlock $block
+     * @template T of Element\BlockInterface
+     *
+     * @param class-string<T>|T $block
      * @param string $name
      * @param string $parent
      * @param string $alias
-     * @return Element\BlockInterface
+     *
+     * @return T
      */
     public function addBlock($block, $name = '', $parent = '', $alias = '');
 
@@ -252,8 +258,11 @@ public function getMessagesBlock();
     /**
      * Get block singleton
      *
-     * @param string $type
-     * @return Element\BlockInterface
+     * @template T of Element\BlockInterface
+     *
+     * @param class-string<T> $type
+     *
+     * @return T
      */
     public function getBlockSingleton($type);
 
@@ -294,7 +303,7 @@ public function isManipulationAllowed($name);
      * Save block in blocks registry
      *
      * @param string $name
-     * @param  Element\BlockInterface $block
+     * @param Element\BlockInterface $block
      * @return LayoutInterface
      */
     public function setBlock($name, $block);

lib/internal/Magento/Framework/View/TemplateEngine/Php.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -121,8 +121,12 @@ public function __get($name)
     /**
      * Get helper singleton
      *
-     * @param string $className
-     * @return \Magento\Framework\App\Helper\AbstractHelper
+     * @template T of \Magento\Framework\App\Helper\AbstractHelper
+     *
+     * @param class-string<T> $className
+     *
+     * @return T
+     *
      * @throws \LogicException
      */
     public function helper($className)