mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/11852] Split filesystem and path_helper into 2 classes

Browse Source 
PHPBB3-11852
This commit is contained in:
Joas Schilling
2013-09-26 15:34:44 +02:00
parent e8303bc319
commit 7525c49d45
26 changed files with 108 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/filesystem/clean_path_test.php
View File

@@ -14,13 +14,7 @@ class phpbb_filesystem_clean_path_test extends phpbb_test_case
public function setUp()
{
parent::setUp();
$this->filesystem = new \phpbb\filesystem(
new \phpbb\symfony_request(
new phpbb_mock_request()
),
dirname(__FILE__) . './../../phpBB/',
'php'
);
$this->filesystem = new \phpbb\filesystem();
}
public function clean_path_data()

12
tests/filesystem/web_root_path_test.php
View File

@@ -18,10 +18,11 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case
$this->set_phpbb_root_path();
$this->filesystem = new \phpbb\filesystem(
$this->path_helper = new \phpbb\path_helper(
new \phpbb\symfony_request(
new phpbb_mock_request()
),
new \phpbb\filesystem(),
$this->phpbb_root_path,
'php'
);
@@ -43,7 +44,7 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case
public function test_get_web_root_path()
{
// Symfony Request = null, so always should return phpbb_root_path
$this->assertEquals($this->phpbb_root_path, $this->filesystem->get_web_root_path());
$this->assertEquals($this->phpbb_root_path, $this->path_helper->get_web_root_path());
}
public function basic_update_web_root_path_data()
@@ -71,7 +72,7 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case
*/
public function test_basic_update_web_root_path($input, $expected)
{
$this->assertEquals($expected, $this->filesystem->update_web_root_path($input, $symfony_request));
$this->assertEquals($expected, $this->path_helper->update_web_root_path($input, $symfony_request));
}
public function update_web_root_path_data()
@@ -131,12 +132,13 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case
->method('getScriptName')
->will($this->returnValue($getScriptName));
$filesystem = new \phpbb\filesystem(
$path_helper = new \phpbb\path_helper(
$symfony_request,
new \phpbb\filesystem(),
$this->phpbb_root_path,
'php'
);
$this->assertEquals($expected, $filesystem->update_web_root_path($input, $symfony_request));
$this->assertEquals($expected, $path_helper->update_web_root_path($input, $symfony_request));
}
}