Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster

5 files changed, 11 insertions, 6 deletions

diff --git a/tests/migrator/convert_timezones_test.php b/tests/migrator/convert_timezones_test.php
index f8d780da0c..4bb0aec34f 100644
--- a/tests/migrator/convert_timezones_test.php
+++ b/tests/migrator/convert_timezones_test.php
@@ -49,7 +49,7 @@ class phpbb_migrator_convert_timezones_test extends phpbb_database_test_case
 		);
 	}
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/migrator/get_callable_from_step_test.php b/tests/migrator/get_callable_from_step_test.php
index af636f5d21..b0abb6199c 100644
--- a/tests/migrator/get_callable_from_step_test.php
+++ b/tests/migrator/get_callable_from_step_test.php
@@ -13,9 +13,9 @@
 
 class get_callable_from_step_test extends phpbb_database_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
-		global $phpbb_root_path, $php_ext, $table_prefix, $phpbb_log;
+		global $phpbb_root_path, $php_ext, $table_prefix, $phpbb_log, $user;
 
 		parent::setUp();
 
@@ -24,6 +24,7 @@ class get_callable_from_step_test extends phpbb_database_test_case
 		$factory = new \phpbb\db\tools\factory();
 		$cache_service = $this->getMockBuilder('\phpbb\cache\service')->disableOriginalConstructor()->getMock();
 		$user = $this->getMockBuilder('\phpbb\user')->disableOriginalConstructor()->getMock();
+		$user->ip = '127.0.0.1';
 		$module_manager = new \phpbb\module\module_manager(
 			$this->getMockBuilder('\phpbb\cache\driver\dummy')->disableOriginalConstructor()->getMock(),
 			$db,
diff --git a/tests/migrator/get_schema_steps_test.php b/tests/migrator/get_schema_steps_test.php
index 3d15d2b200..10accb3d68 100644
--- a/tests/migrator/get_schema_steps_test.php
+++ b/tests/migrator/get_schema_steps_test.php
@@ -13,7 +13,7 @@
 
 class get_schema_steps_test extends phpbb_test_case
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/migrator/reverse_update_data_test.php b/tests/migrator/reverse_update_data_test.php
index b85e48c64c..b93680c2e2 100644
--- a/tests/migrator/reverse_update_data_test.php
+++ b/tests/migrator/reverse_update_data_test.php
@@ -16,7 +16,7 @@ class reverse_update_data_test extends phpbb_test_case
 	/** @var \phpbb\db\migration\helper */
 	protected $helper;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/migrator/schema_generator_test.php b/tests/migrator/schema_generator_test.php
index 1996d207ea..1349b98953 100644
--- a/tests/migrator/schema_generator_test.php
+++ b/tests/migrator/schema_generator_test.php
@@ -24,8 +24,10 @@ class schema_generator_test extends phpbb_test_case
 	/** @var \phpbb\db\migration\schema_generator */
 	protected $generator;
 
-	public function setUp()
+	public function setUp(): void
 	{
+		global $phpbb_root_path, $phpEx;
+
 		parent::setUp();
 
 		$this->config = new \phpbb\config\config(array());
@@ -33,6 +35,8 @@ class schema_generator_test extends phpbb_test_case
 		$factory = new \phpbb\db\tools\factory();
 		$this->db_tools = $factory->get($this->db);
 		$this->table_prefix = 'phpbb_';
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $phpEx;
 	}
 
 	protected function get_schema_generator(array $class_names)