diff options
| author |   Joas Schilling <nickvergessen@gmx.de> | 2014-05-08 11:03:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 23:44:07 +0200 |
| commit | b378bd7a2e4aca8c607924ca6288227451d879e5 (patch) | |
| tree | be86fb29934227a4455bbca8485c36052306d9a1 /tests/path_helper | |
| parent | Merge pull request #2511 from Marshalrusty/ticket/12611 (diff) | |
| download | phpbb-b378bd7a2e4aca8c607924ca6288227451d879e5.tar.gz phpbb-b378bd7a2e4aca8c607924ca6288227451d879e5.tar.bz2 phpbb-b378bd7a2e4aca8c607924ca6288227451d879e5.zip | |
[ticket/12099] Fix several issues in path_helper test
PHPBB3-12099
Diffstat (limited to 'tests/path_helper')
| -rw-r--r-- | tests/path_helper/path_helper_test.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php index a3ad901379..d4bcce31b2 100644 --- a/tests/path_helper/path_helper_test.php +++ b/tests/path_helper/path_helper_test.php @@ -13,6 +13,7 @@ class phpbb_path_helper_test extends phpbb_test_case { + /** @var \phpbb\path_helper */ protected $path_helper; protected $phpbb_root_path = ''; @@ -42,7 +43,7 @@ class phpbb_path_helper_test extends phpbb_test_case */ public function set_phpbb_root_path() { - $this->phpbb_root_path = dirname(__FILE__) . './../../phpBB/'; + $this->phpbb_root_path = dirname(__FILE__) . '/../../phpBB/'; } public function test_get_web_root_path() @@ -81,7 +82,7 @@ class phpbb_path_helper_test extends phpbb_test_case */ public function test_basic_update_web_root_path($input, $expected) { - $this->assertEquals($expected, $this->path_helper->update_web_root_path($input, $symfony_request)); + $this->assertEquals($expected, $this->path_helper->update_web_root_path($input)); } public function update_web_root_path_data() @@ -135,7 +136,7 @@ class phpbb_path_helper_test extends phpbb_test_case */ public function test_update_web_root_path($input, $expected, $getPathInfo, $getRequestUri = null, $getScriptName = null) { - $symfony_request = $this->getMock("\phpbb\symfony_request", array(), array( + $symfony_request = $this->getMock('\phpbb\symfony_request', array(), array( new phpbb_mock_request(), )); $symfony_request->expects($this->any()) |