reformat code as suggested by @fabpot

xabbuh · fabpot · commit 3039935997fd · 2014-11-21T17:05:54.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -692,17 +692,19 @@ public static function getHttpMethodParameterOverride()
      */
     public function get($key, $default = null, $deep = false)
     {
-        $result = $this->query->get($key, $this, $deep);
-        if ($result === $this) {
-            $result = $this->attributes->get($key, $this, $deep);
+        if ($this !== $result = $this->query->get($key, $this, $deep)) {
+            return $result;
         }
-        if ($result === $this) {
-            $result = $this->request->get($key, $this, $deep);
+
+        if ($this !== $result = $this->attributes->get($key, $this, $deep)) {
+            return $result;
         }
-        if ($result === $this) {
-            return $default;
+
+        if ($this !== $result = $this->request->get($key, $this, $deep)) {
+            return $result;
         }
-        return $result;
+
+        return $default;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -692,17 +692,19 @@ public static function getHttpMethodParameterOverride()`
`692`	`692`	`*/`
`693`	`693`	`public function get($key, $default = null, $deep = false)`
`694`	`694`	`{`
`695`		`- $result = $this->query->get($key, $this, $deep);`
`696`		`- if ($result === $this) {`
`697`		`- $result = $this->attributes->get($key, $this, $deep);`
	`695`	`+ if ($this !== $result = $this->query->get($key, $this, $deep)) {`
	`696`	`+ return $result;`
`698`	`697`	`}`
`699`		`- if ($result === $this) {`
`700`		`- $result = $this->request->get($key, $this, $deep);`
	`698`	`+`
	`699`	`+ if ($this !== $result = $this->attributes->get($key, $this, $deep)) {`
	`700`	`+ return $result;`
`701`	`701`	`}`
`702`		`- if ($result === $this) {`
`703`		`- return $default;`
	`702`	`+`
	`703`	`+ if ($this !== $result = $this->request->get($key, $this, $deep)) {`
	`704`	`+ return $result;`
`704`	`705`	`}`
`705`		`- return $result;`
	`706`	`+`
	`707`	`+ return $default;`
`706`	`708`	`}`
`707`	`709`
`708`	`710`	`/**`