minor symfony#15333 [Security] removed useless else condition in SwitchUserListener class. (hhamon)

fabpot · fabpot · commit fa1ab249bc29 · 2015-07-23T04:13:32.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [Security] removed useless else condition in SwitchUserListener class. | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ Commits ------- 1fc0315 [Security] removed useless else condition in SwitchUserListener class.
diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
@@ -116,9 +116,9 @@ private function attemptSwitchUser(Request $request)
         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))) {

Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,9 @@ private function attemptSwitchUser(Request $request)`
`116`	`116`	`if (false !== $originalToken) {`
`117`	`117`	`if ($token->getUsername() === $request->get($this->usernameParameter)) {`
`118`	`118`	`return $token;`
`119`		`- } else {`
`120`		`- throw new \LogicException(sprintf('You are already switched to "%s" user.', $token->getUsername()));`
`121`	`119`	`}`
	`120`	`+`
	`121`	`+ throw new \LogicException(sprintf('You are already switched to "%s" user.', $token->getUsername()));`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`if (false === $this->accessDecisionManager->decide($token, array($this->role))) {`