aboutsummaryrefslogtreecommitdiffstats
path: root/tests/upload/fileupload_test.php
diff options
context:
space:
mode:
authorMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
committerMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
commit6985226b17e8a0ef0a720bf1d12fe0c216e13dab (patch)
tree116d2565ac02c40abe0548863c6badf8ec3e1d1e /tests/upload/fileupload_test.php
parent8ea437e30605e0f66b5220bf904a61d7c1d11ddd (diff)
parent8d00784dfe2c8bcb10843ff70b4cfa998d703285 (diff)
downloadforums-master.tar
forums-master.tar.gz
forums-master.tar.bz2
forums-master.tar.xz
forums-master.zip
Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster
Diffstat (limited to 'tests/upload/fileupload_test.php')
-rw-r--r--tests/upload/fileupload_test.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 5b3357237d..ca9259d357 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -37,7 +37,7 @@ class phpbb_fileupload_test extends phpbb_test_case
/** @var string phpBB root path */
protected $phpbb_root_path;
- protected function setUp()
+ protected function setUp(): void
{
// Global $config required by unique_id
global $config, $phpbb_root_path, $phpEx;
@@ -50,7 +50,7 @@ class phpbb_fileupload_test extends phpbb_test_case
$config['rand_seed'] = '';
$config['rand_seed_last_update'] = time() + 600;
- $this->request = $this->getMock('\phpbb\request\request');
+ $this->request = $this->createMock('\phpbb\request\request');
$this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper;
$this->filesystem = new \phpbb\filesystem\filesystem();
@@ -83,13 +83,13 @@ class phpbb_fileupload_test extends phpbb_test_case
$this->php_ini,
$plupload,
$this->request
- ), phpbb_mock_container_builder::SCOPE_PROTOTYPE);
+ ));
$this->container->set('files.types.local', new \phpbb\files\types\local(
$this->factory,
$this->language,
$this->php_ini,
$this->request
- ), phpbb_mock_container_builder::SCOPE_PROTOTYPE);
+ ));
$this->path = __DIR__ . '/fixture/';
$this->phpbb_root_path = $phpbb_root_path;
@@ -107,7 +107,7 @@ class phpbb_fileupload_test extends phpbb_test_case
return $filespec;
}
- protected function tearDown()
+ protected function tearDown(): void
{
// Clear globals
global $config, $user;