diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-02 15:46:41 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-09 08:27:54 +0200 |
| commit | b871dbcf1f2d0483cbe19cddf94a5bdc9659ab00 (patch) | |
| tree | 67f2e480c3540db9d3c6b3d48d2db3872a6f6408 /tests/upload | |
| parent | 52652ca1824e91ecfe7549167aebd92c314af678 (diff) | |
| download | forums-b871dbcf1f2d0483cbe19cddf94a5bdc9659ab00.tar forums-b871dbcf1f2d0483cbe19cddf94a5bdc9659ab00.tar.gz forums-b871dbcf1f2d0483cbe19cddf94a5bdc9659ab00.tar.bz2 forums-b871dbcf1f2d0483cbe19cddf94a5bdc9659ab00.tar.xz forums-b871dbcf1f2d0483cbe19cddf94a5bdc9659ab00.zip | |
[ticket/13904] Remove phpbb_root_path global from filespec class
PHPBB3-13904
Diffstat (limited to 'tests/upload')
| -rw-r--r-- | tests/upload/filespec_test.php | 11 | ||||
| -rw-r--r-- | tests/upload/fileupload_test.php | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php index b28adc3f28..b0df72a6ff 100644 --- a/tests/upload/filespec_test.php +++ b/tests/upload/filespec_test.php @@ -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; } /** diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php index 0832f269cb..c62e9a1947 100644 --- a/tests/upload/fileupload_test.php +++ b/tests/upload/fileupload_test.php @@ -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(), )))); |