minor #15383 [Security] Small optimization in AccessDecisionManager (jderusse)

fabpot · fabpot · commit 1fd70891d32d · 2015-07-29T08:49:04.000+02:00
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] Small optimization in AccessDecisionManager

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | na
| License       | MIT
| Doc PR        | na

- Remove unused variable `$abstain`
- Remove equals comparison: if not `$grant &gt; $deny` and not `$deny &gt; $grant` then `$grant` equals `$deny`

Commits
-------

0e93463 Small optimization in AccessDecisionManager
diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
@@ -150,7 +150,6 @@ private function decideConsensus(TokenInterface $token, array $attributes, $obje
     {
         $grant = 0;
         $deny = 0;
-        $abstain = 0;
         foreach ($this->voters as $voter) {
             $result = $voter->vote($token, $object, $attributes);
 
@@ -163,11 +162,6 @@ private function decideConsensus(TokenInterface $token, array $attributes, $obje
                 case VoterInterface::ACCESS_DENIED:
                     ++$deny;
 
-                    break;
-
-                default:
-                    ++$abstain;
-
                     break;
             }
         }
@@ -180,7 +174,7 @@ private function decideConsensus(TokenInterface $token, array $attributes, $obje
             return false;
         }
 
-        if ($grant == $deny && $grant != 0) {
+        if ($grant > 0) {
             return $this->allowIfEqualGrantedDeniedDecisions;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,6 @@ private function decideConsensus(TokenInterface $token, array $attributes, $obje`
`150`	`150`	`{`
`151`	`151`	`$grant = 0;`
`152`	`152`	`$deny = 0;`
`153`		`- $abstain = 0;`
`154`	`153`	`foreach ($this->voters as $voter) {`
`155`	`154`	`$result = $voter->vote($token, $object, $attributes);`
`156`	`155`
`@@ -163,11 +162,6 @@ private function decideConsensus(TokenInterface $token, array $attributes, $obje`
`163`	`162`	`case VoterInterface::ACCESS_DENIED:`
`164`	`163`	`++$deny;`
`165`	`164`
`166`		`- break;`
`167`		`-`
`168`		`- default:`
`169`		`- ++$abstain;`
`170`		`-`
`171`	`165`	`break;`
`172`	`166`	`}`
`173`	`167`	`}`
`@@ -180,7 +174,7 @@ private function decideConsensus(TokenInterface $token, array $attributes, $obje`
`180`	`174`	`return false;`
`181`	`175`	`}`
`182`	`176`
`183`		`- if ($grant == $deny && $grant != 0) {`
	`177`	`+ if ($grant > 0) {`
`184`	`178`	`return $this->allowIfEqualGrantedDeniedDecisions;`
`185`	`179`	`}`
`186`	`180`