[3.2] Prevent double registrations related to tag priorities

nicolas-grekas · nicolas-grekas · commit ec6a2f9ebaae · 2017-04-12T17:25:29.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -40,11 +40,9 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container
     {
         $services = array();
 
-        foreach ($container->findTaggedServiceIds($tagName) as $serviceId => $tags) {
-            foreach ($tags as $attributes) {
-                $priority = isset($attributes['priority']) ? $attributes['priority'] : 0;
-                $services[$priority][] = new Reference($serviceId);
-            }
+        foreach ($container->findTaggedServiceIds($tagName) as $serviceId => $attributes) {
+            $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
+            $services[$priority][] = new Reference($serviceId);
         }
 
         if ($services) {

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,9 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container`
`40`	`40`	`{`
`41`	`41`	`$services = array();`
`42`	`42`
`43`		`- foreach ($container->findTaggedServiceIds($tagName) as $serviceId => $tags) {`
`44`		`- foreach ($tags as $attributes) {`
`45`		`- $priority = isset($attributes['priority']) ? $attributes['priority'] : 0;`
`46`		`- $services[$priority][] = new Reference($serviceId);`
`47`		`- }`
	`43`	`+ foreach ($container->findTaggedServiceIds($tagName) as $serviceId => $attributes) {`
	`44`	`+ $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;`
	`45`	`+ $services[$priority][] = new Reference($serviceId);`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`if ($services) {`