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

[ticket/13904] Remove phpbb_root_path global from filespec class

Browse Source 
PHPBB3-13904
This commit is contained in:
Marc Alexander
2015-06-02 15:46:41 +02:00
parent 52652ca182
commit b871dbcf1f
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/upload/filespec_test.php
View File

@@ -28,6 +28,9 @@ class phpbb_filespec_test extends phpbb_test_case
/** @var \phpbb\language\language */
protected $language;
/** @var string phpBB root path */
protected $phpbb_root_path;
protected function setUp()
{
// Global $config required by unique_id
@@ -76,6 +79,7 @@ class phpbb_filespec_test extends phpbb_test_case
$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
$this->filesystem = new \phpbb\filesystem\filesystem();
$this->phpbb_root_path = $phpbb_root_path;
}
private function get_filespec($override = array())
@@ -89,7 +93,7 @@ class phpbb_filespec_test extends phpbb_test_case
'error' => '',
);
$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->mimetype_guesser);
$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
return $filespec->set_upload_ary(array_merge($upload_ary, $override));
}
@@ -297,8 +301,7 @@ class phpbb_filespec_test extends phpbb_test_case
{
// Global $phpbb_root_path and $phpEx are required by phpbb_chmod
global $phpbb_root_path, $phpEx;
$phpbb_root_path = '';
$phpEx = 'php';
$this->phpbb_root_path = '';
$upload = new phpbb_mock_fileupload();
$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
@@ -319,7 +322,7 @@ class phpbb_filespec_test extends phpbb_test_case
$this->assertEquals($error, $filespec->error[0]);
}
$phpEx = '';
$this->phpbb_root_path = $phpbb_root_path;
}
/**

1
tests/upload/fileupload_test.php
View File

@@ -58,6 +58,7 @@ class phpbb_fileupload_test extends phpbb_test_case
$this->container->set('files.filespec', new \phpbb\files\filespec(
$this->filesystem,
$this->language,
$phpbb_root_path,
new \phpbb\mimetype\guesser(array(
'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
))));