Merge branch '6.4' into 7.0

derrabus · derrabus · commit d1774f4f159e · 2023-09-03T17:05:08.000+02:00
* 6.4:
  [Security] alway use getUserIdentifier in InMemoryTokenProvider
  Update phpdoc to not reference removed classes
  [Security] Remove isAuthenticated and setAuthenticated token methods in tests
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -16,9 +16,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * AbstractFactory is the base class for all classes inheriting from
- * AbstractAuthenticationListener.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Lukas Kahwe Smith <smith@pooteeweet.org>
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php
@@ -39,7 +39,7 @@ public function updateToken(string $series, #[\SensitiveParameter] string $token
 
         $token = new PersistentToken(
             $this->tokens[$series]->getClass(),
-            method_exists($this->tokens[$series], 'getUserIdentifier') ? $this->tokens[$series]->getUserIdentifier() : $this->tokens[$series]->getUsername(),
+            $this->tokens[$series]->getUserIdentifier(),
             $series,
             $tokenValue,
             $lastUsed
diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php
@@ -27,9 +27,7 @@
 interface AuthenticationFailureHandlerInterface
 {
     /**
-     * This is called when an interactive authentication attempt fails. This is
-     * called by authentication listeners inheriting from
-     * AbstractAuthenticationListener.
+     * This is called when an interactive authentication attempt fails.
      */
     public function onAuthenticationFailure(Request $request, AuthenticationException $exception): Response;
 }
diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
@@ -66,7 +66,7 @@ public function supports(Request $request): ?bool
      * validate the request.
      *
      * @throws LogoutException   if the CSRF token is invalid
-     * @throws \RuntimeException if the LogoutSuccessHandlerInterface instance does not return a response
+     * @throws \RuntimeException if the LogoutEvent listener does not set a response
      */
     public function authenticate(RequestEvent $event): void
     {
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -557,15 +557,6 @@ public function getUserIdentifier(): string
         return $this->getUserIdentifier();
     }
 
-    public function isAuthenticated(): bool
-    {
-        return true;
-    }
-
-    public function setAuthenticated(bool $isAuthenticated)
-    {
-    }
-
     public function eraseCredentials(): void
     {
     }

-Original file line number
+Diff line change
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 /**
 - * AbstractFactory is the base class for all classes inheriting from
 - * AbstractAuthenticationListener.
 - *
  * @author Fabien Potencier <[email protected]>
  * @author Lukas Kahwe Smith <[email protected]>
  * @author Johannes M. Schmitt <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,7 @@`
`27`	`27`	`interface AuthenticationFailureHandlerInterface`
`28`	`28`	`{`
`29`	`29`	`/**`
`30`		`- * This is called when an interactive authentication attempt fails. This is`
`31`		`- * called by authentication listeners inheriting from`
`32`		`- * AbstractAuthenticationListener.`
	`30`	`+ * This is called when an interactive authentication attempt fails.`
`33`	`31`	`*/`
`34`	`32`	`public function onAuthenticationFailure(Request $request, AuthenticationException $exception): Response;`
`35`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function supports(Request $request): ?bool`
`66`	`66`	`* validate the request.`
`67`	`67`	`*`
`68`	`68`	`* @throws LogoutException if the CSRF token is invalid`
`69`		`- * @throws \RuntimeException if the LogoutSuccessHandlerInterface instance does not return a response`
	`69`	`+ * @throws \RuntimeException if the LogoutEvent listener does not set a response`
`70`	`70`	`*/`
`71`	`71`	`public function authenticate(RequestEvent $event): void`
`72`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -557,15 +557,6 @@ public function getUserIdentifier(): string`
`557`	`557`	`return $this->getUserIdentifier();`
`558`	`558`	`}`
`559`	`559`
`560`		`- public function isAuthenticated(): bool`
`561`		`- {`
`562`		`- return true;`
`563`		`- }`
`564`		`-`
`565`		`- public function setAuthenticated(bool $isAuthenticated)`
`566`		`- {`
`567`		`- }`
`568`		`-`
`569`	`560`	`public function eraseCredentials(): void`
`570`	`561`	`{`
`571`	`562`	`}`