Merge branch '2.3' into 2.6

fabpot · fabpot · commit cdad268d48b2 · 2015-07-26T11:08:40.000+02:00
* 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
diff --git a/Http/Firewall/SwitchUserListener.php b/Http/Firewall/SwitchUserListener.php
@@ -118,9 +118,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
`@@ -118,9 +118,9 @@ private function attemptSwitchUser(Request $request)`
`118`	`118`	`if (false !== $originalToken) {`
`119`	`119`	`if ($token->getUsername() === $request->get($this->usernameParameter)) {`
`120`	`120`	`return $token;`
`121`		`- } else {`
`122`		`- throw new \LogicException(sprintf('You are already switched to "%s" user.', $token->getUsername()));`
`123`	`121`	`}`
	`122`	`+`
	`123`	`+ throw new \LogicException(sprintf('You are already switched to "%s" user.', $token->getUsername()));`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if (false === $this->accessDecisionManager->decide($token, array($this->role))) {`