makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12099] Fix correction in path_helper test

Browse source 
PHPBB3-12099
This commit is contained in:
Joas Schilling 2014-06-10 21:06:36 +02:00
parent 1a6d8dd94d
commit e71f65c2bb
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/path_helper/path_helper_test.php
View file

@ -94,41 +94,45 @@ class phpbb_path_helper_test extends phpbb_test_case
return array( return array(
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
'',
'/', '/',
null,
null,
'',
), ),
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
'../',
'//', '//',
null,
null,
'./../',
), ),
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
'../',
'//', '//',
'foo/bar.php', 'foo/bar.php',
'bar.php', 'bar.php',
'./../',
), ),
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
'../../',
'/foo/template', '/foo/template',
'/phpbb3-fork/phpBB/app.php/foo/template', '/phpbb3-fork/phpBB/app.php/foo/template',
'/phpbb3-fork/phpBB/app.php', '/phpbb3-fork/phpBB/app.php',
'./../../',
), ),
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
'../',
'/foo/template', '/foo/template',
'/phpbb3-fork/phpBB/foo/template', '/phpbb3-fork/phpBB/foo/template',
'/phpbb3-fork/phpBB/app.php', '/phpbb3-fork/phpBB/app.php',
'./../',
), ),
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
'../',
'/', '/',
'/phpbb3-fork/phpBB/app.php/', '/phpbb3-fork/phpBB/app.php/',
'/phpbb3-fork/phpBB/app.php', '/phpbb3-fork/phpBB/app.php',
'./../',
), ),
); );
} }
@ -136,7 +140,7 @@ class phpbb_path_helper_test extends phpbb_test_case
/** /**
* @dataProvider update_web_root_path_data * @dataProvider update_web_root_path_data
*/ */
public function test_update_web_root_path($input, $correction, $getPathInfo, $getRequestUri = null, $getScriptName = null) public function test_update_web_root_path($input, $getPathInfo, $getRequestUri, $getScriptName, $correction)
{ {
$symfony_request = $this->getMock('\phpbb\symfony_request', array(), array( $symfony_request = $this->getMock('\phpbb\symfony_request', array(), array(
new phpbb_mock_request(), new phpbb_mock_request(),