MAGETWO-67444: Ensure all tools support PHP 7 type hinting required by Technical Guidelines

Author: Stanislav Idolov

app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php

@@ -31,7 +31,7 @@ class Collection extends BlockCollection implements SearchResultInterface
      * @param string $eventObject
      * @param string $resourceModel
      * @param string $model
-     * @param string|null $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|string|null $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)

app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php

@@ -28,7 +28,7 @@ class Collection extends PageCollection implements SearchResultInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param mixed|null $mainTable
-     * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $eventPrefix
+     * @param string $eventPrefix
      * @param mixed $eventObject
      * @param mixed $resourceModel
      * @param string $model

app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php

@@ -66,7 +66,7 @@ abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\F
     /**
      * @param BooleanFactory $attrBooleanFactory
      * @param CacheInterface $cache
-     * @param $storeResolver @deprecated
+     * @param null $storeResolver @deprecated
      * @param array $cacheTags
      * @param StoreManagerInterface $storeManager
      * @param Serializer $serializer

app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php

@@ -69,7 +69,7 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Quote\Model\Quote\Address\TotalFactory $totalFactory
-     * @param mixed $sourceData
+     * @param \Magento\Framework\Simplexml\Element|mixed $sourceData
      * @param mixed $store
      * @param SerializerInterface $serializer
      */

app/code/Magento/Sales/Model/Order/Creditmemo/Item/Validation/CreationQuantityValidator.php

@@ -31,7 +31,7 @@ class CreationQuantityValidator implements ValidatorInterface
     /**
      * ItemCreationQuantityValidator constructor.
      * @param OrderItemRepositoryInterface $orderItemRepository
-     * @param object $context
+     * @param mixed $context
      */
     public function __construct(OrderItemRepositoryInterface $orderItemRepository, $context = null)
     {

app/code/Magento/Sales/Model/Order/Total/Config/Base.php

@@ -43,7 +43,7 @@ class Base extends \Magento\Sales\Model\Config\Ordered
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param \Magento\Sales\Model\Order\TotalFactory $orderTotalFactory
-     * @param mixed $sourceData
+     * @param \Magento\Framework\Simplexml\Element|mixed $sourceData
      * @param SerializerInterface $serializer
      */
     public function __construct(

app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php

@@ -27,11 +27,11 @@ class Collection extends AbstractCollection implements SearchResultInterface
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param null|\Zend_Db_Adapter_Abstract $mainTable
-     * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $eventPrefix
+     * @param string $eventPrefix
      * @param string $eventObject
      * @param string $resourceModel
      * @param string $model
-     * @param string|null $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|string|null $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)

lib/internal/Magento/Framework/App/Config/Base.php

@@ -18,7 +18,7 @@ class Base extends \Magento\Framework\Simplexml\Config
     public static $instances = [];
 
     /**
-     * @param string|\Magento\Framework\Simplexml\Element $sourceData $sourceData
+     * @param \Magento\Framework\Simplexml\Element|string $sourceData $sourceData
      */
     public function __construct($sourceData = null)
     {

lib/internal/Magento/Framework/App/Request/Http.php

@@ -100,7 +100,7 @@ class Http extends Request implements RequestContentInterface, RequestSafetyInte
      * @param ConfigInterface $routeConfig
      * @param PathInfoProcessorInterface $pathInfoProcessor
      * @param ObjectManagerInterface  $objectManager
-     * @param string|null $uri
+     * @param \Zend\Uri\UriInterface|string|null $uri
      * @param array $directFrontNames
      */
     public function __construct(

lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php

@@ -9,6 +9,28 @@ class ArgumentsReader
 {
     const NO_DEFAULT_VALUE = 'NO-DEFAULT';
 
+    /**
+     * @var NamespaceResolver
+     */
+    private $namespaceResolver;
+
+    /**
+     * @var ScalarTypesProvider
+     */
+    private $scalarTypesProvider;
+
+    /**
+     * @param NamespaceResolver|null $namespaceResolver
+     * @param ScalarTypesProvider|null $scalarTypesProvider
+     */
+    public function __construct(
+        NamespaceResolver $namespaceResolver = null,
+        ScalarTypesProvider $scalarTypesProvider = null
+    ) {
+        $this->namespaceResolver = $namespaceResolver ?: new NamespaceResolver();
+        $this->scalarTypesProvider = $scalarTypesProvider ?: new ScalarTypesProvider();
+    }
+
     /**
      * Get class constructor
      *
@@ -32,11 +54,10 @@ public function getConstructorArguments(\ReflectionClass $class, $groupByPositio
             return $output;
         }
 
-        foreach ($class->getConstructor()->getParameters() as $parameter) {
+        $constructor = new \Zend\Code\Reflection\MethodReflection($class->getName(), '__construct');
+        foreach ($constructor->getParameters() as $parameter) {
             $name = $parameter->getName();
             $position = $parameter->getPosition();
-            $parameterClass = $parameter->getClass();
-            $type = $parameterClass ? '\\' . $parameterClass->getName() : ($parameter->isArray() ? 'array' : null);
             $index = $groupByPosition ? $position : $name;
             $default = null;
             if ($parameter->isOptional()) {
@@ -57,14 +78,46 @@ public function getConstructorArguments(\ReflectionClass $class, $groupByPositio
             $output[$index] = [
                 'name' => $name,
                 'position' => $position,
-                'type' => $type,
+                'type' => $this->processType($class, $parameter),
                 'isOptional' => $parameter->isOptional(),
                 'default' => $default,
             ];
         }
         return $output;
     }
 
+    /**
+     * Process argument type.
+     *
+     * @param \ReflectionClass $class
+     * @param \Zend\Code\Reflection\ParameterReflection $parameter
+     * @return string
+     */
+    private function processType(\ReflectionClass $class, \Zend\Code\Reflection\ParameterReflection $parameter)
+    {
+        if ($parameter->getClass()) {
+            return NamespaceResolver::NS_SEPARATOR . $parameter->getClass()->getName();
+        }
+
+        $type =  $parameter->detectType();
+
+        if ($type === 'null') {
+            return null;
+        }
+
+        if (strpos($type, '[]')) {
+            return 'array';
+        }
+
+        if (!in_array($type, $this->scalarTypesProvider->getTypes())) {
+            $availableNamespaces = $this->namespaceResolver->getImportedNamespaces(file($class->getFileName()));
+            $availableNamespaces[0] = $class->getNamespaceName();
+            return $this->namespaceResolver->resolveNamespace($type, $availableNamespaces);
+        }
+
+        return $type;
+    }
+
     /**
      * Get arguments of parent __construct call
      *
@@ -151,6 +204,10 @@ public function isCompatibleType($requiredType, $actualType)
             return false;
         }
 
+        if ($requiredType === 'mixed' || $actualType === 'mixed') {
+            return true;
+        }
+
         return is_subclass_of($actualType, $requiredType);
     }