diff options
| author | David King <imkingdavid@gmail.com> | 2012-10-19 19:53:29 -0400 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-10 11:40:09 +0100 |
| commit | f48709f5bb8fb1b916d308e3b4bb06bc96d08611 (patch) | |
| tree | dc662d3c6f42e2fe1cba86fce7608a84521c0143 /phpBB/common.php | |
| parent | 957508c8b1a71c603c31728dfab79640554c541e (diff) | |
| download | forums-f48709f5bb8fb1b916d308e3b4bb06bc96d08611.tar forums-f48709f5bb8fb1b916d308e3b4bb06bc96d08611.tar.gz forums-f48709f5bb8fb1b916d308e3b4bb06bc96d08611.tar.bz2 forums-f48709f5bb8fb1b916d308e3b4bb06bc96d08611.tar.xz forums-f48709f5bb8fb1b916d308e3b4bb06bc96d08611.zip | |
[feature/compiled-dic] Compile the DI Container into a cached class
PHPBB3-11152
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 6943b02fa0..a681561619 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -81,8 +81,6 @@ if (!empty($load_extensions) && function_exists('dl')) // 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); @@ -94,16 +92,28 @@ 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_compiled_container( + array( + new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx), + new phpbb_di_extension_core($phpbb_root_path), + ), + array( + new phpbb_event_kernel_compiler_pass(), + ), + $phpbb_root_path . 'config.' . $phpEx, + $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'); @@ -130,13 +140,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'))); |