voteevent

eltharin · eltharin · commit 17cbdf8eb2b9 · 2025-02-11T12:44:41.000+01:00
diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/VoteListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/VoteListener.php
@@ -31,7 +31,9 @@ public function __construct(
 
     public function onVoterVote(VoteEvent $event): void
     {
-        $this->traceableAccessDecisionManager->addVoterVote($event->getVoter(), $event->getAttributes(), $event->getVote(true));
+        $voteObj = null;
+        $vote = $event->getVote($voteObj);
+        $this->traceableAccessDecisionManager->addVoterVote($event->getVoter(), $event->getAttributes(), $voteObj ?? $vote);
     }
 
     public static function getSubscribedEvents(): array
diff --git a/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php
@@ -68,8 +68,8 @@ public function decide(TokenInterface $token, array $attributes, mixed $object =
     /**
      * Adds voter vote and class to the voter details.
      *
-     * @param array $attributes attributes used for the vote
-     * @param int   $vote       vote of the voter
+     * @param array             $attributes attributes used for the vote
+     * @param VoteInterface|int $vote       vote of the voter
      */
     public function addVoterVote(VoterInterface $voter, array $attributes, VoteInterface|int $vote): void
     {
diff --git a/src/Symfony/Component/Security/Core/Event/VoteEvent.php b/src/Symfony/Component/Security/Core/Event/VoteEvent.php
@@ -47,12 +47,10 @@ public function getAttributes(): array
         return $this->attributes;
     }
 
-    public function getVote($asObject = false): VoteInterface|int
+    public function getVote(?VoteInterface &$vote = null): int
     {
-        if ($this->vote instanceof VoteInterface && !$asObject) {
-            return $this->vote->getAccess();
-        }
+        $vote = $this->vote;
 
-        return $this->vote;
+        return $this->vote instanceof VoteInterface ? $this->vote->getAccess() : $this->vote;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,9 @@ public function __construct(`
`31`	`31`
`32`	`32`	`public function onVoterVote(VoteEvent $event): void`
`33`	`33`	`{`
`34`		`- $this->traceableAccessDecisionManager->addVoterVote($event->getVoter(), $event->getAttributes(), $event->getVote(true));`
	`34`	`+ $voteObj = null;`
	`35`	`+ $vote = $event->getVote($voteObj);`
	`36`	`+ $this->traceableAccessDecisionManager->addVoterVote($event->getVoter(), $event->getAttributes(), $voteObj ?? $vote);`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`public static function getSubscribedEvents(): array`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ public function decide(TokenInterface $token, array $attributes, mixed $object =`
`68`	`68`	`/**`
`69`	`69`	`* Adds voter vote and class to the voter details.`
`70`	`70`	`*`
`71`		`- * @param array $attributes attributes used for the vote`
`72`		`- * @param int $vote vote of the voter`
	`71`	`+ * @param array $attributes attributes used for the vote`
	`72`	`+ * @param VoteInterface\|int $vote vote of the voter`
`73`	`73`	`*/`
`74`	`74`	`public function addVoterVote(VoterInterface $voter, array $attributes, VoteInterface\|int $vote): void`
`75`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,10 @@ public function getAttributes(): array`
`47`	`47`	`return $this->attributes;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public function getVote($asObject = false): VoteInterface\|int`
	`50`	`+ public function getVote(?VoteInterface &$vote = null): int`
`51`	`51`	`{`
`52`		`- if ($this->vote instanceof VoteInterface && !$asObject) {`
`53`		`- return $this->vote->getAccess();`
`54`		`- }`
	`52`	`+ $vote = $this->vote;`
`55`	`53`
`56`		`- return $this->vote;`
	`54`	`+ return $this->vote instanceof VoteInterface ? $this->vote->getAccess() : $this->vote;`
`57`	`55`	`}`
`58`	`56`	`}`