[ticket/11386] Send list of migrations instead of using load_migrations

Remove dependency of extension manager for migrator.

Keeping load_migrations function for others to use if they desire
but requiring the finder be sent to it in order to use it.

PHPBB3-11386

1 files changed, 10 insertions, 11 deletions

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 3b9629b9f8..887dfea3b5 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -138,15 +138,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$db = $this->get_db();
 		$db_tools = new phpbb_db_tools($db);
 
-		$extension_manager = new phpbb_extension_manager(
-			new phpbb_mock_container_builder(),
-			$db,
-			$config,
-			self::$config['table_prefix'] . 'ext',
-			dirname(__FILE__) . '/',
-			'.' . $php_ext,
-			$this->get_cache_driver()
-		);
 		$migrator = new phpbb_db_migrator(
 			$config,
 			$db,
@@ -157,8 +148,16 @@ class phpbb_functional_test_case extends phpbb_test_case
 			self::$config['table_prefix'],
 			array()
 		);
-		$extension_manager->set_migrator($migrator);
-		$migrator->set_extension_manager($extension_manager);
+		$extension_manager = new phpbb_extension_manager(
+			new phpbb_mock_container_builder(),
+			$db,
+			$config,
+			$migrator,
+			self::$config['table_prefix'] . 'ext',
+			dirname(__FILE__) . '/',
+			'.' . $php_ext,
+			$this->get_cache_driver()
+		);
 
 		return $extension_manager;
 	}