diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 18:24:46 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 18:24:46 -0500 |
| commit | a6df011a107132390ecc35b80ab0e88bc31fd103 (patch) | |
| tree | c91b2a90f4c3cef95c1f734aa0b6b0da4007e2ac /phpBB/includes/functions_container.php | |
| parent | 2ee22d4615a86a33d3c65f94d7a9c4b99dfb1b7e (diff) | |
| parent | 179f41475b555d0a3314d779d0d7423f66f0fb95 (diff) | |
| download | forums-a6df011a107132390ecc35b80ab0e88bc31fd103.tar forums-a6df011a107132390ecc35b80ab0e88bc31fd103.tar.gz forums-a6df011a107132390ecc35b80ab0e88bc31fd103.tar.bz2 forums-a6df011a107132390ecc35b80ab0e88bc31fd103.tar.xz forums-a6df011a107132390ecc35b80ab0e88bc31fd103.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850
# By Nils Adermann (68) and others
# Via Andreas Fischer (12) and others
* 'develop' of github.com:phpbb/phpbb3: (102 commits)
[ticket/11876] Replace MD5 with SHA256.
[ticket/11876] Move checksum generation from build PHP files to phing build.xml
[develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.
[prep-release-3.0.12] Update changelog for 3.0.12 release.
[ticket/11873] Add unit test for large password input.
[ticket/11873] Do not hash very large passwords in order to safe resources.
[ticket/11862] Correct var names in user_delete() events due to prune-users
[develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
[prep-release-3.0.12] Bumping version number for 3.0.12 final.
[ticket/11852] Add class file
[ticket/11852] Move tests to folder with new class name
[ticket/11852] Split filesystem and path_helper into 2 classes
[ticket/11868] Add @depends to test
[ticket/11868] Add functional test for registration
[ticket/11868] Replace phpbb_request_interface references
[ticket/11866] Only single backslash in .md files
[ticket/11866] Remove outdated and broken develop script
[ticket/11866] More namespaces
[ticket/11866] Update some occurances of phpbb_db_ to new Namespace
[ticket/11865] Convert old class name to namespaced version
...
Conflicts:
tests/security/extract_current_page_test.php
tests/session/testable_facade.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 |