made deprecation notices less verbose

fabpot · fabpot · commit 459743a85131 · 2018-02-19T13:10:10.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,11 @@ CHANGELOG
 4.1.0
 -----
 
- * The `ContextListener::setLogoutOnUserChange()` method is deprecated and will be removed in 5.0.
+ * The `ContextListener::setLogoutOnUserChange()` method is deprecated.
  * added `UserValueResolver`.
  * Using the AdvancedUserInterface is now deprecated. To use the existing
    functionality, create a custom user-checker based on the
-   `Symfony\Component\Security\Core\User\UserChecker`. This functionality will
-   be removed in Symfony 5.0.
+   `Symfony\Component\Security\Core\User\UserChecker`.
 
 4.0.0
 -----
diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php
@@ -261,7 +261,7 @@ private function hasUserChanged(UserInterface $user)
         }
 
         if ($this->user instanceof AdvancedUserInterface && $user instanceof AdvancedUserInterface) {
-            @trigger_error(sprintf('Checking for the AdvancedUserInterface in %s has been deprecated in 4.1 and will be removed in 5.0. Implement the %s to check if the user has been changed,', __METHOD__, EquatableInterface::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Checking for the AdvancedUserInterface in %s has been deprecated in 4.1. Implement the %s to check if the user has been changed,', __METHOD__, EquatableInterface::class), E_USER_DEPRECATED);
             if ($this->user->isAccountNonExpired() !== $user->isAccountNonExpired()) {
                 return true;
             }
@@ -278,7 +278,7 @@ private function hasUserChanged(UserInterface $user)
                 return true;
             }
         } elseif ($this->user instanceof AdvancedUserInterface xor $user instanceof AdvancedUserInterface) {
-            @trigger_error(sprintf('Checking for the AdvancedUserInterface in %s has been deprecated in 4.1 and will be removed in 5.0. Implement the %s to check if the user has been changed,', __METHOD__, EquatableInterface::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Checking for the AdvancedUserInterface in %s has been deprecated in 4.1. Implement the %s to check if the user has been changed,', __METHOD__, EquatableInterface::class), E_USER_DEPRECATED);
 
             return true;
         }
diff --git a/Core/Tests/User/UserCheckerTest.php b/Core/Tests/User/UserCheckerTest.php
@@ -32,7 +32,7 @@ public function testCheckPostAuthPass()
 
     /**
      * @group legacy
-     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPostAuth with an AdvancedUserInterface is deprecated as of 4.1 and will be removed in 5.0. Create a custom user checker if you wish to keep this functionality.
+     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPostAuth with an AdvancedUserInterface is deprecated since Symfony 4.1. Create a custom user checker if you wish to keep this functionality.
      */
     public function testCheckPostAuthPassAdvancedUser()
     {
@@ -55,7 +55,7 @@ public function testCheckPostAuthCredentialsExpired()
 
     /**
      * @group legacy
-     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPostAuth with an AdvancedUserInterface is deprecated as of 4.1 and will be removed in 5.0. Create a custom user checker if you wish to keep this functionality.
+     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPostAuth with an AdvancedUserInterface is deprecated since Symfony 4.1. Create a custom user checker if you wish to keep this functionality.
      * @expectedException \Symfony\Component\Security\Core\Exception\CredentialsExpiredException
      */
     public function testCheckPostAuthCredentialsExpiredAdvancedUser()
@@ -70,7 +70,7 @@ public function testCheckPostAuthCredentialsExpiredAdvancedUser()
 
     /**
      * @group legacy
-     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPreAuth with an AdvancedUserInterface is deprecated as of 4.1 and will be removed in 5.0. Create a custom user checker if you wish to keep this functionality.
+     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPreAuth with an AdvancedUserInterface is deprecated since Symfony 4.1. Create a custom user checker if you wish to keep this functionality.
      */
     public function testCheckPreAuthPassAdvancedUser()
     {
@@ -95,7 +95,7 @@ public function testCheckPreAuthAccountLocked()
 
     /**
      * @group legacy
-     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPreAuth with an AdvancedUserInterface is deprecated as of 4.1 and will be removed in 5.0. Create a custom user checker if you wish to keep this functionality.
+     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPreAuth with an AdvancedUserInterface is deprecated since Symfony 4.1. Create a custom user checker if you wish to keep this functionality.
      * @expectedException \Symfony\Component\Security\Core\Exception\LockedException
      */
     public function testCheckPreAuthAccountLockedAdvancedUser()
@@ -119,7 +119,7 @@ public function testCheckPreAuthDisabled()
 
     /**
      * @group legacy
-     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPreAuth with an AdvancedUserInterface is deprecated as of 4.1 and will be removed in 5.0. Create a custom user checker if you wish to keep this functionality.
+     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPreAuth with an AdvancedUserInterface is deprecated since Symfony 4.1. Create a custom user checker if you wish to keep this functionality.
      * @expectedException \Symfony\Component\Security\Core\Exception\DisabledException
      */
     public function testCheckPreAuthDisabledAdvancedUser()
@@ -144,7 +144,7 @@ public function testCheckPreAuthAccountExpired()
 
     /**
      * @group legacy
-     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPreAuth with an AdvancedUserInterface is deprecated as of 4.1 and will be removed in 5.0. Create a custom user checker if you wish to keep this functionality.
+     * @expectedDeprecation Calling Symfony\Component\Security\Core\User\UserChecker::checkPreAuth with an AdvancedUserInterface is deprecated since Symfony 4.1. Create a custom user checker if you wish to keep this functionality.
      * @expectedException \Symfony\Component\Security\Core\Exception\AccountExpiredException
      */
     public function testCheckPreAuthAccountExpiredAdvancedUser()
diff --git a/Core/User/AdvancedUserInterface.php b/Core/User/AdvancedUserInterface.php
@@ -32,7 +32,7 @@
  *
  * @see UserInterface
  * @see AccountStatusException
- * @deprecated since version 4.1, will be removed in 5.0.
+ * @deprecated since version 4.1
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
diff --git a/Core/User/UserChecker.php b/Core/User/UserChecker.php
@@ -33,7 +33,7 @@ public function checkPreAuth(UserInterface $user)
         }
 
         if ($user instanceof AdvancedUserInterface && !$user instanceof User) {
-            @trigger_error(sprintf('Calling %s with an AdvancedUserInterface is deprecated as of 4.1 and will be removed in 5.0. Create a custom user checker if you wish to keep this functionality.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Calling %s with an AdvancedUserInterface is deprecated since Symfony 4.1. Create a custom user checker if you wish to keep this functionality.', __METHOD__), E_USER_DEPRECATED);
         }
 
         if (!$user->isAccountNonLocked()) {
@@ -65,7 +65,7 @@ public function checkPostAuth(UserInterface $user)
         }
 
         if ($user instanceof AdvancedUserInterface && !$user instanceof User) {
-            @trigger_error(sprintf('Calling %s with an AdvancedUserInterface is deprecated as of 4.1 and will be removed in 5.0. Create a custom user checker if you wish to keep this functionality.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Calling %s with an AdvancedUserInterface is deprecated since Symfony 4.1. Create a custom user checker if you wish to keep this functionality.', __METHOD__), E_USER_DEPRECATED);
         }
 
         if (!$user->isCredentialsNonExpired()) {
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php
@@ -67,11 +67,11 @@ public function __construct(TokenStorageInterface $tokenStorage, iterable $userP
      *
      * @param bool $logoutOnUserChange
      *
-     * @deprecated since Symfony 4.1, to be removed in 5.0
+     * @deprecated since Symfony 4.1
      */
     public function setLogoutOnUserChange($logoutOnUserChange)
     {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 4.1 and will be removed in 5.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The %s() method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ private function hasUserChanged(UserInterface $user)`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`if ($this->user instanceof AdvancedUserInterface && $user instanceof AdvancedUserInterface) {`
`264`		`- @trigger_error(sprintf('Checking for the AdvancedUserInterface in %s has been deprecated in 4.1 and will be removed in 5.0. Implement the %s to check if the user has been changed,', __METHOD__, EquatableInterface::class), E_USER_DEPRECATED);`
	`264`	`+ @trigger_error(sprintf('Checking for the AdvancedUserInterface in %s has been deprecated in 4.1. Implement the %s to check if the user has been changed,', __METHOD__, EquatableInterface::class), E_USER_DEPRECATED);`
`265`	`265`	`if ($this->user->isAccountNonExpired() !== $user->isAccountNonExpired()) {`
`266`	`266`	`return true;`
`267`	`267`	`}`
`@@ -278,7 +278,7 @@ private function hasUserChanged(UserInterface $user)`
`278`	`278`	`return true;`
`279`	`279`	`}`
`280`	`280`	`} elseif ($this->user instanceof AdvancedUserInterface xor $user instanceof AdvancedUserInterface) {`
`281`		`- @trigger_error(sprintf('Checking for the AdvancedUserInterface in %s has been deprecated in 4.1 and will be removed in 5.0. Implement the %s to check if the user has been changed,', __METHOD__, EquatableInterface::class), E_USER_DEPRECATED);`
	`281`	`+ @trigger_error(sprintf('Checking for the AdvancedUserInterface in %s has been deprecated in 4.1. Implement the %s to check if the user has been changed,', __METHOD__, EquatableInterface::class), E_USER_DEPRECATED);`
`282`	`282`
`283`	`283`	`return true;`
`284`	`284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`*`
`33`	`33`	`* @see UserInterface`
`34`	`34`	`* @see AccountStatusException`
`35`		`- * @deprecated since version 4.1, will be removed in 5.0.`
	`35`	`+ * @deprecated since version 4.1`
`36`	`36`	`*`
`37`	`37`	`* @author Fabien Potencier <fabien@symfony.com>`
`38`	`38`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function checkPreAuth(UserInterface $user)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if ($user instanceof AdvancedUserInterface && !$user instanceof User) {`
`36`		`- @trigger_error(sprintf('Calling %s with an AdvancedUserInterface is deprecated as of 4.1 and will be removed in 5.0. Create a custom user checker if you wish to keep this functionality.', __METHOD__), E_USER_DEPRECATED);`
	`36`	`+ @trigger_error(sprintf('Calling %s with an AdvancedUserInterface is deprecated since Symfony 4.1. Create a custom user checker if you wish to keep this functionality.', __METHOD__), E_USER_DEPRECATED);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`if (!$user->isAccountNonLocked()) {`
`@@ -65,7 +65,7 @@ public function checkPostAuth(UserInterface $user)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if ($user instanceof AdvancedUserInterface && !$user instanceof User) {`
`68`		`- @trigger_error(sprintf('Calling %s with an AdvancedUserInterface is deprecated as of 4.1 and will be removed in 5.0. Create a custom user checker if you wish to keep this functionality.', __METHOD__), E_USER_DEPRECATED);`
	`68`	`+ @trigger_error(sprintf('Calling %s with an AdvancedUserInterface is deprecated since Symfony 4.1. Create a custom user checker if you wish to keep this functionality.', __METHOD__), E_USER_DEPRECATED);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if (!$user->isCredentialsNonExpired()) {`
Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,11 @@ public function __construct(TokenStorageInterface $tokenStorage, iterable $userP`
`67`	`67`	`*`
`68`	`68`	`* @param bool $logoutOnUserChange`
`69`	`69`	`*`
`70`		`- * @deprecated since Symfony 4.1, to be removed in 5.0`
	`70`	`+ * @deprecated since Symfony 4.1`
`71`	`71`	`*/`
`72`	`72`	`public function setLogoutOnUserChange($logoutOnUserChange)`
`73`	`73`	`{`
`74`		`- @trigger_error(sprintf('The %s() method is deprecated since Symfony 4.1 and will be removed in 5.0.', __METHOD__), E_USER_DEPRECATED);`
	`74`	`+ @trigger_error(sprintf('The %s() method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`