Remove all usages of call_user_func_array()

nicolas-grekas · nicolas-grekas · commit b2718d766661 · 2018-09-11T09:53:26.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -146,7 +146,7 @@ private function findAndSortTags($tagName, ContainerBuilder $container)
 
         if ($sortedTags) {
             krsort($sortedTags);
-            $sortedTags = \call_user_func_array('array_merge', $sortedTags);
+            $sortedTags = array_merge(...$sortedTags);
         }
 
         return $sortedTags;
diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
@@ -17,8 +17,6 @@
 use Symfony\Contracts\Service\ResetInterface;
 
 /**
- * Logger.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Logger extends BaseLogger implements DebugLoggerInterface, ResetInterface
@@ -29,7 +27,7 @@ class Logger extends BaseLogger implements DebugLoggerInterface, ResetInterface
     public function getLogs(/* Request $request = null */)
     {
         if ($logger = $this->getDebugLogger()) {
-            return \call_user_func_array(array($logger, 'getLogs'), \func_get_args());
+            return $logger->getLogs(...\func_get_args());
         }
 
         return array();
@@ -41,7 +39,7 @@ public function getLogs(/* Request $request = null */)
     public function countErrors(/* Request $request = null */)
     {
         if ($logger = $this->getDebugLogger()) {
-            return \call_user_func_array(array($logger, 'countErrors'), \func_get_args());
+            return $logger->countErrors(...\func_get_args());
         }
 
         return 0;
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
@@ -76,7 +76,7 @@ public function testDump($context, $args, $expectedOutput, $debug = true)
         array_unshift($args, $context);
         array_unshift($args, $twig);
 
-        $dump = \call_user_func_array(array($extension, 'dump'), $args);
+        $dump = $extension->dump(...$args);
 
         if ($debug) {
             $this->assertStringStartsWith('<script>', $dump);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/StopwatchHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/StopwatchHelper.php
@@ -37,7 +37,7 @@ public function __call($method, $arguments = array())
     {
         if (null !== $this->stopwatch) {
             if (method_exists($this->stopwatch, $method)) {
-                return \call_user_func_array(array($this->stopwatch, $method), $arguments);
+                return $this->stopwatch->{$method}(...$arguments);
             }
 
             throw new \BadMethodCallException(sprintf('Method "%s" of Stopwatch does not exist', $method));
diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/WrappedListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/WrappedListener.php
@@ -53,7 +53,7 @@ public function handle(GetResponseEvent $event)
      */
     public function __call($method, $arguments)
     {
-        return \call_user_func_array(array($this->listener, $method), $arguments);
+        return $this->listener->{$method}(...$arguments);
     }
 
     public function getWrappedListener(): ListenerInterface
diff --git a/src/Symfony/Component/Cache/Traits/RedisProxy.php b/src/Symfony/Component/Cache/Traits/RedisProxy.php
@@ -32,7 +32,7 @@ public function __call($method, array $args)
     {
         $this->ready ?: $this->ready = $this->initializer->__invoke($this->redis);
 
-        return \call_user_func_array(array($this->redis, $method), $args);
+        return $this->redis->{$method}(...$args);
     }
 
     public function hscan($strKey, &$iIterator, $strPattern = null, $iCount = null)
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -336,13 +336,13 @@ private function pipeline(\Closure $generator)
             // see https://github.com/nrk/predis/issues/267#issuecomment-123781423
             $results = array();
             foreach ($generator() as $command => $args) {
-                $results[] = \call_user_func_array(array($this->redis, $command), $args);
+                $results[] = $this->redis->{$command}(...$args);
                 $ids[] = $args[0];
             }
         } elseif ($this->redis instanceof \Predis\Client) {
             $results = $this->redis->pipeline(function ($redis) use ($generator, &$ids) {
                 foreach ($generator() as $command => $args) {
-                    \call_user_func_array(array($redis, $command), $args);
+                    $redis->{$command}(...$args);
                     $ids[] = $args[0];
                 }
             });
@@ -353,7 +353,7 @@ private function pipeline(\Closure $generator)
                     $connections[$h] = array($this->redis->_instance($h), -1);
                     $connections[$h][0]->multi(\Redis::PIPELINE);
                 }
-                \call_user_func_array(array($connections[$h][0], $command), $args);
+                $connections[$h][0]->{$command}(...$args);
                 $results[] = array($h, ++$connections[$h][1]);
                 $ids[] = $args[0];
             }
@@ -366,7 +366,7 @@ private function pipeline(\Closure $generator)
         } else {
             $this->redis->multi(\Redis::PIPELINE);
             foreach ($generator() as $command => $args) {
-                \call_user_func_array(array($this->redis, $command), $args);
+                $this->redis->{$command}(...$args);
                 $ids[] = $args[0];
             }
             $results = $this->redis->exec();
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
@@ -43,7 +43,7 @@ public function testPrototypeNodeSpecificOption($method, $args)
     {
         $node = new ArrayNodeDefinition('root');
 
-        \call_user_func_array(array($node, $method), $args);
+        $node->{$method}(...$args);
 
         $node->getNode();
     }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1114,7 +1114,7 @@ private function createService(Definition $definition, array &$inlineServices, $
         }
 
         if (null !== $factory) {
-            $service = \call_user_func_array($factory, $arguments);
+            $service = $factory(...$arguments);
 
             if (!$definition->isDeprecated() && \is_array($factory) && \is_string($factory[0])) {
                 $r = new \ReflectionClass($factory[0]);
@@ -1563,7 +1563,7 @@ private function callMethod($service, $call, array &$inlineServices)
             }
         }
 
-        \call_user_func_array(array($service, $call[0]), $this->doResolveServices($this->getParameterBag()->unescapeValue($this->getParameterBag()->resolveValue($call[1])), $inlineServices));
+        $service->{$call[0]}(...$this->doResolveServices($this->getParameterBag()->unescapeValue($this->getParameterBag()->resolveValue($call[1])), $inlineServices));
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
@@ -28,7 +28,7 @@ abstract class AbstractConfigurator
     public function __call($method, $args)
     {
         if (method_exists($this, 'set'.$method)) {
-            return \call_user_func_array(array($this, 'set'.$method), $args);
+            return $this->{'set'.$method}(...$args);
         }
 
         throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', \get_class($this), $method));
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -230,7 +230,7 @@ public function reset()
      */
     public function __call($method, $arguments)
     {
-        return \call_user_func_array(array($this->dispatcher, $method), $arguments);
+        return $this->dispatcher->{$method}(...$arguments);
     }
 
     /**
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
@@ -90,9 +90,7 @@ public static function fromPhp($phpFunctionName, $expressionFunctionName = null)
         };
 
         $evaluator = function () use ($phpFunctionName) {
-            $args = \func_get_args();
-
-            return \call_user_func_array($phpFunctionName, array_splice($args, 1));
+            return $phpFunctionName(...\array_slice(\func_get_args(), 1));
         };
 
         return new self($expressionFunctionName ?: end($parts), $compiler, $evaluator);
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
@@ -37,7 +37,7 @@ public function compile(Compiler $compiler)
 
         $function = $compiler->getFunction($this->attributes['name']);
 
-        $compiler->raw(\call_user_func_array($function['compiler'], $arguments));
+        $compiler->raw($function['compiler'](...$arguments));
     }
 
     public function evaluate($functions, $values)
@@ -47,7 +47,7 @@ public function evaluate($functions, $values)
             $arguments[] = $node->evaluate($functions, $values);
         }
 
-        return \call_user_func_array($functions[$this->attributes['name']]['evaluator'], $arguments);
+        return $functions[$this->attributes['name']]['evaluator'](...$arguments);
     }
 
     public function toArray()
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
@@ -86,7 +86,7 @@ public function evaluate($functions, $values)
                     throw new \RuntimeException(sprintf('Unable to call method "%s" of object "%s".', $this->nodes['attribute']->attributes['value'], \get_class($obj)));
                 }
 
-                return \call_user_func_array($toCall, $this->nodes['arguments']->evaluate($functions, $values));
+                return $toCall(...array_values($this->nodes['arguments']->evaluate($functions, $values)));
 
             case self::ARRAY_CALL:
                 $array = $this->nodes['node']->evaluate($functions, $values);
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -744,7 +744,7 @@ private static function box($func)
         self::$lastError = null;
         \set_error_handler(__CLASS__.'::handleError');
         try {
-            $result = \call_user_func_array($func, \array_slice(\func_get_args(), 1));
+            $result = $func(...\array_slice(\func_get_args(), 1));
             \restore_error_handler();
 
             return $result;
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -147,7 +147,7 @@ private function handleRaw(Request $request, int $type = self::MASTER_REQUEST)
         $arguments = $event->getArguments();
 
         // call controller
-        $response = \call_user_func_array($controller, $arguments);
+        $response = $controller(...$arguments);
 
         // view
         if (!$response instanceof Response) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -88,7 +88,7 @@ protected function getHandler($returnValue, $arguments = array())
         ;
 
         if ($arguments) {
-            \call_user_func_array(array($e, 'with'), $arguments);
+            $e->with(...$arguments);
         }
 
         $handler = new FragmentHandler($this->requestStack);
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
@@ -234,7 +234,7 @@ protected function getCache($request, $response)
         if (\is_array($response)) {
             $cache->expects($this->any())
                   ->method('handle')
-                  ->will(\call_user_func_array(array($this, 'onConsecutiveCalls'), $response))
+                  ->will($this->onConsecutiveCalls(...$response))
             ;
         } else {
             $cache->expects($this->any())
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
@@ -201,7 +201,7 @@ protected function getCache($request, $response)
         if (\is_array($response)) {
             $cache->expects($this->any())
                   ->method('handle')
-                  ->will(\call_user_func_array(array($this, 'onConsecutiveCalls'), $response))
+                  ->will($this->onConsecutiveCalls(...$response))
             ;
         } else {
             $cache->expects($this->any())
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -227,8 +227,8 @@ public function testHandleWhenTheControllerDoesNotReturnAResponse()
         $first = $e->getTrace()[0];
 
         // `file` index the array starting at 0, and __FILE__ starts at 1
-        $line = file($first['file'])[$first['line'] - 1];
-        $this->assertContains('call_user_func_array', $line);
+        $line = file($first['file'])[$first['line'] - 2];
+        $this->assertContains('// call controller', $line);
     }
 
     public function testHandleWhenTheControllerDoesNotReturnAResponseButAViewIsRegistered()
@@ -274,7 +274,7 @@ public function testHandleAllowChangingControllerAndArguments()
             $oldArguments = $event->getArguments();
 
             $newController = function ($id) use ($oldController, $oldArguments) {
-                $response = \call_user_func_array($oldController, $oldArguments);
+                $response = $oldController(...$oldArguments);
 
                 $response->headers->set('X-Id', $id);
 
diff --git a/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Intl\Tests\Locale;
 
+use Symfony\Component\Intl\Locale\Locale;
+
 class LocaleTest extends AbstractLocaleTest
 {
     /**
@@ -172,6 +174,6 @@ protected function call($methodName)
     {
         $args = \array_slice(\func_get_args(), 1);
 
-        return \call_user_func_array(array('Symfony\Component\Intl\Locale\Locale', $methodName), $args);
+        return Locale::{$methodName}(...$args);
     }
 }
diff --git a/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php
@@ -33,6 +33,6 @@ protected function call($methodName)
     {
         $args = \array_slice(\func_get_args(), 1);
 
-        return \call_user_func_array(array('Locale', $methodName), $args);
+        return \Locale::{$methodName}(...$args);
     }
 }
diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
@@ -139,7 +139,7 @@ private function evaluate(string $script, string $resource, array $args)
         }
 
         if ($this->redis instanceof \Predis\Client) {
-            return \call_user_func_array(array($this->redis, 'eval'), array_merge(array($script, 1, $resource), $args));
+            return $this->redis->eval(...array_merge(array($script, 1, $resource), $args));
         }
 
         throw new InvalidArgumentException(sprintf('%s() expects being initialized with a Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis)));
diff --git a/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php b/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php
@@ -99,7 +99,7 @@ private function extract(string $method, array $arguments)
             $serializedArguments = serialize($arguments);
         } catch (\Exception $exception) {
             // If arguments are not serializable, skip the cache
-            return \call_user_func_array(array($this->propertyInfoExtractor, $method), $arguments);
+            return $this->propertyInfoExtractor->{$method}(...$arguments);
         }
 
         // Calling rawurlencode escapes special characters not allowed in PSR-6's keys
@@ -115,7 +115,7 @@ private function extract(string $method, array $arguments)
             return $this->arrayCache[$key] = $item->get();
         }
 
-        $value = \call_user_func_array(array($this->propertyInfoExtractor, $method), $arguments);
+        $value = $this->propertyInfoExtractor->{$method}(...$arguments);
         $item->set($value);
         $this->cacheItemPool->save($item);
 
diff --git a/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php b/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php
@@ -106,8 +106,7 @@ public function isInitializable(string $class, string $property, array $context
     private function extract(iterable $extractors, string $method, array $arguments)
     {
         foreach ($extractors as $extractor) {
-            $value = \call_user_func_array(array($extractor, $method), $arguments);
-            if (null !== $value) {
+            if (null !== $value = $extractor->{$method}(...$arguments)) {
                 return $value;
             }
         }
diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -108,7 +108,7 @@ public function getFallbackLocales()
      */
     public function __call($method, $args)
     {
-        return \call_user_func_array(array($this->translator, $method), $args);
+        return $this->translator->{$method}(...$args);
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
@@ -107,7 +107,7 @@ public function getFallbackLocales()
      */
     public function __call($method, $args)
     {
-        return \call_user_func_array(array($this->translator, $method), $args);
+        return $this->translator->{$method}(...$args);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ private function findAndSortTags($tagName, ContainerBuilder $container)`
`146`	`146`
`147`	`147`	`if ($sortedTags) {`
`148`	`148`	`krsort($sortedTags);`
`149`		`- $sortedTags = \call_user_func_array('array_merge', $sortedTags);`
	`149`	`+ $sortedTags = array_merge(...$sortedTags);`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`return $sortedTags;`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@`
`17`	`17`	`use Symfony\Contracts\Service\ResetInterface;`
`18`	`18`
`19`	`19`	`/**`
`20`		`- * Logger.`
`21`		`- *`
`22`	`20`	`* @author Fabien Potencier <fabien@symfony.com>`
`23`	`21`	`*/`
`24`	`22`	`class Logger extends BaseLogger implements DebugLoggerInterface, ResetInterface`
`@@ -29,7 +27,7 @@ class Logger extends BaseLogger implements DebugLoggerInterface, ResetInterface`
`29`	`27`	`public function getLogs(/* Request $request = null */)`
`30`	`28`	`{`
`31`	`29`	`if ($logger = $this->getDebugLogger()) {`
`32`		`- return \call_user_func_array(array($logger, 'getLogs'), \func_get_args());`
	`30`	`+ return $logger->getLogs(...\func_get_args());`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`return array();`
`@@ -41,7 +39,7 @@ public function getLogs(/* Request $request = null */)`
`41`	`39`	`public function countErrors(/* Request $request = null */)`
`42`	`40`	`{`
`43`	`41`	`if ($logger = $this->getDebugLogger()) {`
`44`		`- return \call_user_func_array(array($logger, 'countErrors'), \func_get_args());`
	`42`	`+ return $logger->countErrors(...\func_get_args());`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __call($method, $arguments = array())`
`37`	`37`	`{`
`38`	`38`	`if (null !== $this->stopwatch) {`
`39`	`39`	`if (method_exists($this->stopwatch, $method)) {`
`40`		`- return \call_user_func_array(array($this->stopwatch, $method), $arguments);`
	`40`	`+ return $this->stopwatch->{$method}(...$arguments);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`throw new \BadMethodCallException(sprintf('Method "%s" of Stopwatch does not exist', $method));`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function handle(GetResponseEvent $event)`
`53`	`53`	`*/`
`54`	`54`	`public function __call($method, $arguments)`
`55`	`55`	`{`
`56`		`- return \call_user_func_array(array($this->listener, $method), $arguments);`
	`56`	`+ return $this->listener->{$method}(...$arguments);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public function getWrappedListener(): ListenerInterface`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __call($method, array $args)`
`32`	`32`	`{`
`33`	`33`	`$this->ready ?: $this->ready = $this->initializer->__invoke($this->redis);`
`34`	`34`
`35`		`- return \call_user_func_array(array($this->redis, $method), $args);`
	`35`	`+ return $this->redis->{$method}(...$args);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public function hscan($strKey, &$iIterator, $strPattern = null, $iCount = null)`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testPrototypeNodeSpecificOption($method, $args)`
`43`	`43`	`{`
`44`	`44`	`$node = new ArrayNodeDefinition('root');`
`45`	`45`
`46`		`- \call_user_func_array(array($node, $method), $args);`
	`46`	`+ $node->{$method}(...$args);`
`47`	`47`
`48`	`48`	`$node->getNode();`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,7 @@ private function createService(Definition $definition, array &$inlineServices, $`
`1114`	`1114`	`}`
`1115`	`1115`
`1116`	`1116`	`if (null !== $factory) {`
`1117`		`- $service = \call_user_func_array($factory, $arguments);`
	`1117`	`+ $service = $factory(...$arguments);`
`1118`	`1118`
`1119`	`1119`	`if (!$definition->isDeprecated() && \is_array($factory) && \is_string($factory[0])) {`
`1120`	`1120`	`$r = new \ReflectionClass($factory[0]);`
`@@ -1563,7 +1563,7 @@ private function callMethod($service, $call, array &$inlineServices)`
`1563`	`1563`	`}`
`1564`	`1564`	`}`
`1565`	`1565`
`1566`		`- \call_user_func_array(array($service, $call[0]), $this->doResolveServices($this->getParameterBag()->unescapeValue($this->getParameterBag()->resolveValue($call[1])), $inlineServices));`
	`1566`	`+ $service->{$call[0]}(...$this->doResolveServices($this->getParameterBag()->unescapeValue($this->getParameterBag()->resolveValue($call[1])), $inlineServices));`
`1567`	`1567`	`}`
`1568`	`1568`
`1569`	`1569`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ abstract class AbstractConfigurator`
`28`	`28`	`public function __call($method, $args)`
`29`	`29`	`{`
`30`	`30`	`if (method_exists($this, 'set'.$method)) {`
`31`		`- return \call_user_func_array(array($this, 'set'.$method), $args);`
	`31`	`+ return $this->{'set'.$method}(...$args);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', \get_class($this), $method));`