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/common.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/common.php')
| -rw-r--r-- | phpBB/common.php | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index e49c52cecb..002d435b6e 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -69,11 +69,10 @@ if (!defined('PHPBB_INSTALLED')) // Include files 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_content.' . $phpEx); +require($phpbb_root_path . 'includes/functions_container.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/db/' . ltrim($dbms, 'dbal_') . '.' . $phpEx); @@ -82,16 +81,27 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); // Set PHP error handler to ours set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); -$phpbb_container = new ContainerBuilder(); -$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/config')); -$loader->load('services.yml'); - -$processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx); -$processor->process($phpbb_container); - // Setup class loader first -$phpbb_class_loader = $phpbb_container->get('class_loader'); -$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext'); +$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(); + +// Set up container +$phpbb_container = phpbb_create_dumped_container_unless_debug( + array( + new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx), + new phpbb_di_extension_core($phpbb_root_path), + ), + array( + new phpbb_di_pass_collection_pass('cron.task_collection', 'cron.task'), + ), + $phpbb_root_path, + $phpEx +); + +$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'); @@ -118,13 +128,6 @@ $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader'); $template = $phpbb_container->get('template'); $phpbb_style = $phpbb_container->get('style'); -$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor')); -foreach ($ids as $id) -{ - $processor = $phpbb_container->get($id); - $processor->process($phpbb_container); -} - // Add own hook handler require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display'))); |