diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-06-18 18:14:27 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-06-18 18:14:27 +0200 |
| commit | e92b6d4fee8cb5a22a33230897153bf290b3c4c9 (patch) | |
| tree | 7ff59492198b0edf2a11c7a856817068df8dbe94 /Http/RememberMe/TokenBasedRememberMeServices.php | |
| parent | bb80188e3b42a85f6c4ead17332098cab3f62aac (diff) | |
| parent | fd0b8b96fe220887ba93535742343df84078cd93 (diff) | |
| download | symfony-security-e92b6d4fee8cb5a22a33230897153bf290b3c4c9.zip symfony-security-e92b6d4fee8cb5a22a33230897153bf290b3c4c9.tar.gz symfony-security-e92b6d4fee8cb5a22a33230897153bf290b3c4c9.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7: (36 commits)
[DoctrineBridge] Bypass the db when no valid identifier is provided in ORMQueryBuilderLoader
[Serializer] Fixed typo in comment
[Form] Fixed: Filter non-integers when selecting entities by int ID
Fix merge
Fix merge
Add test for HHVM FatalErrors
[2.6][Debug] Fix fatal-errors handling on HHVM
[Debug] Fix log level of stacked errors
[VarDumper] Fix uninitialized id in HtmlDumper
Fixed fluent interface
[Console] Fix tests on Windows
[2.7] Fix unsilenced deprecation notices
[2.3][Debug] Fix fatal-errors handling on HHVM
[Debug] fix debug class loader case test on windows
Standardize the name of the exception variables
[Debug+VarDumper] Fix handling of PHP7 exception/error model
Do not trigger deprecation error in ResolveParameterPlaceHoldersPass
[2.3] Static Code Analysis for Components
Added a small Upgrade note regarding security.context
added missing deprecation in CHANGELOG
...
Conflicts:
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Http/RememberMe/TokenBasedRememberMeServices.php')
| -rw-r--r-- | Http/RememberMe/TokenBasedRememberMeServices.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php index 65bac0a..d68ada5 100644 --- a/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/Http/RememberMe/TokenBasedRememberMeServices.php @@ -42,12 +42,12 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices } try { $user = $this->getUserProvider($class)->loadUserByUsername($username); - } catch (\Exception $ex) { - if (!$ex instanceof AuthenticationException) { - $ex = new AuthenticationException($ex->getMessage(), $ex->getCode(), $ex); + } catch (\Exception $e) { + if (!$e instanceof AuthenticationException) { + $e = new AuthenticationException($e->getMessage(), $e->getCode(), $e); } - throw $ex; + throw $e; } if (!$user instanceof UserInterface) { |