Skip to content

Commit 4603bcc

Browse files
committed
Merge branch '2.5' into 2.6
* 2.5: [2.3] [HttpFoundation] [MimeTypeGuesser] Removed dead code and various cleaning [Console] Make it clear that the second argument is not about command options. Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes [Yaml] fixed parse shortcut Key after unindented collection. [Console] fixed #10531 Make the container considered non-fresh if the environment parameters are changed Conflicts: src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
2 parents d855729 + 3a27d7b commit 4603bcc

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

Authentication/Provider/PreAuthenticatedAuthenticationProvider.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ public function authenticate(TokenInterface $token)
5959
if (!$user = $token->getUser()) {
6060
throw new BadCredentialsException('No pre-authenticated principal found in request.');
6161
}
62-
/*
63-
if (null === $token->getCredentials()) {
64-
throw new BadCredentialsException('No pre-authenticated credentials found in request.');
65-
}
66-
*/
62+
6763
$user = $this->userProvider->loadUserByUsername($user);
6864

6965
$this->userChecker->checkPostAuth($user);

0 commit comments

Comments
 (0)