aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2012-07-21 20:42:07 +0200
committerIgor Wiedler <igor@wiedler.ch>2012-07-21 20:42:07 +0200
commit967cc550ed9bb74480f46212768502627f26d62d (patch)
tree4762429e0110b6d4ad5eb07da67f680e2fabcbec /phpBB/common.php
parent40af25115baf10d367516857f69e3f9807c1ae41 (diff)
downloadforums-967cc550ed9bb74480f46212768502627f26d62d.tar
forums-967cc550ed9bb74480f46212768502627f26d62d.tar.gz
forums-967cc550ed9bb74480f46212768502627f26d62d.tar.bz2
forums-967cc550ed9bb74480f46212768502627f26d62d.tar.xz
forums-967cc550ed9bb74480f46212768502627f26d62d.zip
[feature/dic] Introduce DI processors instead of abusing compiler passes
PHPBB3-10739
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index e7dabec4ca..406d8bb093 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -77,7 +77,8 @@ if (!empty($load_extensions) && function_exists('dl'))
// Include files
require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-require($phpbb_root_path . 'includes/di/compiler/config_pass.' . $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,9 +95,8 @@ $phpbb_container = new ContainerBuilder();
$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/config'));
$loader->load('services.yml');
-$phpbb_compiler = new Compiler();
-$phpbb_compiler->addPass(new phpbb_di_compiler_config_pass($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx));
-$phpbb_compiler->compile($phpbb_container);
+$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');