diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-23 15:05:47 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-23 15:05:47 -0600 |
| commit | 213bc09743a0d326e2379f3f12bfd549499031b4 (patch) | |
| tree | 73458c54dd199e1f70631d21c5bfa866a900d5ca /tests/test_framework/phpbb_functional_test_case.php | |
| parent | a665ad5c2e44922fbd9790597913091c68311533 (diff) | |
| parent | 6e1e62a77daf77ec3dd4fc131ffbb1a099936ef4 (diff) | |
| download | forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar.gz forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar.bz2 forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar.xz forums-213bc09743a0d326e2379f3f12bfd549499031b4.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migrations-data
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index e346223a4b..b570b464e6 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -134,19 +134,20 @@ class phpbb_functional_test_case extends phpbb_test_case { global $phpbb_root_path, $phpEx; - if (!$this->extension_manager) - { - $this->extension_manager = new phpbb_extension_manager( - $this->get_db(), - new phpbb_config(array()), - self::$config['table_prefix'] . 'ext', - $phpbb_root_path, - ".$phpEx", - $this->get_cache_driver() - ); - } - - return $this->extension_manager; + $config = new phpbb_config(array()); + $db = $this->get_db(); + $db_tools = new phpbb_db_tools($db); + + return 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() + ); } static protected function install_board() |