Merge remote-tracking branch 'nickvergessen/ticket/11443' into develop

* nickvergessen/ticket/11443:
  [ticket/11443] Fix Migrator Modules Tool by creating a phpbb_log object
  [ticket/11443] Add _test suffix to migration test filenames

2 files changed, 6 insertions, 1 deletions

diff --git a/tests/dbal/migrator_tool_module.php b/tests/dbal/migrator_tool_module_test.php
index 6937b6f8c5..3303086b26 100644
--- a/tests/dbal/migrator_tool_module.php
+++ b/tests/dbal/migrator_tool_module_test.php
@@ -21,7 +21,7 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 	public function setup()
 	{
 		// Need global $db, $user for delete_module function in acp_modules
-		global $phpbb_root_path, $phpEx, $skip_add_log, $db, $user;
+		global $phpbb_root_path, $phpEx, $skip_add_log, $db, $user, $phpbb_log;
 
 		parent::setup();
 
@@ -32,6 +32,11 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 		$this->cache = new phpbb_cache_service(new phpbb_cache_driver_null(), new phpbb_config(array()), $this->db, $phpbb_root_path, $phpEx);
 		$user = $this->user = new phpbb_user();
 
+		$cache = new phpbb_mock_cache;
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$auth = $this->getMock('phpbb_auth');
+		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
+
 		$this->tool = new phpbb_db_migration_tool_module($this->db, $this->cache, $this->user, $phpbb_root_path, $phpEx, 'phpbb_modules');
 	}
 
diff --git a/tests/dbal/migrator_tool_permission.php b/tests/dbal/migrator_tool_permission_test.php
index 438ab2b28e..438ab2b28e 100644
--- a/tests/dbal/migrator_tool_permission.php
+++ b/tests/dbal/migrator_tool_permission_test.php