AddMake ExpressionVoter Cacheable

jderusse · jderusse · commit 588e36d2d88b · 2021-11-17T00:51:15.000+01:00
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
@@ -24,7 +24,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class ExpressionVoter implements VoterInterface
+class ExpressionVoter implements CacheableVoterInterface
 {
     private $expressionLanguage;
     private $trustResolver;
@@ -39,6 +39,16 @@ public function __construct(ExpressionLanguage $expressionLanguage, Authenticati
         $this->roleHierarchy = $roleHierarchy;
     }
 
+    public function supportsAttribute(string $attribute): bool
+    {
+        return false;
+    }
+
+    public function supportsType(string $subjectType): bool
+    {
+        return true;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
@@ -313,6 +313,31 @@ public function testCacheableVotersNotCalled()
         $this->assertFalse($manager->decide($token, ['foo'], 'bar'));
     }
 
+    public function testCacheableVotersWithMultipleAttributesAndNonString()
+    {
+        $token = $this->createMock(TokenInterface::class);
+        $voter = $this->getMockBuilder(CacheableVoterInterface::class)->getMockForAbstractClass();
+        $voter
+            ->expects($this->once())
+            ->method('supportsAttribute')
+            ->with('foo')
+            ->willReturn(false);
+        $voter
+            // Voter does not support "foo", but given 1337 is not a string, it implicitly supports it.
+            ->expects($this->once())
+            ->method('supportsType')
+            ->with('string')
+            ->willReturn(true);
+        $voter
+            ->expects($this->once())
+            ->method('vote')
+            ->with($token, 'bar', ['foo', 1337])
+            ->willReturn(VoterInterface::ACCESS_GRANTED);
+
+        $manager = new AccessDecisionManager([$voter]);
+        $this->assertTrue($manager->decide($token, ['foo', 1337], 'bar', true));
+    }
+
     protected function getVoters($grants, $denies, $abstains)
     {
         $voters = [];
