diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-14 11:33:24 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-11-14 11:33:24 -0600 |
| commit | d2187424da6ff2e0d4a69a6e21bac7e92f68335a (patch) | |
| tree | ee099178886dd3a6e737f2dee08bd6312bf25ce1 /phpBB/install/index.php | |
| parent | 7948aaa78ed7e543a0773ee1a858ef45f5e5a5bf (diff) | |
| parent | 9c28470ad7b45c10ce3a32065650e4b17f9f27ea (diff) | |
| download | forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.gz forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.bz2 forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.tar.xz forums-d2187424da6ff2e0d4a69a6e21bac7e92f68335a.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/common.php
phpBB/config/services.yml
Diffstat (limited to 'phpBB/install/index.php')
| -rw-r--r-- | phpBB/install/index.php | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 753e5eb226..09560946a6 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -75,10 +75,9 @@ else // Include essential scripts require($phpbb_root_path . 'includes/class_loader.' . $phpEx); -require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx); -require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); +require($phpbb_root_path . 'includes/functions_container.' . $phpEx); phpbb_require_updated('includes/functions_content.' . $phpEx, true); @@ -86,17 +85,17 @@ include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); require($phpbb_root_path . 'includes/functions_install.' . $phpEx); -$phpbb_container = new ContainerBuilder(); -$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config')); -$loader->load('services.yml'); +// Setup class loader first +$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx"); +$phpbb_class_loader->register(); +$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", ".$phpEx"); +$phpbb_class_loader_ext->register(); -$phpbb_container->setParameter('core.root_path', $phpbb_root_path); -$phpbb_container->setParameter('core.php_ext', $phpEx); +// Set up container +$phpbb_container = phpbb_create_install_container($phpbb_root_path, $phpEx); -$phpbb_container->setAlias('cache.driver', 'cache.driver.install'); - -$phpbb_class_loader = $phpbb_container->get('class_loader'); -$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext'); +$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); +$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); // set up caching $cache = $phpbb_container->get('cache'); |