diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-07-26 11:09:29 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-07-26 11:09:29 +0200 |
| commit | ba8446776f5a32d3c1a6ae82ea28f8c9ab81026b (patch) | |
| tree | 011d64713a54a36441a93f5b295cc1a284e3f898 | |
| parent | d9b548e5f2683b14519b7c1fcf00e9e8403b77be (diff) | |
| parent | 30850d4f362dedaf5345696fe6e2729337175583 (diff) | |
| download | symfony-security-ba8446776f5a32d3c1a6ae82ea28f8c9ab81026b.zip symfony-security-ba8446776f5a32d3c1a6ae82ea28f8c9ab81026b.tar.gz symfony-security-ba8446776f5a32d3c1a6ae82ea28f8c9ab81026b.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
[Yaml] throw a ParseException on invalid data type
[TwigBridge] type-dependent path discovery
Resources as string have the same problem
Introduce failing test case when a SplFileInfo object is passed to the extract() method in the TwigExtractor.
#15331 add infos about deprecated classes to UPGRADE-3.0
[Asset] removed unused private property.
[Security] removed useless else condition in SwitchUserListener class.
[travis] Tests deps=low with PHP 5.6
[Console] Fix console output with closed stdout
| -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))) { |