diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php index a8825e75e915f..01dce37978c94 100644 --- a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php +++ b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php @@ -117,7 +117,7 @@ public function createNewToken(PersistentTokenInterface $token) $sql = 'INSERT INTO rememberme_token (class, username, series, value, lastUsed) VALUES (:class, :username, :series, :value, :lastUsed)'; $paramValues = [ 'class' => $token->getClass(), - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 'username' => method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername(), 'series' => $token->getSeries(), 'value' => $token->getTokenValue(), diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php index 20264f4d954dd..b9bdf26e0d1ca 100644 --- a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php +++ b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php @@ -66,7 +66,7 @@ public function loadUserByIdentifier(string $identifier): UserInterface throw new \InvalidArgumentException(sprintf('You must either make the "%s" entity Doctrine Repository ("%s") implement "Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface" or set the "property" option in the corresponding entity provider configuration.', $this->classOrAlias, get_debug_type($repository))); } - // @deprecated since 5.3, change to $repository->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $repository->loadUserByIdentifier() in 6.0 if (method_exists($repository, 'loadUserByIdentifier')) { $user = $repository->loadUserByIdentifier($identifier); } else { diff --git a/src/Symfony/Bridge/Monolog/Processor/AbstractTokenProcessor.php b/src/Symfony/Bridge/Monolog/Processor/AbstractTokenProcessor.php index 15919978857c3..1f37d88aea4e2 100644 --- a/src/Symfony/Bridge/Monolog/Processor/AbstractTokenProcessor.php +++ b/src/Symfony/Bridge/Monolog/Processor/AbstractTokenProcessor.php @@ -46,7 +46,7 @@ public function __invoke(array $record): array 'roles' => $token->getRoleNames(), ]; - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 if (method_exists($token, 'getUserIdentifier')) { $record['extra'][$this->getKey()]['username'] = $record['extra'][$this->getKey()]['user_identifier'] = $token->getUserIdentifier(); } else { diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php index 45447f50e82b5..e6456dd05b4da 100644 --- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php +++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php @@ -100,7 +100,7 @@ public function collect(Request $request, Response $response, \Throwable $except $impersonatorUser = null; if ($token instanceof SwitchUserToken) { $originalToken = $token->getOriginalToken(); - // @deprecated since 5.3, change to $originalToken->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $originalToken->getUserIdentifier() in 6.0 $impersonatorUser = method_exists($originalToken, 'getUserIdentifier') ? $originalToken->getUserIdentifier() : $originalToken->getUsername(); } @@ -130,7 +130,7 @@ public function collect(Request $request, Response $response, \Throwable $except 'token' => $token, 'token_class' => $this->hasVarDumper ? new ClassStub(\get_class($token)) : \get_class($token), 'logout_url' => $logoutUrl, - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 'user' => method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername(), 'roles' => $assignedRoles, 'inherited_roles' => array_unique($inheritedRoles), diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php index a008166b9827e..cfcbbd9a125f5 100644 --- a/src/Symfony/Component/Console/Helper/Helper.php +++ b/src/Symfony/Component/Console/Helper/Helper.php @@ -42,7 +42,7 @@ public function getHelperSet() /** * Returns the length of a string, using mb_strwidth if it is available. * - * @deprecated since 5.3 + * @deprecated since Symfony 5.3 * * @return int The length of the string */ @@ -154,7 +154,7 @@ public static function formatMemory(int $memory) } /** - * @deprecated since 5.3 + * @deprecated since Symfony 5.3 */ public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, ?string $string) { diff --git a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php index e32793c3d3bf4..c8458909b7b60 100644 --- a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php +++ b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php @@ -83,7 +83,7 @@ public function onCheckPassport(CheckPassportEvent $event) } else { throw new LogicException('Using the "query_string" config without using a "search_dn" and a "search_password" is not supported.'); } - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 $username = $ldap->escape(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), '', LdapInterface::ESCAPE_FILTER); $query = str_replace('{username}', $username, $ldapBadge->getQueryString()); $result = $ldap->query($ldapBadge->getDnString(), $query)->execute(); @@ -93,7 +93,7 @@ public function onCheckPassport(CheckPassportEvent $event) $dn = $result[0]->getDn(); } else { - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 $username = $ldap->escape(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), '', LdapInterface::ESCAPE_DN); $dn = str_replace('{username}', $username, $ldapBadge->getDnString()); } diff --git a/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php index 92a48dc964c2d..76be0f4da328b 100644 --- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php +++ b/src/Symfony/Component/Security/Core/Authentication/AuthenticationProviderManager.php @@ -110,7 +110,7 @@ public function authenticate(TokenInterface $token) $this->eventDispatcher->dispatch(new AuthenticationSuccessEvent($result), AuthenticationEvents::AUTHENTICATION_SUCCESS); } - // @deprecated since 5.3 + // @deprecated since Symfony 5.3 if ($user = $result->getUser() instanceof UserInterface && !method_exists($result->getUser(), '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($result->getUser())); } diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php index d83c1a0ca77a6..a0e01da4e1a28 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php @@ -120,7 +120,7 @@ protected function retrieveUser(string $userIdentifier, UsernamePasswordToken $t } try { - // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 if (method_exists($this->userProvider, 'loadUserByIdentifier')) { $user = $this->userProvider->loadUserByIdentifier($userIdentifier); } else { diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php index 418523e20c6b9..7de715d70a122 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php @@ -70,7 +70,7 @@ protected function retrieveUser(string $userIdentifier, UsernamePasswordToken $t throw new UserNotFoundException('User identifier can not be null.'); } - // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 if (method_exists($this->userProvider, 'loadUserByIdentifier')) { return $this->userProvider->loadUserByIdentifier($userIdentifier); } else { @@ -85,7 +85,7 @@ protected function retrieveUser(string $userIdentifier, UsernamePasswordToken $t */ protected function checkAuthentication(UserInterface $user, UsernamePasswordToken $token) { - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 $userIdentifier = method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername(); $password = $token->getCredentials(); diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php index 4f69f33a23d95..d81e31bb07b75 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php @@ -59,7 +59,7 @@ public function authenticate(TokenInterface $token) } $userIdentifier = method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername(); - // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 if (method_exists($this->userProvider, 'loadUserByIdentifier')) { $user = $this->userProvider->loadUserByIdentifier($userIdentifier); } else { diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index 0363e18428a37..d2ef93a0e54c3 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -75,7 +75,7 @@ public function getUserIdentifier(): string } if ($this->user instanceof UserInterface) { - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 return method_exists($this->user, 'getUserIdentifier') ? $this->user->getUserIdentifier() : $this->user->getUsername(); } diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php index 95a4d2d780cb0..ec6d7c7168f56 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php @@ -50,7 +50,7 @@ public function __construct($user, $credentials, string $firewallName, array $ro * * @return string The provider key * - * @deprecated since 5.2, use getFirewallName() instead + * @deprecated since Symfony 5.2, use getFirewallName() instead */ public function getProviderKey() { diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php index c019195eecb62..6ad39c514afe2 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php @@ -64,7 +64,7 @@ public function setAuthenticated(bool $authenticated) * * @return string The provider secret * - * @deprecated since 5.2, use getFirewallName() instead + * @deprecated since Symfony 5.2, use getFirewallName() instead */ public function getProviderKey() { diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php index 1fc30bfcd1473..b479324498854 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php @@ -49,7 +49,7 @@ public function setToken(TokenInterface $token = null) // ensure any initializer is called $this->getToken(); - // @deprecated since 5.3 + // @deprecated since Symfony 5.3 if (!method_exists($token, 'getUserIdentifier')) { trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "getUserIdentifier(): string" in token class "%s" is deprecated. This method will replace "getUsername()" in Symfony 6.0.', get_debug_type($token)); } diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php index 8228f6773955d..a087b082a187c 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php @@ -70,7 +70,7 @@ public function getCredentials() * * @return string The provider key * - * @deprecated since 5.2, use getFirewallName() instead + * @deprecated since Symfony 5.2, use getFirewallName() instead */ public function getProviderKey() { diff --git a/src/Symfony/Component/Security/Core/User/ChainUserProvider.php b/src/Symfony/Component/Security/Core/User/ChainUserProvider.php index 30dfeb9b2db1a..7f40abb10ce18 100644 --- a/src/Symfony/Component/Security/Core/User/ChainUserProvider.php +++ b/src/Symfony/Component/Security/Core/User/ChainUserProvider.php @@ -60,7 +60,7 @@ public function loadUserByIdentifier(string $userIdentifier): UserInterface { foreach ($this->providers as $provider) { try { - // @deprecated since 5.3, change to $provider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $provider->loadUserByIdentifier() in 6.0 if (!method_exists($provider, 'loadUserByIdentifier')) { trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "loadUserByIdentifier()" in user provider "%s" is deprecated. This method will replace "loadUserByUsername()" in Symfony 6.0.', get_debug_type($provider)); @@ -101,7 +101,7 @@ public function refreshUser(UserInterface $user) } if ($supportedUserFound) { - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 $username = method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(); $e = new UserNotFoundException(sprintf('There is no user with name "%s".', $username)); $e->setUserIdentifier($username); diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php index 2e9ea5a27f675..d077939471aa5 100644 --- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php +++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php @@ -51,7 +51,7 @@ public function __construct(array $users = []) */ public function createUser(UserInterface $user) { - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 $userIdentifier = strtolower(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername()); if (isset($this->users[$userIdentifier])) { throw new \LogicException('Another user with the same username already exists.'); @@ -74,7 +74,7 @@ public function loadUserByIdentifier(string $identifier): UserInterface { $user = $this->getUser($identifier); - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 return new InMemoryUser(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), $user->getPassword(), $user->getRoles(), $user->isEnabled()); } @@ -87,7 +87,7 @@ public function refreshUser(UserInterface $user) throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_debug_type($user))); } - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 $storedUser = $this->getUser(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername()); $userIdentifier = method_exists($storedUser, 'getUserIdentifier') ? $storedUser->getUserIdentifier() : $storedUser->getUsername(); diff --git a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php index e84a4c6a42ada..4b5c69cf92901 100644 --- a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php @@ -117,7 +117,7 @@ private function authenticateViaGuard(AuthenticatorInterface $guardAuthenticator if (null === $user) { $e = new UserNotFoundException(sprintf('Null returned from "%s::getUser()".', get_debug_type($guardAuthenticator))); - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 $e->setUserIdentifier(method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()); throw $e; diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php index e72eb075b163e..6afa8eadf0fa7 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php @@ -75,7 +75,7 @@ public function __construct(iterable $authenticators, TokenStorageInterface $tok public function authenticateUser(UserInterface $user, AuthenticatorInterface $authenticator, Request $request, array $badges = []): ?Response { // create an authenticated token for the User - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 $token = $authenticator->createAuthenticatedToken($passport = new SelfValidatingPassport(new UserBadge(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), function () use ($user) { return $user; }), $badges), $this->firewallName); // announce the authenticated token @@ -229,7 +229,7 @@ private function executeAuthenticator(AuthenticatorInterface $authenticator, Req private function handleAuthenticationSuccess(TokenInterface $authenticatedToken, PassportInterface $passport, Request $request, AuthenticatorInterface $authenticator): ?Response { - // @deprecated since 5.3 + // @deprecated since Symfony 5.3 $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())); diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php index a0f6f3ea74ac0..950f19ca6ccd1 100644 --- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php @@ -30,7 +30,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle protected $httpUtils; protected $options; - /** @deprecated since 5.2, use $firewallName instead */ + /** @deprecated since Symfony 5.2, use $firewallName instead */ protected $providerKey; protected $firewallName; protected $defaultOptions = [ @@ -78,7 +78,7 @@ public function setOptions(array $options) * * @return string * - * @deprecated since 5.2, use getFirewallName() instead + * @deprecated since Symfony 5.2, use getFirewallName() instead */ public function getProviderKey() { diff --git a/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php index 1202444a1b647..a5736aecd800c 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php @@ -86,7 +86,7 @@ public function supports(Request $request): ?bool public function authenticate(Request $request): PassportInterface { - // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 $method = 'loadUserByIdentifier'; if (!method_exists($this->userProvider, 'loadUserByIdentifier')) { trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "loadUserByIdentifier()" in user provider "%s" is deprecated. This method will replace "loadUserByUsername()" in Symfony 6.0.', get_debug_type($this->userProvider)); diff --git a/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php index 892f19a9a66bf..aeb84a5799de0 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php @@ -81,7 +81,7 @@ public function authenticate(Request $request): PassportInterface { $credentials = $this->getCredentials($request); - // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 $method = 'loadUserByIdentifier'; if (!method_exists($this->userProvider, 'loadUserByIdentifier')) { trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "loadUserByIdentifier()" in user provider "%s" is deprecated. This method will replace "loadUserByUsername()" in Symfony 6.0.', get_debug_type($this->userProvider)); diff --git a/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php index 55ef80d80d492..ef213d30a3e34 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php @@ -64,7 +64,7 @@ public function authenticate(Request $request): PassportInterface $username = $request->headers->get('PHP_AUTH_USER'); $password = $request->headers->get('PHP_AUTH_PW', ''); - // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 $method = 'loadUserByIdentifier'; if (!method_exists($this->userProvider, 'loadUserByIdentifier')) { trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "loadUserByIdentifier()" in user provider "%s" is deprecated. This method will replace "loadUserByUsername()" in Symfony 6.0.', get_debug_type($this->userProvider)); diff --git a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php index 41e04aef3d763..7605bb7774312 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php @@ -91,7 +91,7 @@ public function authenticate(Request $request): PassportInterface throw $e; } - // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 $method = 'loadUserByIdentifier'; if (!method_exists($this->userProvider, 'loadUserByIdentifier')) { trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "loadUserByIdentifier()" in user provider "%s" is deprecated. This method will replace "loadUserByUsername()" in Symfony 6.0.', get_debug_type($this->userProvider)); diff --git a/src/Symfony/Component/Security/Http/EventListener/UserProviderListener.php b/src/Symfony/Component/Security/Http/EventListener/UserProviderListener.php index a6e78f6a1fe79..a3408789d1c71 100644 --- a/src/Symfony/Component/Security/Http/EventListener/UserProviderListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/UserProviderListener.php @@ -45,7 +45,7 @@ public function checkPassport(CheckPassportEvent $event): void return; } - // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 if (method_exists($this->userProvider, 'loadUserByIdentifier')) { $badge->setUserLoader([$this->userProvider, 'loadUserByIdentifier']); } else { diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php index 7b8622f22f5a4..33e2c08b64d86 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php @@ -199,7 +199,7 @@ private function onFailure(Request $request, AuthenticationException $failed): R private function onSuccess(Request $request, TokenInterface $token): Response { if (null !== $this->logger) { - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 $this->logger->info('User has been authenticated successfully.', ['username' => method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()]); } diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php index 9b9851f4ffa14..b698e1e4d7dca 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php @@ -87,7 +87,7 @@ public function authenticate(RequestEvent $event) } if (null !== $token = $this->tokenStorage->getToken()) { - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 if ($token instanceof PreAuthenticatedToken && $this->providerKey == $token->getFirewallName() && $token->isAuthenticated() && (method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()) === $user) { return; } diff --git a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php index 9469fa8819c0f..2e3a8e5dcab5d 100644 --- a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php @@ -77,7 +77,7 @@ public function authenticate(RequestEvent $event) } if (null !== $token = $this->tokenStorage->getToken()) { - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 if ($token instanceof UsernamePasswordToken && $token->isAuthenticated() && (method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()) === $username) { return; } diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index 25219dfd48eb3..53e948eb36969 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -234,7 +234,7 @@ protected function refreshUser(TokenInterface $token): ?TokenInterface $userDeauthenticated = true; if (null !== $this->logger) { - // @deprecated since 5.3, change to $refreshedUser->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $refreshedUser->getUserIdentifier() in 6.0 $this->logger->debug('Cannot refresh token because user has changed.', ['username' => method_exists($refreshedUser, 'getUserIdentifier') ? $refreshedUser->getUserIdentifier() : $refreshedUser->getUsername(), 'provider' => \get_class($provider)]); } @@ -244,11 +244,11 @@ protected function refreshUser(TokenInterface $token): ?TokenInterface $token->setUser($refreshedUser); if (null !== $this->logger) { - // @deprecated since 5.3, change to $refreshedUser->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $refreshedUser->getUserIdentifier() in 6.0 $context = ['provider' => \get_class($provider), 'username' => method_exists($refreshedUser, 'getUserIdentifier') ? $refreshedUser->getUserIdentifier() : $refreshedUser->getUsername()]; if ($token instanceof SwitchUserToken) { - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 $context['impersonator_username'] = method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getOriginalToken()->getUsername(); } diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php index b765b89da7d18..2d4be7fcfe004 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php @@ -140,7 +140,7 @@ private function attemptSwitchUser(Request $request, string $username): ?TokenIn $originalToken = $this->getOriginalToken($token); if (null !== $originalToken) { - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 if ((method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()) === $username) { return $token; } @@ -149,7 +149,7 @@ private function attemptSwitchUser(Request $request, string $username): ?TokenIn $token = $this->attemptExitUser($request); } - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 $currentUsername = method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername(); $nonExistentUsername = '_'.md5(random_bytes(8).$username); diff --git a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php index c1a92cbd58916..9679b33ff92a5 100644 --- a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordJsonAuthenticationListener.php @@ -153,7 +153,7 @@ public function authenticate(RequestEvent $event) private function onSuccess(Request $request, TokenInterface $token): ?Response { if (null !== $this->logger) { - // @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0 $this->logger->info('User has been authenticated successfully.', ['username' => method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()]); } diff --git a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php index 29abec856fecf..b49fd8b1ea31b 100644 --- a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php +++ b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php @@ -50,7 +50,7 @@ public function createLoginLink(UserInterface $user, Request $request = null): L $expires = $expiresAt->format('U'); $parameters = [ - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 'user' => method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), 'expires' => $expires, 'hash' => $this->signatureHashUtil->computeSignatureHash($user, $expires), @@ -85,7 +85,7 @@ public function consumeLoginLink(Request $request): UserInterface $userIdentifier = $request->get('user'); try { - // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 if (method_exists($this->userProvider, 'loadUserByIdentifier')) { $user = $this->userProvider->loadUserByIdentifier($userIdentifier); } else { diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php index 03ccb83649d31..97918c86cb8b4 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php @@ -63,7 +63,7 @@ abstract protected function processRememberMe(RememberMeDetails $rememberMeDetai public function consumeRememberMeCookie(RememberMeDetails $rememberMeDetails): UserInterface { try { - // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0 $method = 'loadUserByIdentifier'; if (!method_exists($this->userProvider, 'loadUserByIdentifier')) { trigger_deprecation('symfony/security-core', '5.3', 'Not implementing method "loadUserByIdentifier()" in user provider "%s" is deprecated. This method will replace "loadUserByUsername()" in Symfony 6.0.', get_debug_type($this->userProvider)); diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index c7376faa910d9..dc60806c4e9eb 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -94,7 +94,7 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request) ); $userProvider = $this->getUserProvider($persistentToken->getClass()); - // @deprecated since 5.3, change to $persistentToken->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $persistentToken->getUserIdentifier() in 6.0 if (method_exists($persistentToken, 'getUserIdentifier')) { $userIdentifier = $persistentToken->getUserIdentifier(); } else { @@ -103,7 +103,7 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request) $userIdentifier = $persistentToken->getUsername(); } - // @deprecated since 5.3, change to $userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $userProvider->loadUserByIdentifier() in 6.0 if (method_exists($userProvider, 'loadUserByIdentifier')) { return $userProvider->loadUserByIdentifier($userIdentifier); } else { @@ -124,7 +124,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt $this->tokenProvider->createNewToken( new PersistentToken( \get_class($user = $token->getUser()), - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), $series, $this->generateHash($tokenValue), diff --git a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php index a6e79f42e56d7..21725fe7ef00b 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php @@ -41,7 +41,7 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request) } try { $userProvider = $this->getUserProvider($class); - // @deprecated since 5.3, change to $userProvider->loadUserByIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $userProvider->loadUserByIdentifier() in 6.0 if (method_exists($userProvider, 'loadUserByIdentifier')) { $user = $userProvider->loadUserByIdentifier($userIdentifier); } else { @@ -79,7 +79,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt { $user = $token->getUser(); $expires = time() + $this->options['lifetime']; - // @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0 + // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0 $value = $this->generateCookieValue(\get_class($user), method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), $expires, $user->getPassword()); $response->headers->setCookie(