Fix tests in 2.8

1 files changed, 42 insertions, 12 deletions

diff --git a/Core/Tests/Authorization/Voter/AbstractVoterTest.php b/Core/Tests/Authorization/Voter/AbstractVoterTest.php
index fc79d72..0fddd88 100644
--- a/Core/Tests/Authorization/Voter/AbstractVoterTest.php
+++ b/Core/Tests/Authorization/Voter/AbstractVoterTest.php
@@ -54,13 +54,48 @@ class AbstractVoterTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals($expectedVote, $voter->vote($this->token, $object, $attributes), $message);
     }
+
+    /**
+     * @dataProvider getTests
+     * @group legacy
+     */
+    public function testVoteLegacy(array $attributes, $expectedVote, $object, $message)
+    {
+        $voter = new AbstractVoterTest_LegacyVoter();
+
+        $this->assertEquals($expectedVote, $voter->vote($this->token, $object, $attributes), $message);
+    }
+
+    /**
+     * @group legacy
+     * @expectedException \BadMethodCallException
+     */
+    public function testNoOverriddenMethodsThrowsException()
+    {
+        $voter = new AbstractVoterTest_NothingImplementedVoter();
+        $voter->vote($this->token, new \stdClass(), array('EDIT'));
+    }
 }
 
 class AbstractVoterTest_Voter extends AbstractVoter
 {
+    protected function voteOnAttribute($attribute, $object, TokenInterface $token)
+    {
+        return 'EDIT' === $attribute;
+    }
+
+    protected function supports($attribute, $class)
+    {
+        return $this->isClassInstanceOf($class, 'stdClass')
+            && in_array($attribute, array('EDIT', 'CREATE'));
+    }
+}
+
+class AbstractVoterTest_LegacyVoter extends AbstractVoter
+{
     protected function getSupportedClasses()
     {
-        return array('stdClass');
+        return array('AbstractVoterTest_Object');
     }
 
     protected function getSupportedAttributes()
@@ -68,28 +103,23 @@ class AbstractVoterTest_Voter extends AbstractVoter
         return array('EDIT', 'CREATE');
     }
 
-    protected function voteOnAttribute($attribute, $object, TokenInterface $token)
+    protected function isGranted($attribute, $object, $user = null)
     {
-        return $attribute === 'foo';
+        return 'EDIT' === $attribute;
     }
 }
 
-class DeprecatedVoterFixture extends AbstractVoter
+class AbstractVoterTest_NothingImplementedVoter extends AbstractVoter
 {
     protected function getSupportedClasses()
     {
-        return array(
-            'Symfony\Component\Security\Core\Tests\Authorization\Voter\ObjectFixture',
-        );
+        return array('AbstractVoterTest_Object');
     }
 
     protected function getSupportedAttributes()
     {
-        return array('foo', 'bar', 'baz');
+        return array('EDIT', 'CREATE');
     }
 
-    protected function isGranted($attribute, $object, $user = null)
-    {
-        return 'EDIT' === $attribute;
-    }
+    // this is a bad voter that hasn't overridden isGranted or voteOnAttribute
 }