Allow use factories and OM for creating objects with variadic arguments in constructor

Related with #24556.

That PR allowed to inject scalar values as variadic parameters, but do not work for objects injections. Object definitions don't get instantiated, and target class constructor receives an array of strings instead (with '_instance' key, that should have been transformed into real object)

Author: adrian-martinez-interactiv4

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

@@ -270,7 +270,13 @@ private function getResolvedArgument(string $requestedType, array $parameter, ar
         }
 
         if ($isVariadic) {
-            return is_array($argument) ? $argument : [$argument];
+            $variadicArguments = is_array($argument) ? $argument : [$argument];
+
+            foreach ($variadicArguments as &$variadicArgument) {
+                $this->resolveArgument($variadicArgument, $paramType, $paramDefault, $paramName, $requestedType);
+            };
+
+            return $variadicArguments;
         }
 
         $this->resolveArgument($argument, $paramType, $paramDefault, $paramName, $requestedType);

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

@@ -89,11 +89,33 @@ public function getResolvedConstructorArguments($instanceType, $constructor)
         if (!$constructor) {
             return null;
         }
+
         $configuredArguments = $this->getConfiguredArguments($instanceType);
 
         $arguments = [];
         /** @var ConstructorArgument $constructorArgument */
         foreach ($constructor as $constructorArgument) {
+            if ($constructorArgument->isVariadic()) {
+                $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
+                    );
+                }
+
+                array_push($arguments, ...array_values($variadicArguments));
+
+                // Variadic argument is always the last one
+                break;
+            }
+
             $argument = $this->getNonObjectArgument(null);
             if (!$constructorArgument->isRequired()) {
                 $argument = $this->getNonObjectArgument($constructorArgument->getDefaultValue());
@@ -107,8 +129,10 @@ public function getResolvedConstructorArguments($instanceType, $constructor)
                     $constructorArgument
                 );
             }
+
             $arguments[$constructorArgument->getName()] = $argument;
         }
+
         return $arguments;
     }
 

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

@@ -29,6 +29,11 @@ class ConstructorArgument
      */
     private $defaultValue;
 
+    /**
+     * @var bool
+     */
+    private $isVariadic;
+
     /**
      * @param array $configuration
      */
@@ -38,6 +43,7 @@ public function __construct(array $configuration)
         $this->type = $configuration[1];
         $this->isRequired = $configuration[2];
         $this->defaultValue = $configuration[3];
+        $this->isVariadic = $configuration[4];
     }
 
     /**
@@ -79,4 +85,14 @@ public function getDefaultValue()
     {
         return $this->defaultValue;
     }
+
+    /**
+     * Returns argument is variadic
+     *
+     * @return bool
+     */
+    public function isVariadic(): bool
+    {
+        return $this->isVariadic;
+    }
 }