diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:53:44 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-05-15 15:53:44 +0200 |
| commit | 34bcfc3debc0b7e1fbc68b1bedf98e21163f4967 (patch) | |
| tree | 47f4484cd82bf68bec11be587ea012fccb4950ba /Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php | |
| parent | 41cb2c25e9d0f2535ccb7f2b5ef4d74165c04df1 (diff) | |
| parent | c7f7fcfa6dbcd0ae71be8fb4b2c0dbbce8f38150 (diff) | |
| download | symfony-security-34bcfc3debc0b7e1fbc68b1bedf98e21163f4967.zip symfony-security-34bcfc3debc0b7e1fbc68b1bedf98e21163f4967.tar.gz symfony-security-34bcfc3debc0b7e1fbc68b1bedf98e21163f4967.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
fixed CS
fixed CS
Conflicts:
src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
Diffstat (limited to 'Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php')
| -rw-r--r-- | Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php index c17a954..4f73254 100644 --- a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php +++ b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php @@ -60,7 +60,7 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn throw new BadCredentialsException('No pre-authenticated principal found in request.'); } - $user = $this->userProvider->loadUserByUsername($user); + $user = $this->userProvider->loadUserByUsername($user); $this->userChecker->checkPostAuth($user); |