Merge branch 'platform-health' of github.com:magento/magento2 into platform-health

Author: sivaschenko

lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php

@@ -332,15 +332,15 @@ private function extractParameterType(
 
         /** @var string|null $typeName */
         $typeName = null;
-
-        if ($parameter->isArray()) {
+        $parameterType = $parameter->getType();
+        if ($parameterType->getName() === 'array') {
             $typeName = 'array';
         } elseif ($parameterClass = $this->getParameterClass($parameter)) {
             $typeName = $this->_getFullyQualifiedClassName($parameterClass->getName());
-        } elseif ($parameter->isCallable()) {
+        } elseif ($parameterType->getName() === 'callable') {
             $typeName = 'callable';
         } else {
-            $typeName = $parameter->getType()->getName();
+            $typeName = $parameterType->getName();
         }
 
         if ($parameter->allowsNull()) {

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

@@ -60,7 +60,8 @@ public function getConstructorArgumentTypes(
         foreach ($params as $param) {
             //For the sake of backward compatibility.
             $typeName = '';
-            if ($param->isArray()) {
+            $parameterType = $param->getType();
+            if ($parameterType && $parameterType->getName() === 'array') {
                 //For the sake of backward compatibility.
                 $typeName = 'array';
             } else {
@@ -72,7 +73,7 @@ public function getConstructorArgumentTypes(
                 } catch (\ReflectionException $exception) {
                     //If there's a problem loading a class then ignore it and
                     //just return it's name.
-                    $typeName = '\\' .$param->getType()->getName();
+                    $typeName = '\\' .$parameterType->getName();
                 }
             }
             $types[] = $typeName;

lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php

@@ -172,7 +172,10 @@ protected function validateMethodsParameters(array $pluginParameters, array $ori
     protected function getParametersType(ReflectionParameter $parameter)
     {
         $parameterClass = $this->getParameterClass($parameter);
-        return $parameterClass ? '\\' . $parameterClass->getName() : ($parameter->isArray() ? 'array' : null);
+        $parameterType = $parameter->getType();
+        return $parameterClass ?
+            '\\' . $parameterClass->getName() :
+            ($parameterType && $parameterType->getName() === 'array' ? 'array' : null);
     }
 
     /**

lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php

@@ -220,7 +220,7 @@ function ($className, $arguments) {
                             if (isset($arguments[$parameterName])) {
                                 $args[] = $arguments[$parameterName];
                             } else {
-                                if ($parameter->isArray()) {
+                                if ($parameter->getType() && $parameter->getType()->getName() === 'array') {
                                     $args[] = [];
                                 } elseif ($parameter->allowsNull()) {
                                     $args[] = null;