Skip to content

Commit 8bed52c

Browse files
Merge branch '5.3' into 5.4
* 5.3: move username/password fix to non-deprecated Connection class cs fix [VarDumper] Fix dumping twig templates found in exceptions [Validator] Add translations for CIDR constraint [Dotenv] Fix testLoadEnv() to start from a fresh context [Validator] Update validators.sr_Cyrl.xlf [Validator] Update validators.sr_Latn.xlf uzb translation Update validators.uz.xlf Fix logging of impersonator introduced in 5.3 [Validator] Fix typos in Latvian translations [Messenger] Fix Redis Transport when username is empty
2 parents caf7d8b + 48c875f commit 8bed52c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Firewall/ContextListener.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,9 @@ protected function refreshUser(TokenInterface $token): ?TokenInterface
260260
$context = ['provider' => \get_class($provider), 'username' => method_exists($refreshedUser, 'getUserIdentifier') ? $refreshedUser->getUserIdentifier() : $refreshedUser->getUsername()];
261261

262262
if ($token instanceof SwitchUserToken) {
263-
// @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0
264-
$context['impersonator_username'] = method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getOriginalToken()->getUsername();
263+
$originalToken = $token->getOriginalToken();
264+
// @deprecated since Symfony 5.3, change to $originalToken->getUserIdentifier() in 6.0
265+
$context['impersonator_username'] = method_exists($originalToken, 'getUserIdentifier') ? $originalToken->getUserIdentifier() : $originalToken->getUsername();
265266
}
266267

267268
$this->logger->debug('User was reloaded from a user provider.', $context);

0 commit comments

Comments
 (0)