merge magento/2.3-develop into magento-honey-badgers/MAGETWO-90182-Bundle-Child-Index

Author: Magento CICD

dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php

@@ -44,6 +44,9 @@ public function getConstructorArgumentTypesDataProvider()
                     '\Imported\Name\Space\ClassName\Under\Test',
                     '\Imported\Name\Space\ClassName',
                     '\Some\Testing\Name\Space\Test',
+                    '\Exception',
+                    '',
+                    '\Imported\Name\Space\ClassName',
                     'array',
                     ''
                 ],

dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample

@@ -19,6 +19,9 @@ class AnotherSimpleClass
         ClassName\Under\Test $itemFive,
         ClassName $itemSix,
         Test $itemSeven,
+        ?\Exception $optionalException,
+        $defaultString = '$default),value;',
+        ?ClassName $optionalWithDefaultValue = null,
         array $itemEight = [],
         $itemNine = 'test'
     ) {

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

@@ -37,58 +37,48 @@ public function __construct(NamespaceResolver $namespaceResolver = null)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited = false)
-    {
+    public function getConstructorArgumentTypes(
+        \ReflectionClass $class,
+        $inherited = false
+    ) {
         $output = [null];
         if (!$class->getFileName() || false == $class->hasMethod(
             '__construct'
         ) || !$inherited && $class->getConstructor()->class !== $class->getName()
         ) {
             return $output;
         }
-        $reflectionConstructor = $class->getConstructor();
-        $fileContent = file($class->getFileName());
-        $availableNamespaces = $this->namespaceResolver->getImportedNamespaces($fileContent);
-        $availableNamespaces[0] = $class->getNamespaceName();
-        $constructorStartLine = $reflectionConstructor->getStartLine() - 1;
-        $constructorEndLine = $reflectionConstructor->getEndLine();
-        $fileContent = array_slice($fileContent, $constructorStartLine, $constructorEndLine - $constructorStartLine);
-        $source = '<?php ' . trim(implode('', $fileContent));
-
-        // Remove parameter default value.
-        $source = preg_replace("/ = (.*)/", ',)', $source);
 
-        $methodTokenized = token_get_all($source);
-        $argumentsStart = array_search('(', $methodTokenized) + 1;
-        $argumentsEnd = array_search(')', $methodTokenized);
-        $arguments = array_slice($methodTokenized, $argumentsStart, $argumentsEnd - $argumentsStart);
-        foreach ($arguments as &$argument) {
-            is_array($argument) ?: $argument = [1 => $argument];
-        }
-        unset($argument);
-        $arguments = array_filter($arguments, function ($token) {
-            $blacklist = [T_VARIABLE, T_WHITESPACE];
-            if (isset($token[0]) && in_array($token[0], $blacklist)) {
-                return false;
+        //Reading parameters' types.
+        $params = $class->getConstructor()->getParameters();
+        /** @var string[] $types */
+        $types = [];
+        foreach ($params as $param) {
+            //For the sake of backward compatibility.
+            $typeName = '';
+            if ($param->isArray()) {
+                //For the sake of backward compatibility.
+                $typeName = 'array';
+            } else {
+                try {
+                    $paramClass = $param->getClass();
+                    if ($paramClass) {
+                        $typeName = '\\' .$paramClass->getName();
+                    }
+                } catch (\ReflectionException $exception) {
+                    //If there's a problem loading a class then ignore it and
+                    //just return it's name.
+                    $typeName = '\\' .$param->getType()->getName();
+                }
             }
-            return true;
-        });
-        $arguments = array_map(function ($element) {
-            return $element[1];
-        }, $arguments);
-        $arguments = array_values($arguments);
-        $arguments = implode('', $arguments);
-        if (empty($arguments)) {
-            return $output;
+            $types[] = $typeName;
         }
-        $arguments = explode(',', $arguments);
-        foreach ($arguments as $key => &$argument) {
-            $argument = $this->removeToken($argument, '=');
-            $argument = $this->removeToken($argument, '&');
-            $argument = $this->namespaceResolver->resolveNamespace($argument, $availableNamespaces);
+        if (!$types) {
+            //For the sake of backward compatibility.
+            $types = [null];
         }
-        unset($argument);
-        return $arguments;
+
+        return $types;
     }
 
     /**
@@ -98,7 +88,7 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited
      * @param array $availableNamespaces
      * @return string
      * @deprecated 100.2.0
-     * @see \Magento\Framework\Code\Reader\NamespaceResolver::resolveNamespace
+     * @see getConstructorArgumentTypes
      */
     protected function resolveNamespaces($argument, $availableNamespaces)
     {
@@ -111,6 +101,8 @@ protected function resolveNamespaces($argument, $availableNamespaces)
      * @param string $argument
      * @param string $token
      * @return string
+     *
+     * @deprecated Not used anymore.
      */
     protected function removeToken($argument, $token)
     {
@@ -127,7 +119,7 @@ protected function removeToken($argument, $token)
      * @param array $file
      * @return array
      * @deprecated 100.2.0
-     * @see \Magento\Framework\Code\Reader\NamespaceResolver::getImportedNamespaces
+     * @see getConstructorArgumentTypes
      */
     protected function getImportedNamespaces(array $file)
     {