From 42b7782927713c2ca2fb704db6217016347b586e Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 19 Mar 2017 21:46:20 +0700
Subject: [ticket/14972] Migrate from deprecated getMock() method to
 createMock()

PHPBB3-14972
---
 tests/installer/installer_config_test.php | 3 ++-
 tests/installer/module_base_test.php      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests/installer')

diff --git a/tests/installer/installer_config_test.php b/tests/installer/installer_config_test.php
index 13ac325a79..1193d7aee4 100644
--- a/tests/installer/installer_config_test.php
+++ b/tests/installer/installer_config_test.php
@@ -23,8 +23,9 @@ class phpbb_installer_config_test extends phpbb_test_case
 	public function setUp()
 	{
 		$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..71ec2b8db2 100644
--- a/tests/installer/module_base_test.php
+++ b/tests/installer/module_base_test.php
@@ -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);
 	}
-- 
cgit v1.2.1


From ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 30 Dec 2018 11:36:08 +0100
Subject: [ticket/14948] Adjust calls for twig and phpunit updates

PHPBB3-14948
---
 tests/installer/database_helper_test.php  | 2 +-
 tests/installer/installer_config_test.php | 2 +-
 tests/installer/module_base_test.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/installer')

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 1193d7aee4..6fa8248b68 100644
--- a/tests/installer/installer_config_test.php
+++ b/tests/installer/installer_config_test.php
@@ -20,7 +20,7 @@ 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->createMock('\phpbb\filesystem\filesystem');
diff --git a/tests/installer/module_base_test.php b/tests/installer/module_base_test.php
index 71ec2b8db2..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();
-- 
cgit v1.2.1