Merge branch '2.6' into 2.7

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