Merge branch '2.8'

* 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

1 files changed, 4 insertions, 4 deletions

diff --git a/Core/Tests/Authorization/Voter/AbstractVoterTest.php b/Core/Tests/Authorization/Voter/VoterTest.php
index 537dc4c..4bac44d 100644
--- a/Core/Tests/Authorization/Voter/AbstractVoterTest.php
+++ b/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 @@ class AbstractVoterTest extends \PHPUnit_Framework_TestCase
      */
     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)
     {