Resolve cyclomatic complexity, add support for simple parameter declaration

Author: adrian-martinez-interactiv4

lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php

@@ -233,32 +233,44 @@ protected function resolveArgumentsInRuntime($requestedType, array $parameters,
     {
         $resolvedArguments = [];
         foreach ($parameters as $parameter) {
-            list($paramName, $paramType, $paramRequired, $paramDefault, $isVariadic) = $parameter;
-            $argument = null;
-            if (!empty($arguments) && (isset($arguments[$paramName]) || array_key_exists($paramName, $arguments))) {
-                $argument = $arguments[$paramName];
-            } elseif ($paramRequired) {
-                if ($paramType) {
-                    $argument = ['instance' => $paramType];
-                } else {
-                    $this->creationStack = [];
-                    throw new \BadMethodCallException(
-                        'Missing required argument $' . $paramName . ' of ' . $requestedType . '.'
-                    );
-                }
-            } else {
-                $argument = $paramDefault;
-            }
+            $resolvedArguments[] = $this->getResolvedArgument((string)$requestedType, $parameter, $arguments);
+        }
 
-            if ($isVariadic && is_array($argument)) {
-                $resolvedArguments[] = $argument;
+        return empty($resolvedArguments) ? [] : array_merge(...$resolvedArguments);
+    }
+
+    /**
+     * Get resolved argument from parameter
+     *
+     * @param string $requestedType
+     * @param array  $parameter
+     * @param array  $arguments
+     * @return array
+     */
+    private function getResolvedArgument(string $requestedType, array $parameter, array $arguments): array
+    {
+        list($paramName, $paramType, $paramRequired, $paramDefault, $isVariadic) = $parameter;
+        $argument = null;
+        if (!empty($arguments) && (isset($arguments[$paramName]) || array_key_exists($paramName, $arguments))) {
+            $argument = $arguments[$paramName];
+        } elseif ($paramRequired) {
+            if ($paramType) {
+                $argument = ['instance' => $paramType];
             } else {
-                $this->resolveArgument($argument, $paramType, $paramDefault, $paramName, $requestedType);
-                $resolvedArguments[] = [$argument];
+                $this->creationStack = [];
+                throw new \BadMethodCallException(
+                    'Missing required argument $' . $paramName . ' of ' . $requestedType . '.'
+                );
             }
+        } else {
+            $argument = $paramDefault;
+        }
 
+        if ($isVariadic) {
+            return is_array($argument) ? $argument : [$argument];
         }
 
-        return empty($resolvedArguments) ? [] : array_merge(...$resolvedArguments);
+        $this->resolveArgument($argument, $paramType, $paramDefault, $paramName, $requestedType);
+        return [$argument];
     }
 }

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php

@@ -272,7 +272,14 @@ public function testCreateUsingVariadicDataProvider()
                 null,
                 null,
             ],
-            'with_args' => [
+            'with_single_arg' => [
+                [
+                    'oneScalars' => $oneScalar1
+                ],
+                $oneScalar1,
+                null,
+            ],
+            'with_full_args' => [
                 [
                     'oneScalars' => [
                         $oneScalar1,
@@ -404,6 +411,14 @@ public function testCreateUsingSemiVariadicDataProvider()
                 null,
                 null,
             ],
+            'only_with_oneScalars_single_value' => [
+                [
+                    'oneScalars' => $oneScalar1
+                ],
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                $oneScalar1,
+                null,
+            ],
             'only_with_oneScalars_full_value' => [
                 [
                     'oneScalars' => [