Prevent double registrations related to tag priorities

nicolas-grekas · nicolas-grekas · commit 6764dcdf390c · 2017-04-12T17:35:56.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/SerializerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/SerializerPass.php
@@ -47,11 +47,9 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container
         }
 
         $sortedServices = array();
-        foreach ($services as $serviceId => $tags) {
-            foreach ($tags as $tag) {
-                $priority = isset($tag['priority']) ? $tag['priority'] : 0;
-                $sortedServices[$priority][] = new Reference($serviceId);
-            }
+        foreach ($services as $serviceId => $attributes) {
+            $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
+            $sortedServices[$priority][] = new Reference($serviceId);
         }
 
         krsort($sortedServices);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
@@ -72,9 +72,9 @@ public function testThrowExceptionWhenNoEncoders()
     public function testServicesAreOrderedAccordingToPriority()
     {
         $services = array(
-            'n3' => array('tag' => array()),
-            'n1' => array('tag' => array('priority' => 200)),
-            'n2' => array('tag' => array('priority' => 100)),
+            'n3' => array(array()),
+            'n1' => array(array('priority' => 200)),
+            'n2' => array(array('priority' => 100)),
         );
 
         $expected = array(
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
@@ -29,27 +29,23 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        // register additional template loaders
-        $loaderIds = $container->findTaggedServiceIds('twig.loader');
+        $prioritizedLoaders = array();
+        $found = 0;
 
-        if (count($loaderIds) === 0) {
+        foreach ($container->findTaggedServiceIds('twig.loader') as $id => $attributes) {
+            $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
+            $prioritizedLoaders[$priority][] = $id;
+            ++$found;
+        }
+
+        if (!$found) {
             throw new LogicException('No twig loaders found. You need to tag at least one loader with "twig.loader"');
         }
 
-        if (count($loaderIds) === 1) {
-            $container->setAlias('twig.loader', key($loaderIds));
+        if (1 === $found) {
+            $container->setAlias('twig.loader', $id);
         } else {
             $chainLoader = $container->getDefinition('twig.loader.chain');
-
-            $prioritizedLoaders = array();
-
-            foreach ($loaderIds as $id => $tags) {
-                foreach ($tags as $tag) {
-                    $priority = isset($tag['priority']) ? $tag['priority'] : 0;
-                    $prioritizedLoaders[$priority][] = $id;
-                }
-            }
-
             krsort($prioritizedLoaders);
 
             foreach ($prioritizedLoaders as $loaders) {

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,9 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`$sortedServices = array();`
`50`		`- foreach ($services as $serviceId => $tags) {`
`51`		`- foreach ($tags as $tag) {`
`52`		`- $priority = isset($tag['priority']) ? $tag['priority'] : 0;`
`53`		`- $sortedServices[$priority][] = new Reference($serviceId);`
`54`		`- }`
	`50`	`+ foreach ($services as $serviceId => $attributes) {`
	`51`	`+ $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;`
	`52`	`+ $sortedServices[$priority][] = new Reference($serviceId);`
`55`	`53`	`}`
`56`	`54`
`57`	`55`	`krsort($sortedServices);`