bug #61194 [Security] Fix added $token argument to UserCheckerInterface::checkPostAuth() (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit dabfa5923acd · 2025-07-22T09:54:53.000+02:00
This PR was merged into the 7.2 branch. Discussion ---------- [Security] Fix added $token argument to UserCheckerInterface::checkPostAuth() | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT An added argument must be optional and must be declared using ``@param``, which will allow spotting all places that have to be updated in cascade. This PR fixes all that. Not sure how we messed up so badly in #57773 😅 Commits ------- c819110 [Security] Fix added $token argument to UserCheckerInterface::checkPostAuth()
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -986,7 +986,7 @@ public function checkPreAuth(UserInterface $user): void
     {
     }
 
-    public function checkPostAuth(UserInterface $user): void
+    public function checkPostAuth(UserInterface $user, ?TokenInterface $token = null): void
     {
     }
 }
diff --git a/src/Symfony/Component/Security/Core/User/ChainUserChecker.php b/src/Symfony/Component/Security/Core/User/ChainUserChecker.php
@@ -29,16 +29,15 @@ public function checkPreAuth(UserInterface $user): void
         }
     }
 
-    public function checkPostAuth(UserInterface $user /* , TokenInterface $token */): void
+    /**
+     * @param ?TokenInterface $token
+     */
+    public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void
     {
         $token = 1 < \func_num_args() ? func_get_arg(1) : null;
 
         foreach ($this->checkers as $checker) {
-            if ($token instanceof TokenInterface) {
-                $checker->checkPostAuth($user, $token);
-            } else {
-                $checker->checkPostAuth($user);
-            }
+            $checker->checkPostAuth($user, $token);
         }
     }
 }
diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php b/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php
@@ -33,7 +33,10 @@ public function checkPreAuth(UserInterface $user): void
         }
     }
 
-    public function checkPostAuth(UserInterface $user): void
+    /**
+     * @param ?TokenInterface $token
+     */
+    public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void
     {
     }
 }
diff --git a/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php b/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Core\User;
 
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AccountStatusException;
 
 /**
@@ -33,7 +34,9 @@ public function checkPreAuth(UserInterface $user): void;
     /**
      * Checks the user account after authentication.
      *
+     * @param ?TokenInterface $token
+     *
      * @throws AccountStatusException
      */
-    public function checkPostAuth(UserInterface $user /* , TokenInterface $token */): void;
+    public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void;
 }

Original file line number	Diff line number	Diff line change
`@@ -986,7 +986,7 @@ public function checkPreAuth(UserInterface $user): void`
`986`	`986`	`{`
`987`	`987`	`}`
`988`	`988`
`989`		`- public function checkPostAuth(UserInterface $user): void`
	`989`	`+ public function checkPostAuth(UserInterface $user, ?TokenInterface $token = null): void`
`990`	`990`	`{`
`991`	`991`	`}`
`992`	`992`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,15 @@ public function checkPreAuth(UserInterface $user): void`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function checkPostAuth(UserInterface $user /* , TokenInterface $token */): void`
	`32`	`+ /**`
	`33`	`+ * @param ?TokenInterface $token`
	`34`	`+ */`
	`35`	`+ public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void`
`33`	`36`	`{`
`34`	`37`	`$token = 1 < \func_num_args() ? func_get_arg(1) : null;`
`35`	`38`
`36`	`39`	`foreach ($this->checkers as $checker) {`
`37`		`- if ($token instanceof TokenInterface) {`
`38`		`- $checker->checkPostAuth($user, $token);`
`39`		`- } else {`
`40`		`- $checker->checkPostAuth($user);`
`41`		`- }`
	`40`	`+ $checker->checkPostAuth($user, $token);`
`42`	`41`	`}`
`43`	`42`	`}`
`44`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,10 @@ public function checkPreAuth(UserInterface $user): void`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function checkPostAuth(UserInterface $user): void`
	`36`	`+ /**`
	`37`	`+ * @param ?TokenInterface $token`
	`38`	`+ */`
	`39`	`+ public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void`
`37`	`40`	`{`
`38`	`41`	`}`
`39`	`42`	`}`