diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-11-11 09:05:15 -0800 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-11-11 09:05:15 -0800 |
| commit | 69845585a2bc6720e6c512227f436782c7bf5d29 (patch) | |
| tree | 70fc24b25612a99f2c3ac8664e1df7561d69f680 /phpBB/install/index.php | |
| parent | 504158ceaba18bb8bc61d54504a2c870d0eb0407 (diff) | |
| parent | 1bf7f0bde73a8528f77b5f9cfffd6f113afcf63d (diff) | |
| download | forums-69845585a2bc6720e6c512227f436782c7bf5d29.tar forums-69845585a2bc6720e6c512227f436782c7bf5d29.tar.gz forums-69845585a2bc6720e6c512227f436782c7bf5d29.tar.bz2 forums-69845585a2bc6720e6c512227f436782c7bf5d29.tar.xz forums-69845585a2bc6720e6c512227f436782c7bf5d29.zip | |
Merge pull request #1056 from igorw/feature/compiled-dic
[feature/compiled-dic] Compile the DI Container into a cached class
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'); |