diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-07 08:40:15 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-07 08:40:15 +0100 |
commit | b883dbdf074f070aaf67e7f6da5bb9af807f7cbd (patch) | |
tree | af4b57fc3cdcb12555d723f22d9f8a0ed4ae92f6 /Core/Authentication | |
parent | b4d7bfbd51e8ce9b7cc91aac2dccfa1b3fd731a9 (diff) | |
parent | 9c2566542e03e280f62b019264becf6b74891bdc (diff) | |
download | symfony-security-b883dbdf074f070aaf67e7f6da5bb9af807f7cbd.zip symfony-security-b883dbdf074f070aaf67e7f6da5bb9af807f7cbd.tar.gz symfony-security-b883dbdf074f070aaf67e7f6da5bb9af807f7cbd.tar.bz2 |
Merge branch '2.3' into 2.6
* 2.3:
replaced the last remaining is_integer() call
[2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
[Validator] Added missing galician (gl) translations
[travis] Tests Security sub-components
[travis] Tests Security sub-components
CS fixes
[travis] test with php nightly
Conflicts:
src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
Diffstat (limited to 'Core/Authentication')
-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 4f73254..c17a954 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); |