Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5d5f4ef

Browse filesBrowse files
solilokiamsolilokiam
committed
Change strategy namespace and naming
1 parent ffb411b commit 5d5f4ef
Copy full SHA for 5d5f4ef

File tree

Expand file treeCollapse file tree

6 files changed

+31
-32
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+31
-32
lines changed

‎src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
+9-10Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
namespace Symfony\Component\Security\Core\Authorization;
1313

14-
use Symfony\Component\Security\Core\Authorization\Strategy\DecideAffirmativeStrategy;
15-
use Symfony\Component\Security\Core\Authorization\Strategy\DecideConsensusStrategy;
16-
use Symfony\Component\Security\Core\Authorization\Strategy\DecideHighestNotAbstainedVoterStrategy;
17-
use Symfony\Component\Security\Core\Authorization\Strategy\DecideUnanimousStrategy;
14+
use Symfony\Component\Security\Core\Authorization\AccessDecisionManager\AffirmativeAccessDecisionManager;
15+
use Symfony\Component\Security\Core\Authorization\AccessDecisionManager\ConsensusAccessDecisionManager;
16+
use Symfony\Component\Security\Core\Authorization\AccessDecisionManager\HighestNotAbstainedVoterAccessDecisionManager;
17+
use Symfony\Component\Security\Core\Authorization\AccessDecisionManager\UnanimousAccessDecisionManager;
1818
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
1919
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
2020

@@ -93,18 +93,17 @@ public function supportsAttribute($attribute)
9393

9494
private function createStrategy($strategyName)
9595
{
96-
switch($strategyName){
96+
switch ($strategyName) {
9797
case self::STRATEGY_UNANIMOUS:
98-
return new DecideUnanimousStrategy($this->allowIfAllAbstainDecisions);
98+
return new UnanimousAccessDecisionManager($this->allowIfAllAbstainDecisions);
9999
case self::STRATEGY_CONSENSUS:
100-
return new DecideConsensusStrategy($this->allowIfEqualGrantedDeniedDecisions,$this->allowIfAllAbstainDecisions);
100+
return new ConsensusAccessDecisionManager($this->allowIfEqualGrantedDeniedDecisions, $this->allowIfAllAbstainDecisions);
101101
case self::STRATEGY_AFFIRMATIVE:
102-
return new DecideAffirmativeStrategy($this->allowIfAllAbstainDecisions);
102+
return new AffirmativeAccessDecisionManager($this->allowIfAllAbstainDecisions);
103103
case self::STRATEGY_HIGHEST_NOT_ABSTAINED:
104-
return new DecideHighestNotAbstainedVoterStrategy($this->allowIfAllAbstainDecisions);
104+
return new HighestNotAbstainedVoterAccessDecisionManager($this->allowIfAllAbstainDecisions);
105105
default:
106106
throw new \InvalidArgumentException(sprintf('The strategy "%s" is not supported.', $strategyName));
107107
}
108108
}
109-
110109
}

‎src/Symfony/Component/Security/Core/Authorization/Strategy/AbstractDecideStrategy.php renamed to ‎src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager/AbstractAccessDecisionManager.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager/AbstractAccessDecisionManager.php
+11-3Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
<?php
22

3-
namespace Symfony\Component\Security\Core\Authorization\Strategy;
3+
namespace Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
44

5-
abstract class AbstractDecideStrategy
5+
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
6+
use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
7+
8+
abstract class AbstractAccessDecisionManager implements AccessDecisionManagerInterface
69
{
710
protected $voters;
811

@@ -41,4 +44,9 @@ public function supportsClass($class)
4144

4245
return false;
4346
}
44-
}
47+
48+
/**
49+
* {@inheritdoc}
50+
*/
51+
abstract public function decide(TokenInterface $token, array $attributes, $object = null);
52+
}

‎src/Symfony/Component/Security/Core/Authorization/Strategy/DecideAffirmativeStrategy.php renamed to ‎src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager/AffirmativeAccessDecisionManager.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager/AffirmativeAccessDecisionManager.php
+3-5Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php
22

