Allow objects to be properly injected through factories when variadic argument is the only one in constructor, and compiled mode is used

Author: adrian-martinez-interactiv4

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

@@ -64,6 +64,7 @@ public function create($requestedType, array $arguments = [])
              *
              * Argument key meanings:
              *
+             * _vdic_: variadic argument
              * _i_: shared instance of a class or interface
              * _ins_: non-shared instance of a class or interface
              * _v_: non-array literal value
@@ -73,7 +74,21 @@ public function create($requestedType, array $arguments = [])
              * _d_: default value in case environment variable specified by _a_ does not exist
              */
             foreach ($args as $key => &$argument) {
-                if (isset($arguments[$key])) {
+                if (isset($argument['_vdic_'])) {
+                    // Process variadic
+                    if (isset($arguments[$key])) {
+                        $argument = (array)$arguments[$key];
+                    } else {
+                        $argument = (array)$argument['_vdic_'];
+                        $this->parseArray($argument);
+                    }
+                    unset($args[$key]);
+                    if (count($argument)) {
+                        array_push($args, ...array_values($argument));
+                    }
+                    // Variadic argument is always the last one
+                    break;
+                } elseif (isset($arguments[$key])) {
                     $argument = $arguments[$key];
                 } elseif (isset($argument['_i_'])) {
                     $argument = $this->get($argument['_i_']);

setup/src/Magento/Setup/Module/Di/Compiler/ArgumentsResolver.php

@@ -59,6 +59,15 @@ class ArgumentsResolver
         '_vac_' => true,
     ];
 
+    /**
+     * Variadic pattern used for configuration
+     *
+     * @var array
+     */
+    private $variadicPattern = [
+        '_vdic_' => [],
+    ];
+
     /**
      * Configured argument pattern used for configuration
      *
@@ -96,21 +105,14 @@ public function getResolvedConstructorArguments($instanceType, $constructor)
         /** @var ConstructorArgument $constructorArgument */
         foreach ($constructor as $constructorArgument) {
             if ($constructorArgument->isVariadic()) {
+                $argument = $this->variadicPattern;
                 $variadicArguments = $configuredArguments[$constructorArgument->getName()] ?? [];
 
-                if (!is_array($variadicArguments) || !count($variadicArguments)) {
-                    // Variadic argument is always the last one
-                    break;
-                }
-
-                foreach ($variadicArguments as $variadicArgumentKey => $variadicArgument) {
-                    $variadicArguments[$variadicArgumentKey] = $this->getConfiguredArgument(
-                        $variadicArgument,
-                        $constructorArgument
-                    );
+                foreach ($variadicArguments as $variadicArgument) {
+                    $argument['_vdic_'][] = $this->getConfiguredArgument($variadicArgument, $constructorArgument);
                 }
 
-                array_push($arguments, ...array_values($variadicArguments));
+                $arguments[$constructorArgument->getName()] = $argument;
 
                 // Variadic argument is always the last one
                 break;