symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
+3-3Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
+3-3Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
+11-15Lines changed: 11 additions & 15 deletions b/‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
+11-15Lines changed: 11 additions & 15 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
+3-5Lines changed: 3 additions & 5 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
+3-5Lines changed: 3 additions & 5 deletions
@@ -23,9 +23,9 @@ class PropertyInfoPassTest extends TestCase
     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(
 
@@ -74,9 +74,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(
 
@@ -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) {
 
@@ -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) {`