voteevent

eltharin · eltharin · commit 793b302e8df5 · 2025-02-11T12:31:46.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));
+        $vote = null;
+        $event->getVote($vote);
+        $this->traceableAccessDecisionManager->addVoterVote($event->getVoter(), $event->getAttributes(), $vote);
     }
 
     public static function getSubscribedEvents(): array
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`	`+ $vote = null;`
	`35`	`+ $event->getVote($vote);`
	`36`	`+ $this->traceableAccessDecisionManager->addVoterVote($event->getVoter(), $event->getAttributes(), $vote);`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`public static function getSubscribedEvents(): array`
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`	`}`