Remove unnecessary deprecations and add tests to legacy group

Patrick Elshof · Patrick Elshof · commit 99b49d054dab · 2022-06-06T10:28:23.000+02:00
diff --git a/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php
@@ -88,14 +88,12 @@ public function authenticate(Request $request): Passport
         }
 
         if (!\is_callable([$this->rememberMeHandler, 'getRememberMeDetails'])) {
-            trigger_deprecation('symfony/security-http', '6.1', 'RememberMeHandlers should implement method "getRememberMeDetails()".');
             $rememberMeCookie = RememberMeDetails::fromRawCookie($rawCookie);
         } else {
             $rememberMeCookie = $this->rememberMeHandler->getRememberMeDetails($rawCookie);
         }
 
         if (!\is_callable([$this->rememberMeHandler, 'getUserIdentifierForCookie'])) {
-            trigger_deprecation('symfony/security-http', '6.1', 'RememberMeHandlers should implement method "getUserIdentifierForCookie()".');
             $userIdentifier = $rememberMeCookie->getUserIdentifier();
         } else {
             $userIdentifier = $this->rememberMeHandler->getUserIdentifierForCookie($rememberMeCookie);
diff --git a/src/Symfony/Component/Security/Http/Tests/Authenticator/RememberMeAuthenticatorTest.php b/src/Symfony/Component/Security/Http/Tests/Authenticator/RememberMeAuthenticatorTest.php
@@ -106,6 +106,9 @@ public function testAuthenticateWithoutOldToken()
         $this->authenticator->authenticate($request);
     }
 
+    /**
+     * @group legacy
+     */
     public function testAuthenticateDeprecatedCodePath()
     {
         $mock = $this->getMockBuilder(RememberMeHandlerInterface::class)
@@ -123,6 +126,9 @@ public function testAuthenticateDeprecatedCodePath()
         $passport->getUser(); // trigger the user loader
     }
 
+    /**
+     * @group legacy
+     */
     public function testAuthenticateWithoutOldTokenDeprecatedCodePath()
     {
         $mock = $this->getMockBuilder(RememberMeHandlerInterface::class)

Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,12 @@ public function authenticate(Request $request): Passport`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`if (!\is_callable([$this->rememberMeHandler, 'getRememberMeDetails'])) {`
`91`		`- trigger_deprecation('symfony/security-http', '6.1', 'RememberMeHandlers should implement method "getRememberMeDetails()".');`
`92`	`91`	`$rememberMeCookie = RememberMeDetails::fromRawCookie($rawCookie);`
`93`	`92`	`} else {`
`94`	`93`	`$rememberMeCookie = $this->rememberMeHandler->getRememberMeDetails($rawCookie);`
`95`	`94`	`}`
`96`	`95`
`97`	`96`	`if (!\is_callable([$this->rememberMeHandler, 'getUserIdentifierForCookie'])) {`
`98`		`- trigger_deprecation('symfony/security-http', '6.1', 'RememberMeHandlers should implement method "getUserIdentifierForCookie()".');`
`99`	`97`	`$userIdentifier = $rememberMeCookie->getUserIdentifier();`
`100`	`98`	`} else {`
`101`	`99`	`$userIdentifier = $this->rememberMeHandler->getUserIdentifierForCookie($rememberMeCookie);`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ public function testAuthenticateWithoutOldToken()`
`106`	`106`	`$this->authenticator->authenticate($request);`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ /**`
	`110`	`+ * @group legacy`
	`111`	`+ */`
`109`	`112`	`public function testAuthenticateDeprecatedCodePath()`
`110`	`113`	`{`
`111`	`114`	`$mock = $this->getMockBuilder(RememberMeHandlerInterface::class)`
`@@ -123,6 +126,9 @@ public function testAuthenticateDeprecatedCodePath()`
`123`	`126`	`$passport->getUser(); // trigger the user loader`
`124`	`127`	`}`
`125`	`128`
	`129`	`+ /**`
	`130`	`+ * @group legacy`
	`131`	`+ */`
`126`	`132`	`public function testAuthenticateWithoutOldTokenDeprecatedCodePath()`
`127`	`133`	`{`
`128`	`134`	`$mock = $this->getMockBuilder(RememberMeHandlerInterface::class)`