Merge pull request #54 from PHP-DI/revert-52-master

mnapoli · web-flow · commit 59f15608528d · 2025-01-17T13:49:27.000+01:00
Revert "Replace `call_user_func_array` with native invocation"
diff --git a/src/Invoker.php b/src/Invoker.php
@@ -57,8 +57,7 @@ public function call($callable, array $parameters = [])
 
         $args = $this->parameterResolver->getParameters($callableReflection, $parameters, []);
 
-        // Sort by array keys is needed since the resolved arguments returned by the resolver are indexed by numeric keys
-        // that correspond to the parameters of the callable, but may be out of order.
+        // Sort by array key because call_user_func_array ignores numeric keys
         ksort($args);
 
         // Check all parameters are resolved
@@ -72,7 +71,7 @@ public function call($callable, array $parameters = [])
             ));
         }
 
-        return $callable(...$args);
+        return call_user_func_array($callable, $args);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,7 @@ public function call($callable, array $parameters = [])`
`57`	`57`
`58`	`58`	`$args = $this->parameterResolver->getParameters($callableReflection, $parameters, []);`
`59`	`59`
`60`		`- // Sort by array keys is needed since the resolved arguments returned by the resolver are indexed by numeric keys`
`61`		`- // that correspond to the parameters of the callable, but may be out of order.`
	`60`	`+ // Sort by array key because call_user_func_array ignores numeric keys`
`62`	`61`	`ksort($args);`
`63`	`62`
`64`	`63`	`// Check all parameters are resolved`
`@@ -72,7 +71,7 @@ public function call($callable, array $parameters = [])`
`72`	`71`	`));`
`73`	`72`	`}`
`74`	`73`
`75`		`- return $callable(...$args);`
	`74`	`+ return call_user_func_array($callable, $args);`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`/**`