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

[HttpFoundation] fixed ApacheRequest

Browse Source 
Pathinfo was incorrect when using mod_rewrite.
Added better test coverage.
This commit is contained in:
Kris Wallsmith 2011-12-21 13:19:52 -08:00
parent 2af5cb5602
commit 1b4aaa2c8e
2 changed files with 68 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/HttpFoundation/ApacheRequest.php
View File

@ -46,6 +46,6 @@ class ApacheRequest extends Request
*/
protected function preparePathInfo()
{
return $this->server->get('PATH_INFO');
return $this->server->get('PATH_INFO') ?: substr($this->prepareRequestUri(), strlen($this->prepareBaseUrl())) ?: '/';
}
}

81
tests/Symfony/Tests/Component/HttpFoundation/ApacheRequestTest.php
View File

@ -15,25 +15,78 @@ use Symfony\Component\HttpFoundation\ApacheRequest;
class ApacheRequestTest extends \PHPUnit_Framework_TestCase
{
public function testGetBaseUrlDoesNotForceScriptName()
/**
* @dataProvider provideServerVars
*/
public function testUriMethods($server, $expectedRequestUri, $expectedBaseUrl, $expectedPathInfo)
{
$request = new ApacheRequest();
$request->server->replace(array(
'REQUEST_URI' => '/foo/bar',
'SCRIPT_NAME' => '/index.php',
));
$request->server->replace($server);
$this->assertEquals('', $request->getBaseUrl(), '->getBaseUrl() does not add the script name');
$this->assertEquals($expectedRequestUri, $request->getRequestUri(), '->getRequestUri() is correct');
$this->assertEquals($expectedBaseUrl, $request->getBaseUrl(), '->getBaseUrl() is correct');
$this->assertEquals($expectedPathInfo, $request->getPathInfo(), '->getPathInfo() is correct');
}
public function testGetBaseUrlIncludesScriptName()
public function provideServerVars()
{
$request = new ApacheRequest();
$request->server->replace(array(
'REQUEST_URI' => '/index.php/foo/bar',
'SCRIPT_NAME' => '/index.php',
));
$this->assertEquals('/index.php', $request->getBaseUrl(), '->getBaseUrl() includes the script name');
return array(
array(
array(
'REQUEST_URI' => '/foo/app_dev.php/bar',
'SCRIPT_NAME' => '/foo/app_dev.php',
'PATH_INFO' => '/bar',
),
'/foo/app_dev.php/bar',
'/foo/app_dev.php',
'/bar'
),
array(
array(
'REQUEST_URI' => '/foo/bar',
'SCRIPT_NAME' => '/foo/app_dev.php',
),
'/foo/bar',
'/foo',
'/bar',
),
array(
array(
'REQUEST_URI' => '/app_dev.php/foo/bar',
'SCRIPT_NAME' => '/app_dev.php',
'PATH_INFO' => '/foo/bar',
),
'/app_dev.php/foo/bar',
'/app_dev.php',
'/foo/bar',
),
array(
array(
'REQUEST_URI' => '/foo/bar',
'SCRIPT_NAME' => '/app_dev.php',
),
'/foo/bar',
'',
'/foo/bar',
),
array(
array(
'REQUEST_URI' => '/app_dev.php',
'SCRIPT_NAME' => '/app_dev.php',
),
'/app_dev.php',
'/app_dev.php',
'/',
),
array(
array(
'REQUEST_URI' => '/',
'SCRIPT_NAME' => '/app_dev.php',
),
'/',
'',
'/',
),
);
}
}