feature #8967 [HttpFoundation] Request->getRequestFormat should only rely on the request attributes (pvandommelen)

fabpot · fabpot · commit 8fdb41249d61 · 2015-10-02T14:34:37.000+02:00
This PR was squashed before being merged into the 3.0-dev branch (closes #8967). Discussion ---------- [HttpFoundation] Request->getRequestFormat should only rely on the request attributes | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | possibly | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8966 | License | MIT | Doc PR | Added test case and fix for #8966. Is this functionality relied on somewhere? Commits ------- 7115c1e [HttpFoundation] Request->getRequestFormat should only rely on the request attributes
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1371,7 +1371,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
@@ -1363,6 +1363,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
`@@ -1371,7 +1371,7 @@ public function setFormat($format, $mimeTypes)`
`1371`	`1371`	`public function getRequestFormat($default = 'html')`
`1372`	`1372`	`{`
`1373`	`1373`	`if (null === $this->format) {`
`1374`		`- $this->format = $this->get('_format', $default);`
	`1374`	`+ $this->format = $this->attributes->get('_format', $default);`
`1375`	`1375`	`}`
`1376`	`1376`
`1377`	`1377`	`return $this->format;`
Original file line number	Diff line number	Diff line change
`@@ -1363,6 +1363,9 @@ public function testGetRequestFormat()`
`1363`	`1363`	`$request = new Request();`
`1364`	`1364`	`$this->assertNull($request->setRequestFormat('foo'));`
`1365`	`1365`	`$this->assertEquals('foo', $request->getRequestFormat(null));`
	`1366`	`+`
	`1367`	`+ $request = new Request(array('_format' => 'foo'));`
	`1368`	`+ $this->assertEquals('html', $request->getRequestFormat());`
`1366`	`1369`	`}`
`1367`	`1370`
`1368`	`1371`	`public function testHasSession()`