diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-04 15:22:29 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-04 15:22:29 -0500 |
| commit | 1148f3fca51efb60e536f2fe0d51880610f0812b (patch) | |
| tree | 1645796b4357b5a96c37654eb38d8562c664b67d /tests/test_framework/phpbb_functional_test_case.php | |
| parent | 1a8f72fd659b6c3cc3fd1c59446cd1663a89b110 (diff) | |
| parent | c1840c78c5ea2967dfc1912665ec19ebc25c22c6 (diff) | |
| download | forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.gz forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.bz2 forums-1148f3fca51efb60e536f2fe0d51880610f0812b.tar.xz forums-1148f3fca51efb60e536f2fe0d51880610f0812b.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11386-3' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386-3:
[ticket/11386] Fix missing ;
[ticket/11386] Send list of migrations instead of using load_migrations
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 21 |
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; } |