Implemented the SplPriorityQueue

Iltar van der Berg · linaori · commit e5ca7c523879 · 2016-04-23T11:37:20.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -33,21 +33,15 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container
     {
         $services = $container->findTaggedServiceIds($tagName);
 
-        $sortedServices = array();
+        $queue = new \SplPriorityQueue();
+
         foreach ($services as $serviceId => $tags) {
             foreach ($tags as $attributes) {
                 $priority = isset($attributes['priority']) ? $attributes['priority'] : 0;
-                $sortedServices[$priority][] = new Reference($serviceId);
+                $queue->insert(new Reference($serviceId), $priority * -1);
             }
         }
 
-        if (empty($sortedServices)) {
-            return array();
-        }
-
-        krsort($sortedServices);
-
-        // Flatten the array
-        return call_user_func_array('array_merge', $sortedServices);
+        return iterator_to_array($queue);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTrait.php
@@ -20,10 +20,14 @@ class PriorityTaggedServiceTraitTest extends \PHPUnit_Framework_TestCase
     public function testThatCacheWarmersAreProcessedInPriorityOrder()
     {
         $services = array(
-            'my_service1' => array(0 => array('priority' => 100)),
-            'my_service2' => array(0 => array('priority' => 200)),
-            'my_service3' => array(0 => array('priority' => -500)),
-            'my_service4' => array(0 => array()),
+            'my_service1' => array(array('priority' => 100)),
+            'my_service2' => array(array('priority' => 200)),
+            'my_service3' => array(array('priority' => -500)),
+            'my_service4' => array(array()),
+            'my_service5' => array(array()),
+            'my_service6' => array(array('priority' => -500)),
+            'my_service7' => array(array('priority' => -499)),
+            'my_service8' => array(array('priority' => 1)),
         );
 
         $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
@@ -48,8 +52,12 @@ public function testThatCacheWarmersAreProcessedInPriorityOrder()
             ->with(0, array(
                 new Reference('my_service2'),
                 new Reference('my_service1'),
+                new Reference('my_service8'),
                 new Reference('my_service4'),
+                new Reference('my_service5'),
+                new Reference('my_service7'),
                 new Reference('my_service3'),
+                new Reference('my_service6'),
             ));
 
         (new PriorityTaggedServiceTraitImplementation())->test('my_custom_tag', $container);

Original file line number	Diff line number	Diff line change
`@@ -33,21 +33,15 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container`
`33`	`33`	`{`
`34`	`34`	`$services = $container->findTaggedServiceIds($tagName);`
`35`	`35`
`36`		`- $sortedServices = array();`
	`36`	`+ $queue = new \SplPriorityQueue();`
	`37`	`+`
`37`	`38`	`foreach ($services as $serviceId => $tags) {`
`38`	`39`	`foreach ($tags as $attributes) {`
`39`	`40`	`$priority = isset($attributes['priority']) ? $attributes['priority'] : 0;`
`40`		`- $sortedServices[$priority][] = new Reference($serviceId);`
	`41`	`+ $queue->insert(new Reference($serviceId), $priority * -1);`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`
`44`		`- if (empty($sortedServices)) {`
`45`		`- return array();`
`46`		`- }`
`47`		`-`
`48`		`- krsort($sortedServices);`
`49`		`-`
`50`		`- // Flatten the array`
`51`		`- return call_user_func_array('array_merge', $sortedServices);`
	`45`	`+ return iterator_to_array($queue);`
`52`	`46`	`}`
`53`	`47`	`}`