[HttpFoundation] Request->getRequestFormat should only rely on the request attributes

pvandommelen · fabpot · commit 7115c1e1d913 · 2015-10-02T14:34:33.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1218,7 +1218,7 @@ public function setFormat($format, $mimeTypes)
     public function getRequestFormat($default = 'html')
     {
         if (null === $this->format) {
-            $this->format = $this->get('_format', $default);
+            $this->format = $this->attributes->get('_format', $default);
         }
 
         return $this->format;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1188,6 +1188,9 @@ public function testGetRequestFormat()
         $request = new Request();
         $this->assertNull($request->setRequestFormat('foo'));
         $this->assertEquals('foo', $request->getRequestFormat(null));
+
+	    $request = new Request(array('_format' => 'foo'));
+	    $this->assertEquals('html', $request->getRequestFormat());
     }
 
     public function testHasSession()

Original file line number	Diff line number	Diff line change
`@@ -1218,7 +1218,7 @@ public function setFormat($format, $mimeTypes)`
`1218`	`1218`	`public function getRequestFormat($default = 'html')`
`1219`	`1219`	`{`
`1220`	`1220`	`if (null === $this->format) {`
`1221`		`- $this->format = $this->get('_format', $default);`
	`1221`	`+ $this->format = $this->attributes->get('_format', $default);`
`1222`	`1222`	`}`
`1223`	`1223`
`1224`	`1224`	`return $this->format;`
Original file line number	Diff line number	Diff line change
`@@ -1188,6 +1188,9 @@ public function testGetRequestFormat()`
`1188`	`1188`	`$request = new Request();`
`1189`	`1189`	`$this->assertNull($request->setRequestFormat('foo'));`
`1190`	`1190`	`$this->assertEquals('foo', $request->getRequestFormat(null));`
	`1191`	`+`
	`1192`	`+ $request = new Request(array('_format' => 'foo'));`
	`1193`	`+ $this->assertEquals('html', $request->getRequestFormat());`
`1191`	`1194`	`}`
`1192`	`1195`
`1193`	`1196`	`public function testHasSession()`