[DI] Minor performance tweak in PriorityTaggedServiceTrait

Author: Iltar van der Berg

Compiler/PassConfig.php

@@ -258,13 +258,13 @@ public function setRemovingPasses(array $passes)
      */
     private function sortPasses(array $passes)
     {
-        if (0 === count($passes)) {
+        if (0 === \count($passes)) {
             return array();
         }
 
         krsort($passes);
 
         // Flatten the array
-        return call_user_func_array('array_merge', $passes);
+        return array_merge(...$passes);
     }
 }

Compiler/PriorityTaggedServiceTrait.php

@@ -47,7 +47,7 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container
 
         if ($services) {
             krsort($services);
-            $services = call_user_func_array('array_merge', $services);
+            $services = array_merge(...$services);
         }
 
         return $services;

Tests/Compiler/PassConfigTest.php

@@ -35,4 +35,20 @@ public function testPassOrdering()
         $this->assertSame($pass2, $passes[0]);
         $this->assertSame($pass1, $passes[1]);
     }
+
+    public function testPassOrderingWithoutPasses()
+    {
+        $config = new PassConfig();
+        $config->setBeforeOptimizationPasses(array());
+        $config->setAfterRemovingPasses(array());
+        $config->setBeforeRemovingPasses(array());
+        $config->setOptimizationPasses(array());
+        $config->setRemovingPasses(array());
+
+        $this->assertEmpty($config->getBeforeOptimizationPasses());
+        $this->assertEmpty($config->getAfterRemovingPasses());
+        $this->assertEmpty($config->getBeforeRemovingPasses());
+        $this->assertEmpty($config->getOptimizationPasses());
+        $this->assertEmpty($config->getRemovingPasses());
+    }
 }

Tests/Compiler/PriorityTaggedServiceTraitTest.php

@@ -78,6 +78,13 @@ public function testThatCacheWarmersAreProcessedInPriorityOrder()
 
         $this->assertEquals($expected, $priorityTaggedServiceTraitImplementation->test('my_custom_tag', $container));
     }
+
+    public function testWithEmptyArray()
+    {
+        $container = new ContainerBuilder();
+        $priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation();
+        $this->assertEquals(array(), $priorityTaggedServiceTraitImplementation->test('my_custom_tag', $container));
+    }
 }
 
 class PriorityTaggedServiceTraitImplementation

Tests/Fixtures/includes/ProjectExtension.php

@@ -1,7 +1,6 @@
 <?php
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
 class ProjectExtension implements ExtensionInterface
@@ -12,7 +11,7 @@ public function load(array $configs, ContainerBuilder $configuration)
         $configs = array_filter($configs);
 
         if ($configs) {
-            $config = call_user_func_array('array_merge', $configs);
+            $config = array_merge(...$configs);
         } else {
             $config = array();
         }