Merge branch '2.8'

nicolas-grekas · nicolas-grekas · commit 327a52d02f6a · 2015-11-26T15:51:35.000+01:00
* 2.8:
  [Security] Deprecate "AbstractVoter" in favor of "Voter"
  [Security] Revert changes made between 2.7 and 2.8-beta

Conflicts:
	UPGRADE-2.8.md
	src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php
	src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AbstractVoterTest.php
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/Voter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/Voter.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\Authorization\Voter;
+
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+
+/**
+ * Voter is an abstract default implementation of a voter.
+ *
+ * @author Roman Marintšenko <inoryy@gmail.com>
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ */
+abstract class Voter implements VoterInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function vote(TokenInterface $token, $object, array $attributes)
+    {
+        // abstain vote by default in case none of the attributes are supported
+        $vote = self::ACCESS_ABSTAIN;
+
+        foreach ($attributes as $attribute) {
+            if (!$this->supports($attribute, $object)) {
+                continue;
+            }
+
+            // as soon as at least one attribute is supported, default is to deny access
+            $vote = self::ACCESS_DENIED;
+
+            if ($this->voteOnAttribute($attribute, $object, $token)) {
+                // grant access as soon as at least one attribute returns a positive response
+                return self::ACCESS_GRANTED;
+            }
+        }
+
+        return $vote;
+    }
+
+    /**
+     * Determines if the attribute and subject are supported by this voter.
+     *
+     * @param string $attribute An attribute
+     * @param mixed  $subject   The subject to secure, e.g. an object the user wants to access or any other PHP type
+     *
+     * @return bool True if the attribute and subject are supported, false otherwise
+     */
+    abstract protected function supports($attribute, $subject);
+
+    /**
+     * Perform a single access check operation on a given attribute, subject and token.
+     *
+     * @param string         $attribute
+     * @param mixed          $subject
+     * @param TokenInterface $token
+     *
+     * @return bool
+     */
+    abstract protected function voteOnAttribute($attribute, $subject, TokenInterface $token);
+}
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\Security\Core\Tests\Authorization\Voter;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Authorization\Voter\AbstractVoter;
+use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
-class AbstractVoterTest extends \PHPUnit_Framework_TestCase
+class VoterTest extends \PHPUnit_Framework_TestCase
 {
     protected $token;
 
@@ -50,13 +50,13 @@ public function getTests()
      */
     public function testVote(array $attributes, $expectedVote, $object, $message)
     {
-        $voter = new AbstractVoterTest_Voter();
+        $voter = new VoterTest_Voter();
 
         $this->assertEquals($expectedVote, $voter->vote($this->token, $object, $attributes), $message);
     }
 }
 
-class AbstractVoterTest_Voter extends AbstractVoter
+class VoterTest_Voter extends Voter
 {
     protected function voteOnAttribute($attribute, $object, TokenInterface $token)
     {

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@`
`12`	`12`	`namespace Symfony\Component\Security\Core\Tests\Authorization\Voter;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;`
`15`		`-use Symfony\Component\Security\Core\Authorization\Voter\AbstractVoter;`
	`15`	`+use Symfony\Component\Security\Core\Authorization\Voter\Voter;`
`16`	`16`	`use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;`
`17`	`17`
`18`		`-class AbstractVoterTest extends \PHPUnit_Framework_TestCase`
	`18`	`+class VoterTest extends \PHPUnit_Framework_TestCase`
`19`	`19`	`{`
`20`	`20`	`protected $token;`
`21`	`21`
`@@ -50,13 +50,13 @@ public function getTests()`
`50`	`50`	`*/`
`51`	`51`	`public function testVote(array $attributes, $expectedVote, $object, $message)`
`52`	`52`	`{`
`53`		`- $voter = new AbstractVoterTest_Voter();`
	`53`	`+ $voter = new VoterTest_Voter();`
`54`	`54`
`55`	`55`	`$this->assertEquals($expectedVote, $voter->vote($this->token, $object, $attributes), $message);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`-class AbstractVoterTest_Voter extends AbstractVoter`
	`59`	`+class VoterTest_Voter extends Voter`
`60`	`60`	`{`
`61`	`61`	`protected function voteOnAttribute($attribute, $object, TokenInterface $token)`
`62`	`62`	`{`