Skip to content

Commit 64e759a

Browse files
fabpotfabpot
committed
Fix deprecation messages
1 parent 2965d5d commit 64e759a

17 files changed

+26
-26
lines changed

‎Authentication/AuthenticatorManager.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function __construct(iterable $authenticators, TokenStorageInterface $tok
7575
public function authenticateUser(UserInterface $user, AuthenticatorInterface $authenticator, Request $request, array $badges = []): ?Response
7676
{
7777
// create an authenticated token for the User
78-
// @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0
78+
// @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0
7979
$token = $authenticator->createAuthenticatedToken($passport = new SelfValidatingPassport(new UserBadge(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), function () use ($user) { return $user; }), $badges), $this->firewallName);
8080

8181
// announce the authenticated token
@@ -229,7 +229,7 @@ private function executeAuthenticator(AuthenticatorInterface $authenticator, Req
229229

230230
private function handleAuthenticationSuccess(TokenInterface $authenticatedToken, PassportInterface $passport, Request $request, AuthenticatorInterface $authenticator): ?Response
231231
{
232-
// @deprecated since 5.3
232+
// @deprecated since Symfony 5.3
233233
$user = $authenticatedToken->getUser();
234234
if ($user instanceof UserInterface && !method_exists($user, 'getUserIdentifier')) {
235235
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()));

‎Authentication/DefaultAuthenticationSuccessHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
3030

3131
protected $httpUtils;
3232
protected $options;
33-
/** @deprecated since 5.2, use $firewallName instead */
33+
/** @deprecated since Symfony 5.2, use $firewallName instead */
3434
protected $providerKey;
3535
protected $firewallName;
3636
protected $defaultOptions = [
@@ -78,7 +78,7 @@ public function setOptions(array $options)
7878
*
7979
* @return string
8080
*
81-
* @deprecated since 5.2, use getFirewallName() instead
81+
* @deprecated since Symfony 5.2, use getFirewallName() instead
8282
*/
8383
public function getProviderKey()
8484
{

‎Authenticator/AbstractPreAuthenticatedAuthenticator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function supports(Request $request): ?bool
8686

8787
public function authenticate(Request $request): PassportInterface
8888
{
89-
// @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
89+
// @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
9090
$method = 'loadUserByIdentifier';
9191
if (!method_exists($this->userProvider, 'loadUserByIdentifier')) {
9292
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));

‎Authenticator/FormLoginAuthenticator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function authenticate(Request $request): PassportInterface
8181
{
8282
$credentials = $this->getCredentials($request);
8383

84-
// @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
84+
// @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
8585
$method = 'loadUserByIdentifier';
8686
if (!method_exists($this->userProvider, 'loadUserByIdentifier')) {
8787
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));

‎Authenticator/HttpBasicAuthenticator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function authenticate(Request $request): PassportInterface
6464
$username = $request->headers->get('PHP_AUTH_USER');
6565
$password = $request->headers->get('PHP_AUTH_PW', '');
6666

67-
// @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
67+
// @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
6868
$method = 'loadUserByIdentifier';
6969
if (!method_exists($this->userProvider, 'loadUserByIdentifier')) {
7070
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));

‎Authenticator/JsonLoginAuthenticator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function authenticate(Request $request): PassportInterface
9191
throw $e;
9292
}
9393

94-
// @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
94+
// @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
9595
$method = 'loadUserByIdentifier';
9696
if (!method_exists($this->userProvider, 'loadUserByIdentifier')) {
9797
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));

‎EventListener/UserProviderListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function checkPassport(CheckPassportEvent $event): void
4545
return;
4646
}
4747

