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

added support for setting a custom default format in Request::getRequestFormat()

Browse Source
This commit is contained in:
Lukas Kahwe Smith 2011-04-17 14:37:35 +02:00
parent c6818d8bf7
commit 53c7bcf3aa
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -630,14 +630,16 @@ class Request
*
* * format defined by the user (with setRequestFormat())
* * _format request parameter
* * null
* * $default
*
* @param string $default The default format
*
* @return string The request format
*/
public function getRequestFormat()
public function getRequestFormat($default = 'html')
{
if (null === $this->format) {
$this->format = $this->get('_format', 'html');
$this->format = $this->get('_format', $default);
}
return $this->format;

13
tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php
View File

@ -666,4 +666,17 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$request->headers->set('Accept-language', 'zh, i-cherokee; q=0.6');
$this->assertEquals(array('zh', 'cherokee'), $request->getLanguages());
}
public function testGetRequestFormat()
{
$request = new Request();
$this->assertEquals('html', $request->getRequestFormat());
$request = new Request();
$this->assertEquals(null, $request->getRequestFormat(null));
$request = new Request();
$this->assertEquals(null, $request->setRequestFormat('foo'));
$this->assertEquals('foo', $request->getRequestFormat(null));
}
}