diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-15 16:13:55 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-05-15 16:13:55 +0200 |
| commit | 6ed97b76b3efaf04314def15abefd7e8e284a2d0 (patch) | |
| tree | bbc8859d18aee3c4fb90945dbf0ef69cb7a5bf07 /Core/Authentication/Provider | |
| parent | be8e01596f133c2c950b011fe8b0e261dc6c6f34 (diff) | |
| parent | 34bcfc3debc0b7e1fbc68b1bedf98e21163f4967 (diff) | |
| download | symfony-security-6ed97b76b3efaf04314def15abefd7e8e284a2d0.zip symfony-security-6ed97b76b3efaf04314def15abefd7e8e284a2d0.tar.gz symfony-security-6ed97b76b3efaf04314def15abefd7e8e284a2d0.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
fixed CS
fixed CS
fixed CS
Fix WebProfilerBundle compatiblity with HttpKernel < 2.7
[Validator] Deprecated PHP7-incompatible constraints and related validators
[DebugBundle] Allow alternative destination for dumps
[DebugBundle] Use output mechanism of dumpers instead of echoing
[DebugBundle] Always collect dumps
[FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands
Fix tests in HHVM
CS: Pre incrementation/decrementation should be used if possible
Conflicts:
src/Symfony/Bundle/FrameworkBundle/composer.json
Diffstat (limited to 'Core/Authentication/Provider')
| -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); |