psalm correction

eltharin · eltharin · commit 71d77441c153 · 2024-08-27T23:41:31.000+02:00
fabpot

use interface
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -464,4 +464,8 @@ final class DummyVoter implements VoterInterface
     public function vote(TokenInterface $token, mixed $subject, array $attributes): int
     {
     }
+
+    public function getVote(TokenInterface $token, mixed $subject, array $attributes): VoterInterface
+    {
+    }
 }
diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecision.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecision.php
@@ -11,8 +11,7 @@
 
 namespace Symfony\Component\Security\Core\Authorization;
 
-use Symfony\Component\Security\Core\Authorization\Voter\Vote;
-use Symfony\Component\Security\Core\Authorization\Voter\Voter;
+use Symfony\Component\Security\Core\Authorization\Voter\VoteInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
@@ -24,8 +23,8 @@
 final class AccessDecision
 {
     /**
-     * @param int $access One of the VoterInterface constants (ACCESS_GRANTED, ACCESS_ABSTAIN, ACCESS_DENIED)
-     * @param Vote[] $votes
+     * @param int             $access One of the VoterInterface constants (ACCESS_GRANTED, ACCESS_ABSTAIN, ACCESS_DENIED)
+     * @param VoteInterface[] $votes
      */
     public function __construct(
         private readonly int $access,
@@ -60,42 +59,42 @@ public function getMessage(): string
     }
 
     /**
-     * @return Vote[]
+     * @return VoteInterface[]
      */
     public function getVotes(): array
     {
         return $this->votes;
     }
 
     /**
-     * @return Vote[]
+     * @return VoteInterface[]
      */
     public function getGrantedVotes(): array
     {
-        return $this->getVotesByAccess(Voter::ACCESS_GRANTED);
+        return $this->getVotesByAccess(VoterInterface::ACCESS_GRANTED);
     }
 
     /**
-     * @return Vote[]
+     * @return VoteInterface[]
      */
     public function getAbstainedVotes(): array
     {
-        return $this->getVotesByAccess(Voter::ACCESS_ABSTAIN);
+        return $this->getVotesByAccess(VoterInterface::ACCESS_ABSTAIN);
     }
 
     /**
-     * @return Vote[]
+     * @return VoteInterface[]
      */
     public function getDeniedVotes(): array
     {
-        return $this->getVotesByAccess(Voter::ACCESS_DENIED);
+        return $this->getVotesByAccess(VoterInterface::ACCESS_DENIED);
     }
 
     /**
-     * @return Vote[]
+     * @return VoteInterface[]
      */
     private function getVotesByAccess(int $access): array
     {
-        return array_filter($this->votes, static fn (Vote $vote): bool => $vote->getAccess() === $access);
+        return array_filter($this->votes, static fn (VoteInterface $vote): bool => $vote->getAccess() === $access);
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Authorization/Strategy/AffirmativeStrategy.php b/src/Symfony/Component/Security/Core/Authorization/Strategy/AffirmativeStrategy.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Security\Core\Authorization\AccessDecision;
 use Symfony\Component\Security\Core\Authorization\Voter\Vote;
+use Symfony\Component\Security\Core\Authorization\Voter\VoteInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
@@ -41,7 +42,7 @@ public function getDecision(\Traversable $votes): AccessDecision
         $currentVotes = [];
         $deny = 0;
 
-        /** @var Vote $vote */
+        /** @var VoteInterface $vote */
         foreach ($votes as $vote) {
             $currentVotes[] = $vote;
 
diff --git a/src/Symfony/Component/Security/Core/Authorization/Strategy/ConsensusStrategy.php b/src/Symfony/Component/Security/Core/Authorization/Strategy/ConsensusStrategy.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Security\Core\Authorization\AccessDecision;
 use Symfony\Component\Security\Core\Authorization\Voter\Vote;
+use Symfony\Component\Security\Core\Authorization\Voter\VoteInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
@@ -51,7 +52,7 @@ public function getDecision(\Traversable $votes): AccessDecision
         $grant = 0;
         $deny = 0;
 
-        /** @var Vote $vote */
+        /** @var VoteInterface $vote */
         foreach ($votes as $vote) {
             $currentVotes[] = $vote;
             if ($vote->isGranted()) {
diff --git a/src/Symfony/Component/Security/Core/Authorization/Strategy/PriorityStrategy.php b/src/Symfony/Component/Security/Core/Authorization/Strategy/PriorityStrategy.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Security\Core\Authorization\AccessDecision;
 use Symfony\Component\Security\Core\Authorization\Voter\Vote;
+use Symfony\Component\Security\Core\Authorization\Voter\VoteInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
@@ -41,7 +42,7 @@ public function getDecision(\Traversable $votes): AccessDecision
     {
         $currentVotes = [];
 
-        /** @var Vote $vote */
+        /** @var VoteInterface $vote */
         foreach ($votes as $vote) {
             $currentVotes[] = $vote;
             if ($vote->isGranted()) {
diff --git a/src/Symfony/Component/Security/Core/Authorization/Strategy/ScoringStrategy.php b/src/Symfony/Component/Security/Core/Authorization/Strategy/ScoringStrategy.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Security\Core\Authorization\AccessDecision;
 use Symfony\Component\Security\Core\Authorization\Voter\Vote;
+use Symfony\Component\Security\Core\Authorization\Voter\VoteInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
@@ -40,7 +41,7 @@ public function getDecision(\Traversable $votes): AccessDecision
         $currentVotes = [];
         $score = 0;
 
-        /** @var Vote $vote */
+        /** @var VoteInterface $vote */
         foreach ($votes as $vote) {
             $currentVotes[] = $vote;
             $score += $vote->getAccess();
diff --git a/src/Symfony/Component/Security/Core/Authorization/Strategy/UnanimousStrategy.php b/src/Symfony/Component/Security/Core/Authorization/Strategy/UnanimousStrategy.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Security\Core\Authorization\AccessDecision;
 use Symfony\Component\Security\Core\Authorization\Voter\Vote;
+use Symfony\Component\Security\Core\Authorization\Voter\VoteInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
@@ -41,7 +42,7 @@ public function getDecision(\Traversable $votes): AccessDecision
         $currentVotes = [];
         $grant = 0;
 
-        /** @var Vote $vote */
+        /** @var VoteInterface $vote */
         foreach ($votes as $vote) {
             $currentVotes[] = $vote;
 
diff --git a/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php
@@ -93,7 +93,7 @@ public function decide(TokenInterface $token, array $attributes, mixed $object =
      */
     public function addVoterVote(VoterInterface $voter, array $attributes, VoteInterface|int $vote): void
     {
-        if (!$vote instanceof Vote) {
+        if (!$vote instanceof VoteInterface) {
             $vote = new Vote($vote);
         }
 
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php b/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php
@@ -18,7 +18,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * method Vote getVote(TokenInterface $token, mixed $subject, array $attributes)
+ * @method VoteInterface getVote(TokenInterface $token, mixed $subject, array $attributes)
  */
 interface VoterInterface
 {
diff --git a/src/Symfony/Component/Security/Core/Event/VoteEvent.php b/src/Symfony/Component/Security/Core/Event/VoteEvent.php
@@ -25,15 +25,15 @@
  */
 final class VoteEvent extends Event
 {
+    private VoteInterface $vote;
+
     public function __construct(
         private VoterInterface $voter,
         private mixed $subject,
         private array $attributes,
-        private Vote|int $vote,
+        VoteInterface|int $vote,
     ) {
-        if (!$vote instanceof Vote) {
-            $this->vote = new Vote($vote);
-        }
+        $this->vote = $vote instanceof VoteInterface ? $vote : new Vote($vote);
     }
 
     public function getVoter(): VoterInterface
diff --git a/src/Symfony/Component/Security/Core/Test/AccessDecisionStrategyTestCase.php b/src/Symfony/Component/Security/Core/Test/AccessDecisionStrategyTestCase.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Security\Core\Authorization\Strategy\AccessDecisionStrategyInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Vote;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
+use Symfony\Component\Security\Core\Exception\LogicException;
 
 /**
  * Abstract test case for access decision strategies.
@@ -91,6 +92,11 @@ public function vote(TokenInterface $token, $subject, array $attributes): int
             {
                 return $this->vote;
             }
+
+            public function __call($function, $args)
+            {
+                throw new LogicException('This function must not be acceded.');
+            }
         };
     }
 
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
@@ -354,6 +354,11 @@ public function vote(TokenInterface $token, $subject, array $attributes): int
             {
                 return $this->vote;
             }
+
+            public function __call($function, $args)
+            {
+                throw new LogicException('This function must not be acceded.');
+            }
         };
     }
 
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/Strategy/ScoringStrategyTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/Strategy/ScoringStrategyTest.php
@@ -11,6 +11,7 @@
 use Symfony\Component\Security\Core\Authorization\Voter\Vote;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
+use Symfony\Component\Security\Core\Exception\LogicException;
 
 class ScoringStrategyTest extends TestCase
 {
@@ -100,6 +101,11 @@ public function vote(TokenInterface $token, $subject, array $attributes): int
             {
                 return $this->vote;
             }
+
+            public function __call($function, $args)
+            {
+                throw new LogicException('This function must not be acceded.');
+            }
         };
     }
 
diff --git a/src/Symfony/Component/Security/Core/Tests/Fixtures/DummyVoter.php b/src/Symfony/Component/Security/Core/Tests/Fixtures/DummyVoter.php
@@ -12,11 +12,16 @@
 namespace Symfony\Component\Security\Core\Tests\Fixtures;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\Vote;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 final class DummyVoter implements VoterInterface
 {
     public function vote(TokenInterface $token, $subject, array $attributes): int
     {
     }
+
+    public function getVote(TokenInterface $token, mixed $subject, array $attributes): VoterInterface
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -464,4 +464,8 @@ final class DummyVoter implements VoterInterface`
`464`	`464`	`public function vote(TokenInterface $token, mixed $subject, array $attributes): int`
`465`	`465`	`{`
`466`	`466`	`}`
	`467`	`+`
	`468`	`+ public function getVote(TokenInterface $token, mixed $subject, array $attributes): VoterInterface`
	`469`	`+ {`
	`470`	`+ }`
`467`	`471`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Security\Core\Authorization;`
`13`	`13`
`14`		`-use Symfony\Component\Security\Core\Authorization\Voter\Vote;`
`15`		`-use Symfony\Component\Security\Core\Authorization\Voter\Voter;`
	`14`	`+use Symfony\Component\Security\Core\Authorization\Voter\VoteInterface;`
`16`	`15`	`use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;`
`17`	`16`
`18`	`17`	`/**`
`@@ -24,8 +23,8 @@`
`24`	`23`	`final class AccessDecision`
`25`	`24`	`{`
`26`	`25`	`/**`
`27`		`- * @param int $access One of the VoterInterface constants (ACCESS_GRANTED, ACCESS_ABSTAIN, ACCESS_DENIED)`
`28`		`- * @param Vote[] $votes`
	`26`	`+ * @param int $access One of the VoterInterface constants (ACCESS_GRANTED, ACCESS_ABSTAIN, ACCESS_DENIED)`
	`27`	`+ * @param VoteInterface[] $votes`
`29`	`28`	`*/`
`30`	`29`	`public function __construct(`
`31`	`30`	`private readonly int $access,`
`@@ -60,42 +59,42 @@ public function getMessage(): string`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`/**`
`63`		`- * @return Vote[]`
	`62`	`+ * @return VoteInterface[]`
`64`	`63`	`*/`
`65`	`64`	`public function getVotes(): array`
`66`	`65`	`{`
`67`	`66`	`return $this->votes;`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`/**`
`71`		`- * @return Vote[]`
	`70`	`+ * @return VoteInterface[]`
`72`	`71`	`*/`
`73`	`72`	`public function getGrantedVotes(): array`
`74`	`73`	`{`
`75`		`- return $this->getVotesByAccess(Voter::ACCESS_GRANTED);`
	`74`	`+ return $this->getVotesByAccess(VoterInterface::ACCESS_GRANTED);`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`/**`
`79`		`- * @return Vote[]`
	`78`	`+ * @return VoteInterface[]`
`80`	`79`	`*/`
`81`	`80`	`public function getAbstainedVotes(): array`
`82`	`81`	`{`
`83`		`- return $this->getVotesByAccess(Voter::ACCESS_ABSTAIN);`
	`82`	`+ return $this->getVotesByAccess(VoterInterface::ACCESS_ABSTAIN);`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`/**`
`87`		`- * @return Vote[]`
	`86`	`+ * @return VoteInterface[]`
`88`	`87`	`*/`
`89`	`88`	`public function getDeniedVotes(): array`
`90`	`89`	`{`
`91`		`- return $this->getVotesByAccess(Voter::ACCESS_DENIED);`
	`90`	`+ return $this->getVotesByAccess(VoterInterface::ACCESS_DENIED);`
`92`	`91`	`}`
`93`	`92`
`94`	`93`	`/**`
`95`		`- * @return Vote[]`
	`94`	`+ * @return VoteInterface[]`
`96`	`95`	`*/`
`97`	`96`	`private function getVotesByAccess(int $access): array`
`98`	`97`	`{`
`99`		`- return array_filter($this->votes, static fn (Vote $vote): bool => $vote->getAccess() === $access);`
	`98`	`+ return array_filter($this->votes, static fn (VoteInterface $vote): bool => $vote->getAccess() === $access);`
`100`	`99`	`}`
`101`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function decide(TokenInterface $token, array $attributes, mixed $object =`
`93`	`93`	`*/`
`94`	`94`	`public function addVoterVote(VoterInterface $voter, array $attributes, VoteInterface\|int $vote): void`
`95`	`95`	`{`
`96`		`- if (!$vote instanceof Vote) {`
	`96`	`+ if (!$vote instanceof VoteInterface) {`
`97`	`97`	`$vote = new Vote($vote);`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`* @author Fabien Potencier <[email protected]>`
`20`	`20`	`*`
`21`		`- * method Vote getVote(TokenInterface $token, mixed $subject, array $attributes)`
	`21`	`+ * @method VoteInterface getVote(TokenInterface $token, mixed $subject, array $attributes)`
`22`	`22`	`*/`
`23`	`23`	`interface VoterInterface`
`24`	`24`	`{`