diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 |
| commit | 663b4b2eb74e8edb076c962662ff5124e94353ea (patch) | |
| tree | 0ff449c776397b2b66fc7d567f93bbb7d62ea2e3 /phpBB/includes/functions_container.php | |
| parent | 01512104b5823d15eed64d362b41b9594f870f0c (diff) | |
| parent | 8db820be634cfce0fdb079fdbaee2c49661a7870 (diff) | |
| download | forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.gz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.bz2 forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.xz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
phpBB/develop/create_schema_files.php
Diffstat (limited to 'phpBB/includes/functions_container.php')
| -rw-r--r-- | phpBB/includes/functions_container.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 7cbfa17a0e..667d27fd20 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -26,7 +26,7 @@ if (!defined('IN_PHPBB')) * Used to bootstrap the container. * * @param string $config_file -* @return phpbb_db_driver +* @return \phpbb\db\driver\driver */ function phpbb_bootstrap_db_connection($config_file) { @@ -121,7 +121,7 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext) $other_config_path = $phpbb_root_path . 'install/update/new/config/'; $config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config/'; - $core = new phpbb_di_extension_core($config_path); + $core = new \phpbb\di\extension\core($config_path); $container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext); $container->setParameter('core.root_path', $phpbb_root_path); @@ -152,12 +152,12 @@ function phpbb_create_update_container($phpbb_root_path, $php_ext, $config_path) return phpbb_create_compiled_container( $config_file, array( - new phpbb_di_extension_config($config_file), - new phpbb_di_extension_core($config_path), + new phpbb\di\extension\config($config_file), + new phpbb\di\extension\core($config_path), ), array( - new phpbb_di_pass_collection_pass(), - new phpbb_di_pass_kernel_pass(), + new phpbb\di\pass\collection_pass(), + new phpbb\di\pass\kernel_pass(), ), $phpbb_root_path, $php_ext @@ -260,13 +260,13 @@ function phpbb_create_default_container($phpbb_root_path, $php_ext) return phpbb_create_dumped_container_unless_debug( $config_file, array( - new phpbb_di_extension_config($config_file), - new phpbb_di_extension_core($phpbb_root_path . 'config'), - new phpbb_di_extension_ext($installed_exts), + new \phpbb\di\extension\config($config_file), + new \phpbb\di\extension\core($phpbb_root_path . 'config'), + new \phpbb\di\extension\ext($installed_exts), ), array( - new phpbb_di_pass_collection_pass(), - new phpbb_di_pass_kernel_pass(), + new \phpbb\di\pass\collection_pass(), + new \phpbb\di\pass\kernel_pass(), ), $phpbb_root_path, $php_ext |