Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 580469cbfaf8 · 2023-02-07T10:57:42.000+01:00
* 5.4:
  Fix merge
diff --git a/Tests/DataCollector/SecurityDataCollectorTest.php b/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -389,7 +389,7 @@ private function getRoleHierarchy()
 
 class DummyVoter implements VoterInterface
 {
-    public function vote(TokenInterface $token, $subject, array $attributes)
+    public function vote(TokenInterface $token, mixed $subject, array $attributes)
     {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ private function getRoleHierarchy()`
`389`	`389`
`390`	`390`	`class DummyVoter implements VoterInterface`
`391`	`391`	`{`
`392`		`- public function vote(TokenInterface $token, $subject, array $attributes)`
	`392`	`+ public function vote(TokenInterface $token, mixed $subject, array $attributes)`
`393`	`393`	`{`
`394`	`394`	`}`
`395`	`395`	`}`