From 5d6ef003ff000f1ed67bdcef4d8e1a335b53f7de Mon Sep 17 00:00:00 2001
From: Christian Schmidt <cs@blackwoodseven.com>
Date: Wed, 5 Mar 2014 22:32:54 +0100
Subject: [PATCH] Add class constants for access decision strategies.

---
 .../Authorization/AccessDecisionManager.php   |  6 ++-
 .../AccessDecisionManagerTest.php             | 38 +++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
index 18c3569aa9..9445440da7 100644
--- a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
+++ b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
@@ -22,6 +22,10 @@ use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
  */
 class AccessDecisionManager implements AccessDecisionManagerInterface
 {
+    const STRATEGY_AFFIRMATIVE = 'affirmative';
+    const STRATEGY_CONSENSUS   = 'consensus';
+    const STRATEGY_UNANIMOUS   = 'unanimous';
+
     private $voters;
     private $strategy;
     private $allowIfAllAbstainDecisions;
@@ -37,7 +41,7 @@ class AccessDecisionManager implements AccessDecisionManagerInterface
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(array $voters, $strategy = 'affirmative', $allowIfAllAbstainDecisions = false, $allowIfEqualGrantedDeniedDecisions = true)
+    public function __construct(array $voters, $strategy = self::STRATEGY_AFFIRMATIVE, $allowIfAllAbstainDecisions = false, $allowIfEqualGrantedDeniedDecisions = true)
     {
         if (!$voters) {
             throw new \InvalidArgumentException('You must at least add one voter.');
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
index b0557a3dcb..e182838dae 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
@@ -77,34 +77,34 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             // affirmative
-            array('affirmative', $this->getVoters(1, 0, 0), false, true, true),
-            array('affirmative', $this->getVoters(1, 2, 0), false, true, true),
-            array('affirmative', $this->getVoters(0, 1, 0), false, true, false),
-            array('affirmative', $this->getVoters(0, 0, 1), false, true, false),
-            array('affirmative', $this->getVoters(0, 0, 1), true, true, true),
+            array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(1, 0, 0), false, true, true),
+            array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(1, 2, 0), false, true, true),
+            array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(0, 1, 0), false, true, false),
+            array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(0, 0, 1), false, true, false),
+            array(AccessDecisionManager::STRATEGY_AFFIRMATIVE, $this->getVoters(0, 0, 1), true, true, true),
 
             // consensus
-            array('consensus', $this->getVoters(1, 0, 0), false, true, true),
-            array('consensus', $this->getVoters(1, 2, 0), false, true, false),
-            array('consensus', $this->getVoters(2, 1, 0), false, true, true),
+            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(1, 0, 0), false, true, true),
+            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(1, 2, 0), false, true, false),
+            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 1, 0), false, true, true),
 
-            array('consensus', $this->getVoters(0, 0, 1), false, true, false),
+            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(0, 0, 1), false, true, false),
 
-            array('consensus', $this->getVoters(0, 0, 1), true, true, true),
+            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(0, 0, 1), true, true, true),
 
-            array('consensus', $this->getVoters(2, 2, 0), false, true, true),
-            array('consensus', $this->getVoters(2, 2, 1), false, true, true),
+            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 0), false, true, true),
+            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 1), false, true, true),
 
-            array('consensus', $this->getVoters(2, 2, 0), false, false, false),
-            array('consensus', $this->getVoters(2, 2, 1), false, false, false),
+            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 0), false, false, false),
+            array(AccessDecisionManager::STRATEGY_CONSENSUS, $this->getVoters(2, 2, 1), false, false, false),
 
             // unanimous
-            array('unanimous', $this->getVoters(1, 0, 0), false, true, true),
-            array('unanimous', $this->getVoters(1, 0, 1), false, true, true),
-            array('unanimous', $this->getVoters(1, 1, 0), false, true, false),
+            array(AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(1, 0, 0), false, true, true),
+            array(AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(1, 0, 1), false, true, true),
+            array(AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(1, 1, 0), false, true, false),
 
-            array('unanimous', $this->getVoters(0, 0, 2), false, true, false),
-            array('unanimous', $this->getVoters(0, 0, 2), true, true, true),
+            array(AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(0, 0, 2), false, true, false),
+            array(AccessDecisionManager::STRATEGY_UNANIMOUS, $this->getVoters(0, 0, 2), true, true, true),
         );
     }