Avoid array_merge() in loop

adrian-martinez-interactiv4 · adrian-martinez-interactiv4 · commit 60ea1d7b4e1d · 2019-09-11T21:32:42.000+02:00
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -251,13 +251,14 @@ protected function resolveArgumentsInRuntime($requestedType, array $parameters,
             }
 
             if ($isVariadic && is_array($argument)) {
-                $resolvedArguments = array_merge($resolvedArguments, $argument);
+                $resolvedArguments[] = $argument;
             } else {
                 $this->resolveArgument($argument, $paramType, $paramDefault, $paramName, $requestedType);
-                $resolvedArguments[] = $argument;
+                $resolvedArguments[] = [$argument];
             }
 
         }
-        return $resolvedArguments;
+
+        return empty($resolvedArguments) ? [] : array_merge(...$resolvedArguments);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -251,13 +251,14 @@ protected function resolveArgumentsInRuntime($requestedType, array $parameters,`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`if ($isVariadic && is_array($argument)) {`
`254`		`- $resolvedArguments = array_merge($resolvedArguments, $argument);`
	`254`	`+ $resolvedArguments[] = $argument;`
`255`	`255`	`} else {`
`256`	`256`	`$this->resolveArgument($argument, $paramType, $paramDefault, $paramName, $requestedType);`
`257`		`- $resolvedArguments[] = $argument;`
	`257`	`+ $resolvedArguments[] = [$argument];`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`}`
`261`		`- return $resolvedArguments;`
	`261`	`+`
	`262`	`+ return empty($resolvedArguments) ? [] : array_merge(...$resolvedArguments);`
`262`	`263`	`}`
`263`	`264`	`}`