diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide less state in getRequestFormat

Browse Source
This commit is contained in:
Daniel Wehner 2017-02-28 18:22:29 +00:00 committed by Nicolas Grekas
parent 5898ec2c5e
commit 1d43007f3c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -1382,10 +1382,10 @@ class Request
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;
}
/**

5
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View File

@ -1401,6 +1401,11 @@ class RequestTest extends TestCase
$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));