aboutsummaryrefslogtreecommitdiffstats
path: root/tests/files
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-08-26 16:18:10 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-09-09 08:28:11 +0200
commit36545d5cbe7188efbedf2e1f44b1a7b9617b50c1 (patch)
tree60d7452d7cf146c9f3af3fbfa7d1d07f15778571 /tests/files
parentcdde86ce7e0c594fad5992789b3fae466bd526cc (diff)
downloadforums-36545d5cbe7188efbedf2e1f44b1a7b9617b50c1.tar
forums-36545d5cbe7188efbedf2e1f44b1a7b9617b50c1.tar.gz
forums-36545d5cbe7188efbedf2e1f44b1a7b9617b50c1.tar.bz2
forums-36545d5cbe7188efbedf2e1f44b1a7b9617b50c1.tar.xz
forums-36545d5cbe7188efbedf2e1f44b1a7b9617b50c1.zip
[ticket/13904] Switch around constructor arguments
PHPBB3-13904
Diffstat (limited to 'tests/files')
-rw-r--r--tests/files/upload_test.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/files/upload_test.php b/tests/files/upload_test.php
index d11ebc742b..6f4a10e6aa 100644
--- a/tests/files/upload_test.php
+++ b/tests/files/upload_test.php
@@ -57,8 +57,8 @@ class phpbb_files_upload_test extends phpbb_test_case
$this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx);
$this->container->set('files.filespec', new \phpbb\files\filespec(
$this->filesystem,
- $this->php_ini,
$this->language,
+ $this->php_ini,
$phpbb_root_path,
new \phpbb\mimetype\guesser(array(
'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
@@ -71,7 +71,7 @@ class phpbb_files_upload_test extends phpbb_test_case
public function test_reset_vars()
{
- $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+ $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$upload->set_max_filesize(500);
$this->assertEquals(500, $upload->max_filesize);
$upload->reset_vars();
@@ -80,7 +80,7 @@ class phpbb_files_upload_test extends phpbb_test_case
public function test_set_disallowed_content()
{
- $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+ $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$disallowed_content = new ReflectionProperty($upload, 'disallowed_content');
$disallowed_content->setAccessible(true);
@@ -98,7 +98,7 @@ class phpbb_files_upload_test extends phpbb_test_case
public function test_is_valid()
{
- $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+ $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$this->assertFalse($upload->is_valid('foobar'));
}
@@ -121,7 +121,7 @@ class phpbb_files_upload_test extends phpbb_test_case
*/
public function test_assign_internal_error($error_code, $expected)
{
- $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+ $upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
$this->assertSame($expected, $upload->assign_internal_error($error_code));
}
}