Fix deprecation messages

fabpot · fabpot · commit e1b9d809977f · 2021-08-13T17:54:02.000+02:00
diff --git a/Authentication/AuthenticationProviderManager.php b/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/Authentication/Provider/DaoAuthenticationProvider.php b/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/Authentication/Provider/LdapBindAuthenticationProvider.php b/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/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/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/Authentication/Token/AbstractToken.php b/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/Authentication/Token/PreAuthenticatedToken.php b/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/Authentication/Token/RememberMeToken.php b/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/Authentication/Token/Storage/TokenStorage.php b/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/Authentication/Token/UsernamePasswordToken.php b/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/User/ChainUserProvider.php b/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/User/InMemoryUserProvider.php b/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();
 

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function authenticate(TokenInterface $token)`
`110`	`110`	`$this->eventDispatcher->dispatch(new AuthenticationSuccessEvent($result), AuthenticationEvents::AUTHENTICATION_SUCCESS);`
`111`	`111`	`}`
`112`	`112`
`113`		`- // @deprecated since 5.3`
	`113`	`+ // @deprecated since Symfony 5.3`
`114`	`114`	`if ($user = $result->getUser() instanceof UserInterface && !method_exists($result->getUser(), 'getUserIdentifier')) {`
`115`	`115`	`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()));`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ protected function retrieveUser(string $userIdentifier, UsernamePasswordToken $t`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`try {`
`123`		`- // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0`
	`123`	`+ // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0`
`124`	`124`	`if (method_exists($this->userProvider, 'loadUserByIdentifier')) {`
`125`	`125`	`$user = $this->userProvider->loadUserByIdentifier($userIdentifier);`
`126`	`126`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function authenticate(TokenInterface $token)`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`$userIdentifier = method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername();`
`62`		`- // @deprecated since 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0`
	`62`	`+ // @deprecated since Symfony 5.3, change to $this->userProvider->loadUserByIdentifier() in 6.0`
`63`	`63`	`if (method_exists($this->userProvider, 'loadUserByIdentifier')) {`
`64`	`64`	`$user = $this->userProvider->loadUserByIdentifier($userIdentifier);`
`65`	`65`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function getUserIdentifier(): string`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`if ($this->user instanceof UserInterface) {`
`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`
`79`	`79`	`return method_exists($this->user, 'getUserIdentifier') ? $this->user->getUserIdentifier() : $this->user->getUsername();`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function __construct($user, $credentials, string $firewallName, array $ro`
`50`	`50`	`*`
`51`	`51`	`* @return string The provider key`
`52`	`52`	`*`
`53`		`- * @deprecated since 5.2, use getFirewallName() instead`
	`53`	`+ * @deprecated since Symfony 5.2, use getFirewallName() instead`
`54`	`54`	`*/`
`55`	`55`	`public function getProviderKey()`
`56`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function setAuthenticated(bool $authenticated)`
`64`	`64`	`*`
`65`	`65`	`* @return string The provider secret`
`66`	`66`	`*`
`67`		`- * @deprecated since 5.2, use getFirewallName() instead`
	`67`	`+ * @deprecated since Symfony 5.2, use getFirewallName() instead`
`68`	`68`	`*/`
`69`	`69`	`public function getProviderKey()`
`70`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function setToken(TokenInterface $token = null)`
`49`	`49`	`// ensure any initializer is called`
`50`	`50`	`$this->getToken();`
`51`	`51`
`52`		`- // @deprecated since 5.3`
	`52`	`+ // @deprecated since Symfony 5.3`
`53`	`53`	`if (!method_exists($token, 'getUserIdentifier')) {`
`54`	`54`	`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));`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function getCredentials()`
`70`	`70`	`*`
`71`	`71`	`* @return string The provider key`
`72`	`72`	`*`
`73`		`- * @deprecated since 5.2, use getFirewallName() instead`
	`73`	`+ * @deprecated since Symfony 5.2, use getFirewallName() instead`
`74`	`74`	`*/`
`75`	`75`	`public function getProviderKey()`
`76`	`76`	`{`