[SecurityBundle] simplified code

fabpot · fabpot · commit 512742be527a · 2017-02-22T17:31:21.000-08:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 
 /**
@@ -23,6 +23,8 @@
  */
 class AddSecurityVotersPass implements CompilerPassInterface
 {
+    use PriorityTaggedServiceTrait;
+
     /**
      * {@inheritdoc}
      */
@@ -32,15 +34,7 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $voters = array();
-        foreach ($container->findTaggedServiceIds('security.voter') as $id => $attributes) {
-            $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
-            $voters[$priority][] = new Reference($id);
-        }
-
-        krsort($voters);
-        $voters = call_user_func_array('array_merge', $voters);
-
+        $voters = $this->findAndSortTaggedServices('security.voter', $container);
         if (!$voters) {
             throw new LogicException('No security voters found. You need to tag at least one with "security.voter"');
         }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php
@@ -18,6 +18,21 @@
 
 class AddSecurityVotersPassTest extends TestCase
 {
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
+     */
+    public function testNoVoters()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('security.access.decision_manager', 'Symfony\Component\Security\Core\Authorization\AccessDecisionManager')
+            ->addArgument(array())
+        ;
+
+        $compilerPass = new AddSecurityVotersPass();
+        $compilerPass->process($container);
+    }
+
     public function testThatSecurityVotersAreProcessedInPriorityOrder()
     {
         $container = new ContainerBuilder();
@@ -45,15 +60,9 @@ public function testThatSecurityVotersAreProcessedInPriorityOrder()
         $compilerPass->process($container);
 
         $calls = $container->getDefinition('security.access.decision_manager')->getMethodCalls();
-
-        $this->assertEquals(
-            array(
-                new Reference('highest_prio_service'),
-                new Reference('lowest_prio_service'),
-                new Reference('no_prio_service'),
-                new Reference('zero_prio_service'),
-            ),
-            $calls[0][1][0]
-        );
+        $refs = $calls[0][1][0];
+        $this->assertEquals(new Reference('highest_prio_service'), $refs[0]);
+        $this->assertEquals(new Reference('lowest_prio_service'), $refs[1]);
+        $this->assertCount(4, $refs);
     }
 }
