diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-03-04 05:11:32 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-03-04 05:11:32 +0100 |
| commit | e512ad67266e2fd4b427596d8a922bdc29aca617 (patch) | |
| tree | fb4e546c140e24cae732d5755fa296b3b0377060 /tests/test_framework/phpbb_functional_test_case.php | |
| parent | e0328814f30d51bfac45e9c66d17b29478addd79 (diff) | |
| parent | bee4f8d8185d4ff5278be758db4ea4a814f09b4f (diff) | |
| download | forums-e512ad67266e2fd4b427596d8a922bdc29aca617.tar forums-e512ad67266e2fd4b427596d8a922bdc29aca617.tar.gz forums-e512ad67266e2fd4b427596d8a922bdc29aca617.tar.bz2 forums-e512ad67266e2fd4b427596d8a922bdc29aca617.tar.xz forums-e512ad67266e2fd4b427596d8a922bdc29aca617.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (255 commits)
[ticket/6723] Show info that message has been deleted before delivery
[ticket/11385] Fix issue with migration module tool not getting extension module info
[ticket/11386] Fix failing tests from constructor changes
[ticket/11386] Fix circular reference error & serialize error
[ticket/11386] Remove tests that check if finder cache is working
[ticket/11386] Forgot to get the migration classes
[ticket/11386] Update tests with new constructors for ext.manager/migrator
[ticket/11386] Use finder to find migration files
[ticket/11363] Fix to make get_module_infos get from all extensions
[ticket/11381] Make finder able to search in all available extensions
[ticket/11103] Revert whitespace changes
[ticket/11103] Few more minor language things
[ticket/11103] Don't call generate_board_url many times
[ticket/11103] Case time in queries as an int
[ticket/11103] Fix effectively installed check
[ticket/11103] Remove padding from notifications for now.
[ticket/11363] Fix a couple bugs and throw errors if the file not found
[ticket/11372] Migrator should only check if effectively installed if not
[ticket/11363] Load module info files for extensions too
[ticket/11103] Notifications Migration file
...
Conflicts:
phpBB/config/services.yml
phpBB/config/tables.yml
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index b570b464e6..3b9629b9f8 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -138,16 +138,29 @@ class phpbb_functional_test_case extends phpbb_test_case $db = $this->get_db(); $db_tools = new phpbb_db_tools($db); - return new phpbb_extension_manager( + $extension_manager = new phpbb_extension_manager( new phpbb_mock_container_builder(), $db, $config, - new phpbb_db_migrator($config, $db, $db_tools, self::$config['table_prefix'] . 'migrations', $phpbb_root_path, $php_ext, self::$config['table_prefix'], array()), self::$config['table_prefix'] . 'ext', dirname(__FILE__) . '/', '.' . $php_ext, $this->get_cache_driver() ); + $migrator = new phpbb_db_migrator( + $config, + $db, + $db_tools, + self::$config['table_prefix'] . 'migrations', + $phpbb_root_path, + $php_ext, + self::$config['table_prefix'], + array() + ); + $extension_manager->set_migrator($migrator); + $migrator->set_extension_manager($extension_manager); + + return $extension_manager; } static protected function install_board() |