Merge pull request #432 from derrabus/improvement/call-user-func

garak · web-flow · commit 01aacb30976d · 2020-07-16T09:16:17.000+02:00
Use a variadic call instead of call_user_func_array()
diff --git a/src/DependencyInjection/Compiler/AddVotersPass.php b/src/DependencyInjection/Compiler/AddVotersPass.php
@@ -3,8 +3,8 @@
 namespace Knp\Bundle\MenuBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container): void
         }
 
         krsort($voters);
-        $sortedVoters = \call_user_func_array('array_merge', $voters);
+        $sortedVoters = array_merge(...$voters);
 
         $definition->replaceArgument(0, new IteratorArgument($sortedVoters));
     }

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`namespace Knp\Bundle\MenuBundle\DependencyInjection\Compiler;`
`4`	`4`
`5`	`5`	`use Symfony\Component\DependencyInjection\Argument\IteratorArgument;`
`6`		`-use Symfony\Component\DependencyInjection\ContainerBuilder;`
`7`	`6`	`use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;`
	`7`	`+use Symfony\Component\DependencyInjection\ContainerBuilder;`
`8`	`8`	`use Symfony\Component\DependencyInjection\Reference;`
`9`	`9`
`10`	`10`	`/**`
`@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container): void`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`krsort($voters);`
`46`		`- $sortedVoters = \call_user_func_array('array_merge', $voters);`
	`46`	`+ $sortedVoters = array_merge(...$voters);`
`47`	`47`
`48`	`48`	`$definition->replaceArgument(0, new IteratorArgument($sortedVoters));`
`49`	`49`	`}`