diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-07-26 11:08:40 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-07-26 11:08:40 +0200 |
| commit | cdad268d48b2943690fa59fe8274285010547340 (patch) | |
| tree | 74ebadfe86a9f4768f9db3263134f8c10db54abe /Http | |
| parent | 79b1d65ad79a2650fdc6b2849604dc9fb9759c4a (diff) | |
| parent | 39fae4de46ca087fbead4f2ee75c1647cad277ad (diff) | |
| download | symfony-security-cdad268d48b2943690fa59fe8274285010547340.zip symfony-security-cdad268d48b2943690fa59fe8274285010547340.tar.gz symfony-security-cdad268d48b2943690fa59fe8274285010547340.tar.bz2 | |
Merge branch '2.3' into 2.6v2.6.11
* 2.3:
#15331 add infos about deprecated classes to UPGRADE-3.0
[Security] removed useless else condition in SwitchUserListener class.
[travis] Tests deps=low with PHP 5.6
[Console] Fix console output with closed stdout
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/Firewall/SwitchUserListener.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Http/Firewall/SwitchUserListener.php b/Http/Firewall/SwitchUserListener.php index ff6db4d..14bf1f5 100644 --- a/Http/Firewall/SwitchUserListener.php +++ b/Http/Firewall/SwitchUserListener.php @@ -118,9 +118,9 @@ class SwitchUserListener implements ListenerInterface if (false !== $originalToken) { if ($token->getUsername() === $request->get($this->usernameParameter)) { return $token; - } else { - throw new \LogicException(sprintf('You are already switched to "%s" user.', $token->getUsername())); } + + throw new \LogicException(sprintf('You are already switched to "%s" user.', $token->getUsername())); } if (false === $this->accessDecisionManager->decide($token, array($this->role))) { |