Provide less state in getRequestFormat

dawehner · nicolas-grekas · commit 1d43007f3c92 · 2017-03-04T11:53:31.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1382,10 +1382,10 @@ public function setFormat($format, $mimeTypes)
     public function getRequestFormat($default = 'html')
     {
         if (null === $this->format) {
-            $this->format = $this->get('_format', $default);
+            $this->format = $this->get('_format');
         }
 
-        return $this->format;
+        return null === $this->format ? $default : $this->format;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1401,6 +1401,11 @@ public function testGetRequestFormat()
         $request = new Request();
         $this->assertEquals('html', $request->getRequestFormat());
 
+        // Ensure that setting different default values over time is possible,
+        // aka. setRequestFormat determines the state.
+        $this->assertEquals('json', $request->getRequestFormat('json'));
+        $this->assertEquals('html', $request->getRequestFormat('html'));
+
         $request = new Request();
         $this->assertNull($request->getRequestFormat(null));
 

Original file line number	Diff line number	Diff line change
`@@ -1382,10 +1382,10 @@ public function setFormat($format, $mimeTypes)`
`1382`	`1382`	`public function getRequestFormat($default = 'html')`
`1383`	`1383`	`{`
`1384`	`1384`	`if (null === $this->format) {`
`1385`		`- $this->format = $this->get('_format', $default);`
	`1385`	`+ $this->format = $this->get('_format');`
`1386`	`1386`	`}`
`1387`	`1387`
`1388`		`- return $this->format;`
	`1388`	`+ return null === $this->format ? $default : $this->format;`
`1389`	`1389`	`}`
`1390`	`1390`
`1391`	`1391`	`/**`