diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-02-27 21:40:02 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-02-27 21:40:02 +0100 |
| commit | 96b1cabcf2fbc4955bab65a4931f1815548d4df4 (patch) | |
| tree | 16e869447ba1560109604402449c57052ea33d06 /tests/test_framework/phpbb_functional_test_case.php | |
| parent | 2f6b072bb13ce9d7c7784136bedec651b73ae11b (diff) | |
| parent | 80bd78a5e5e1069773c05073cd47662a311bda79 (diff) | |
| download | forums-96b1cabcf2fbc4955bab65a4931f1815548d4df4.tar forums-96b1cabcf2fbc4955bab65a4931f1815548d4df4.tar.gz forums-96b1cabcf2fbc4955bab65a4931f1815548d4df4.tar.bz2 forums-96b1cabcf2fbc4955bab65a4931f1815548d4df4.tar.xz forums-96b1cabcf2fbc4955bab65a4931f1815548d4df4.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314
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() |