3-
namespace Symfony\Component\Security\Core\Authorization\Strategy;
3+
namespace Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
44

55
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
6-
use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
76
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
87

98
/**
@@ -12,7 +11,7 @@
1211
* If all voters abstained from voting, the decision will be based on the
1312
* allowIfAllAbstainDecisions property value (defaults to false).
1413
*/
15-
class DecideAffirmativeStrategy extends AbstractDecideStrategy implements AccessDecisionManagerInterface
14+
class AffirmativeAccessDecisionManager extends AbstractAccessDecisionManager
1615
{
1716
private $allowIfAllAbstainDecisions;
1817

@@ -54,5 +53,4 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
5453

5554
return $this->allowIfAllAbstainDecisions;
5655
}
57-
58-
}
56+
}

‎src/Symfony/Component/Security/Core/Authorization/Strategy/DecideConsensusStrategy.php renamed to ‎src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager/ConsensusAccessDecisionManager.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager/ConsensusAccessDecisionManager.php
+2-4Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php
22

3-
namespace Symfony\Component\Security\Core\Authorization\Strategy;
3+
namespace Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
44

55
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
6-
use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
76
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
87

98
/**
@@ -20,7 +19,7 @@
2019
* If all voters abstained from voting, the decision will be based on the
2120
* allowIfAllAbstainDecisions property value (defaults to false).
2221
*/
23-
class DecideConsensusStrategy extends AbstractDecideStrategy implements AccessDecisionManagerInterface
22+
class ConsensusAccessDecisionManager extends AbstractAccessDecisionManager
2423
{
2524
private $allowIfEqualGrantedDeniedDecisions;
2625

@@ -74,5 +73,4 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
7473

7574
return $this->allowIfAllAbstainDecisions;
7675
}
77-
7876
}

‎src/Symfony/Component/Security/Core/Authorization/Strategy/DecideHighestNotAbstainedVoterStrategy.php renamed to ‎src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager/HighestNotAbstainedVoterAccessDecisionManager.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager/HighestNotAbstainedVoterAccessDecisionManager.php
+3-5Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<?php
22

3-
namespace Symfony\Component\Security\Core\Authorization\Strategy;
3+
namespace Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
44

55
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
6-
use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
76
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
87

98
/**
109
* Grants access depending on the first not abstained voter decission.
1110
*
1211
* If all voters abstain from voting, the decission will be base on the allowIfAllAbstainDecisionsProperty
1312
*/
14-
class DecideHighestNotAbstainedVoterStrategy extends AbstractDecideStrategy implements AccessDecisionManagerInterface
13+
class HighestNotAbstainedVoterAccessDecisionManager extends AbstractAccessDecisionManager
1514
{
1615
private $allowIfAllAbstainDecisions;
1716

@@ -44,5 +43,4 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
4443

4544
return $this->allowIfAllAbstainDecisions;
4645
}
47-
48-
}
46+
}

‎src/Symfony/Component/Security/Core/Authorization/Strategy/DecideUnanimousStrategy.php renamed to ‎src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager/UnanimousAccessDecisionManager.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager/UnanimousAccessDecisionManager.php
+3-5Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php
22

3-
namespace Symfony\Component\Security\Core\Authorization\Strategy;
3+
namespace Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
44

55
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
6-
use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
76
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
87

98
/**
@@ -12,7 +11,7 @@
1211
* If all voters abstained from voting, the decision will be based on the
1312
* allowIfAllAbstainDecisions property value (defaults to false).
1413
*/
15-
class DecideUnanimousStrategy extends AbstractDecideStrategy implements AccessDecisionManagerInterface
14+
class UnanimousAccessDecisionManager extends AbstractAccessDecisionManager
1615
{
1716
private $allowIfAllAbstainDecisions;
1817

@@ -58,5 +57,4 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
5857

5958
return $this->allowIfAllAbstainDecisions;
6059
}
61-
62-
}
60+
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.