aboutsummaryrefslogtreecommitdiffstats
path: root/tests/installer
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/installer
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/installer')
-rw-r--r--tests/installer/database_helper_test.php2
-rw-r--r--tests/installer/installer_config_test.php5
-rw-r--r--tests/installer/module_base_test.php4
3 files changed, 6 insertions, 5 deletions
diff --git a/tests/installer/database_helper_test.php b/tests/installer/database_helper_test.php
index ed355884f6..9ffdad3e03 100644
--- a/tests/installer/database_helper_test.php
+++ b/tests/installer/database_helper_test.php
@@ -18,7 +18,7 @@ class phpbb_installer_database_helper_test extends phpbb_test_case
*/
private $database_helper;
- public function setUp()
+ public function setUp(): void
{
$filesystem = new \phpbb\filesystem\filesystem();
$phpbb_root_path = '';
diff --git a/tests/installer/installer_config_test.php b/tests/installer/installer_config_test.php
index 13ac325a79..6fa8248b68 100644
--- a/tests/installer/installer_config_test.php
+++ b/tests/installer/installer_config_test.php
@@ -20,11 +20,12 @@ class phpbb_installer_config_test extends phpbb_test_case
*/
private $config;
- public function setUp()
+ public function setUp(): void
{
$phpbb_root_path = __DIR__ . './../../phpBB/';
- $filesystem = $this->getMock('\phpbb\filesystem\filesystem');
+ $filesystem = $this->createMock('\phpbb\filesystem\filesystem');
$php_ini = $this->getMockBuilder('\bantu\IniGetWrapper\IniGetWrapper')
+ ->setMethods(array('getInt', 'getBytes'))
->getMock();
$php_ini->method('getInt')
->willReturn(-1);
diff --git a/tests/installer/module_base_test.php b/tests/installer/module_base_test.php
index 9578010047..887d29f4c6 100644
--- a/tests/installer/module_base_test.php
+++ b/tests/installer/module_base_test.php
@@ -26,7 +26,7 @@ class module_base_test extends phpbb_test_case
*/
protected $container;
- public function setUp()
+ public function setUp(): void
{
// DI container mock
$this->container = new phpbb_mock_container_builder();
@@ -42,7 +42,7 @@ class module_base_test extends phpbb_test_case
$this->module = new test_installer_module($module_collection, true, false);
- $iohandler = $this->getMock('\phpbb\install\helper\iohandler\iohandler_interface');
+ $iohandler = $this->createMock('\phpbb\install\helper\iohandler\iohandler_interface');
$config = new \phpbb\install\helper\config(new \phpbb\filesystem\filesystem(), new \bantu\IniGetWrapper\IniGetWrapper(), '', 'php');
$this->module->setup($config, $iohandler);
}