bug #41700 [Security] Fix deprecation notice on TokenInterface::getUser() stringable return (tscni)

nicolas-grekas · nicolas-grekas · commit 66f7b7a3c68f · 2021-06-17T14:30:16.000+02:00
This PR was merged into the 5.3 branch. Discussion ---------- [Security] Fix deprecation notice on TokenInterface::getUser() stringable return | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT `AuthenticatorManager` raises a deprecation notice about the missing implementation of `UserInterface::getUserIdentifier()` when `TokenInterface::getUser()` returns a string. This fixes that issue. Commits ------- 8a2bd4d [Security] Fix deprecation notice on TokenInterface::getUser() stringable return
diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php
@@ -230,7 +230,8 @@ private function executeAuthenticator(AuthenticatorInterface $authenticator, Req
     private function handleAuthenticationSuccess(TokenInterface $authenticatedToken, PassportInterface $passport, Request $request, AuthenticatorInterface $authenticator): ?Response
     {
         // @deprecated since 5.3
-        if (!method_exists($authenticatedToken->getUser(), 'getUserIdentifier')) {
+        $user = $authenticatedToken->getUser();
+        if ($user instanceof UserInterface && !method_exists($user, 'getUserIdentifier')) {
             trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "getUserIdentifier(): string" in user class "%s" is deprecated. This method will replace "getUsername()" in Symfony 6.0.', get_debug_type($authenticatedToken->getUser()));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,8 @@ private function executeAuthenticator(AuthenticatorInterface $authenticator, Req`
`230`	`230`	`private function handleAuthenticationSuccess(TokenInterface $authenticatedToken, PassportInterface $passport, Request $request, AuthenticatorInterface $authenticator): ?Response`
`231`	`231`	`{`
`232`	`232`	`// @deprecated since 5.3`
`233`		`- if (!method_exists($authenticatedToken->getUser(), 'getUserIdentifier')) {`
	`233`	`+ $user = $authenticatedToken->getUser();`
	`234`	`+ if ($user instanceof UserInterface && !method_exists($user, 'getUserIdentifier')) {`
`234`	`235`	`trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "getUserIdentifier(): string" in user class "%s" is deprecated. This method will replace "getUsername()" in Symfony 6.0.', get_debug_type($authenticatedToken->getUser()));`
`235`	`236`	`}`
`236`	`237`