48-
// @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
48+
// @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
4949
if (method_exists($this->userProvider, 'loadUserByIdentifier')) {
5050
$badge->setUserLoader([$this->userProvider, 'loadUserByIdentifier']);
5151
} else {

‎Firewall/AbstractAuthenticationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private function onFailure(Request $request, AuthenticationException $failed): R
199199
private function onSuccess(Request $request, TokenInterface $token): Response
200200
{
201201
if (null !== $this->logger) {
202-
// @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0
202+
// @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0
203203
$this->logger->info('User has been authenticated successfully.', ['username' => method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()]);
204204
}
205205

‎Firewall/AbstractPreAuthenticatedListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function authenticate(RequestEvent $event)
8787
}
8888

8989
if (null !== $token = $this->tokenStorage->getToken()) {
90-
// @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0
90+
// @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0
9191
if ($token instanceof PreAuthenticatedToken && $this->providerKey == $token->getFirewallName() && $token->isAuthenticated() && (method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()) === $user) {
9292
return;
9393
}

‎Firewall/BasicAuthenticationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function authenticate(RequestEvent $event)
7777
}
7878

7979
if (null !== $token = $this->tokenStorage->getToken()) {
80-
// @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0
80+
// @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0
8181
if ($token instanceof UsernamePasswordToken && $token->isAuthenticated() && (method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()) === $username) {
8282
return;
8383
}

‎Firewall/ContextListener.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ protected function refreshUser(TokenInterface $token): ?TokenInterface
234234
$userDeauthenticated = true;
235235

236236
if (null !== $this->logger) {
237-
// @deprecated since 5.3, change to $refreshedUser->getUserIdentifier() in 6.0
237+
// @deprecated since Symfony 5.3, change to $refreshedUser->getUserIdentifier() in 6.0
238238
$this->logger->debug('Cannot refresh token because user has changed.', ['username' => method_exists($refreshedUser, 'getUserIdentifier') ? $refreshedUser->getUserIdentifier() : $refreshedUser->getUsername(), 'provider' => \get_class($provider)]);
239239
}
240240

@@ -244,11 +244,11 @@ protected function refreshUser(TokenInterface $token): ?TokenInterface
244244
$token->setUser($refreshedUser);
245245

246246
if (null !== $this->logger) {
247-
// @deprecated since 5.3, change to $refreshedUser->getUserIdentifier() in 6.0
247+
// @deprecated since Symfony 5.3, change to $refreshedUser->getUserIdentifier() in 6.0
248248
$context = ['provider' => \get_class($provider), 'username' => method_exists($refreshedUser, 'getUserIdentifier') ? $refreshedUser->getUserIdentifier() : $refreshedUser->getUsername()];
249249

250250
if ($token instanceof SwitchUserToken) {
251-
// @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0
251+
// @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0
252252
$context['impersonator_username'] = method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getOriginalToken()->getUsername();
253253
}
254254

‎Firewall/SwitchUserListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private function attemptSwitchUser(Request $request, string $username): ?TokenIn
140140
$originalToken = $this->getOriginalToken($token);
141141

142142
if (null !== $originalToken) {
143-
// @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0
143+
// @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0
144144
if ((method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()) === $username) {
145145
return $token;
146146
}
@@ -149,7 +149,7 @@ private function attemptSwitchUser(Request $request, string $username): ?TokenIn
149149
$token = $this->attemptExitUser($request);
150150
}
151151

152-
// @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0
152+
// @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0
153153
$currentUsername = method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername();
154154
$nonExistentUsername = '_'.md5(random_bytes(8).$username);
155155

‎Firewall/UsernamePasswordJsonAuthenticationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public function authenticate(RequestEvent $event)
153153
private function onSuccess(Request $request, TokenInterface $token): ?Response
154154
{
155155
if (null !== $this->logger) {
156-
// @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0
156+
// @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0
157157
$this->logger->info('User has been authenticated successfully.', ['username' => method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername()]);
158158
}
159159

‎LoginLink/LoginLinkHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function createLoginLink(UserInterface $user, Request $request = null): L
5050

5151
$expires = $expiresAt->format('U');
5252
$parameters = [
53-
// @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0
53+
// @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0
5454
'user' => method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(),
5555
'expires' => $expires,
5656
'hash' => $this->signatureHashUtil->computeSignatureHash($user, $expires),
@@ -85,7 +85,7 @@ public function consumeLoginLink(Request $request): UserInterface
8585
$userIdentifier = $request->get('user');
8686

8787
try {
88-
// @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
88+
// @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
8989
if (method_exists($this->userProvider, 'loadUserByIdentifier')) {
9090
$user = $this->userProvider->loadUserByIdentifier($userIdentifier);
9191
} else {

‎RememberMe/AbstractRememberMeHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ abstract protected function processRememberMe(RememberMeDetails $rememberMeDetai
6363
public function consumeRememberMeCookie(RememberMeDetails $rememberMeDetails): UserInterface
6464
{
6565
try {
66-
// @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
66+
// @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0
6767
$method = 'loadUserByIdentifier';
6868
if (!method_exists($this->userProvider, 'loadUserByIdentifier')) {
6969
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));

‎RememberMe/PersistentTokenBasedRememberMeServices.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request)
9494
);
9595

9696
$userProvider = $this->getUserProvider($persistentToken->getClass());
97-
// @deprecated since 5.3, change to $persistentToken->getUserIdentifier() in 6.0
97+
// @deprecated since Symfony 5.3, change to $persistentToken->getUserIdentifier() in 6.0
9898
if (method_exists($persistentToken, 'getUserIdentifier')) {
9999
$userIdentifier = $persistentToken->getUserIdentifier();
100100
} else {
@@ -103,7 +103,7 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request)
103103
$userIdentifier = $persistentToken->getUsername();
104104
}
105105

106-
// @deprecated since 5.3, change to $userProvider->loadUserByIdentifier() in 6.0
106+
// @deprecated since Symfony 5.3, change to $userProvider->loadUserByIdentifier() in 6.0
107107
if (method_exists($userProvider, 'loadUserByIdentifier')) {
108108
return $userProvider->loadUserByIdentifier($userIdentifier);
109109
} else {
@@ -124,7 +124,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
124124
$this->tokenProvider->createNewToken(
125125
new PersistentToken(
126126
\get_class($user = $token->getUser()),
127-
// @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0
127+
// @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0
128128
method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(),
129129
$series,
130130
$this->generateHash($tokenValue),

‎RememberMe/TokenBasedRememberMeServices.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request)
4141
}
4242
try {
4343
$userProvider = $this->getUserProvider($class);
44-
// @deprecated since 5.3, change to $userProvider->loadUserByIdentifier() in 6.0
44+
// @deprecated since Symfony 5.3, change to $userProvider->loadUserByIdentifier() in 6.0
4545
if (method_exists($userProvider, 'loadUserByIdentifier')) {
4646
$user = $userProvider->loadUserByIdentifier($userIdentifier);
4747
} else {
@@ -79,7 +79,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
7979
{
8080
$user = $token->getUser();
8181
$expires = time() + $this->options['lifetime'];
82-
// @deprecated since 5.3, change to $user->getUserIdentifier() in 6.0
82+
// @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0
8383
$value = $this->generateCookieValue(\get_class($user), method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), $expires, $user->getPassword());
8484

8585
$response->headers->setCookie(

0 commit comments

Comments
 (0)