Skip to content

Commit 56eb9a1

Browse files
[Security] Fix added $token argument to UserCheckerInterface::checkPostAuth()
1 parent a052357 commit 56eb9a1

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

User/ChainUserChecker.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,15 @@ public function checkPreAuth(UserInterface $user): void
2929
}
3030
}
3131

32-
public function checkPostAuth(UserInterface $user /* , TokenInterface $token */): void
32+
/**
33+
* @param ?TokenInterface $token
34+
*/
35+
public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void
3336
{
3437
$token = 1 < \func_num_args() ? func_get_arg(1) : null;
3538

3639
foreach ($this->checkers as $checker) {
37-
if ($token instanceof TokenInterface) {
38-
$checker->checkPostAuth($user, $token);
39-
} else {
40-
$checker->checkPostAuth($user);
41-
}
40+
$checker->checkPostAuth($user, $token);
4241
}
4342
}
4443
}

User/InMemoryUserChecker.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ public function checkPreAuth(UserInterface $user): void
3333
}
3434
}
3535

36-
public function checkPostAuth(UserInterface $user): void
36+
/**
37+
* @param ?TokenInterface $token
38+
*/
39+
public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void
3740
{
3841
}
3942
}

User/UserCheckerInterface.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Security\Core\User;
1313

14+
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1415
use Symfony\Component\Security\Core\Exception\AccountStatusException;
1516

1617
/**
@@ -33,7 +34,9 @@ public function checkPreAuth(UserInterface $user): void;
3334
/**
3435
* Checks the user account after authentication.
3536
*
37+
* @param ?TokenInterface $token
38+
*
3639
* @throws AccountStatusException
3740
*/
38-
public function checkPostAuth(UserInterface $user /* , TokenInterface $token */): void;
41+
public function checkPostAuth(UserInterface $user /* , ?TokenInterface $token = null */): void;
3942
}

0 commit comments

Comments
 (0)