diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-07-26 11:08:49 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-07-26 11:08:49 +0200 |
| commit | 30850d4f362dedaf5345696fe6e2729337175583 (patch) | |
| tree | 7d7e51a55ad5aacf3fe6e9d89347e65fb36b37c7 /Http | |
| parent | 9aa9f4801b98bccbf1ec6b93d1f36aea43829be7 (diff) | |
| parent | cdad268d48b2943690fa59fe8274285010547340 (diff) | |
| download | symfony-security-30850d4f362dedaf5345696fe6e2729337175583.zip symfony-security-30850d4f362dedaf5345696fe6e2729337175583.tar.gz symfony-security-30850d4f362dedaf5345696fe6e2729337175583.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[Yaml] throw a ParseException on invalid data type
#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 8746d2b..7c068fe 100644 --- a/Http/Firewall/SwitchUserListener.php +++ b/Http/Firewall/SwitchUserListener.php @@ -115,9 +115,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))) { |