Skip to content

Commit 0635b14

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [Security] alway use getUserIdentifier in InMemoryTokenProvider Update phpdoc to not reference removed classes [Security] Remove isAuthenticated and setAuthenticated token methods in tests
2 parents db2a39b + a25e9f7 commit 0635b14

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

Authentication/AuthenticationFailureHandlerInterface.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
interface AuthenticationFailureHandlerInterface
2828
{
2929
/**
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.
3331
*/
3432
public function onAuthenticationFailure(Request $request, AuthenticationException $exception): Response;
3533
}

Firewall/LogoutListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function supports(Request $request): ?bool
6666
* validate the request.
6767
*
6868
* @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
7070
*/
7171
public function authenticate(RequestEvent $event): void
7272
{

Tests/Firewall/ContextListenerTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -557,15 +557,6 @@ public function getUserIdentifier(): string
557557
return $this->getUserIdentifier();
558558
}
559559

560-
public function isAuthenticated(): bool
561-
{
562-
return true;
563-
}
564-
565-
public function setAuthenticated(bool $isAuthenticated)
566-
{
567-
}
568-
569560
public function eraseCredentials(): void
570561
{
571562
}

0 commit comments

Comments
 (0)