diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-07-21 16:14:21 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-07-21 16:14:40 +0200 |
| commit | 32d2ee61f78e3aeaac5f4f1bcb672c67aa10b10e (patch) | |
| tree | 198cb2d66e4d99e7bb55d3f6355a7618c19b95a0 /phpBB/install/index.php | |
| parent | 5d57caee58c58d2a9c283abe8fe88f4eaec9f662 (diff) | |
| download | forums-32d2ee61f78e3aeaac5f4f1bcb672c67aa10b10e.tar forums-32d2ee61f78e3aeaac5f4f1bcb672c67aa10b10e.tar.gz forums-32d2ee61f78e3aeaac5f4f1bcb672c67aa10b10e.tar.bz2 forums-32d2ee61f78e3aeaac5f4f1bcb672c67aa10b10e.tar.xz forums-32d2ee61f78e3aeaac5f4f1bcb672c67aa10b10e.zip | |
[feature/dic] Configure container via config.php, use compiler pass
PHPBB3-10739
Diffstat (limited to 'phpBB/install/index.php')
| -rw-r--r-- | phpBB/install/index.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 88745b8bb9..3e14b719e8 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -7,6 +7,11 @@ * */ +use Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\Compiler\Compiler; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; + /**#@+ * @ignore */ @@ -71,6 +76,8 @@ else // Include essential scripts require($phpbb_root_path . 'includes/class_loader.' . $phpEx); +require($phpbb_root_path . 'includes/di/compiler/config_pass.' . $phpEx); + require($phpbb_root_path . 'includes/functions.' . $phpEx); phpbb_require_updated('includes/functions_content.' . $phpEx, true); @@ -81,13 +88,13 @@ require($phpbb_root_path . 'includes/functions_install.' . $phpEx); $phpbb_container = new ContainerBuilder(); $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config')); -$loader->load('parameters.yml'); $loader->load('services.yml'); -$phpbb_container->setParameter('core.root_path', $phpbb_root_path); -$phpbb_container->setParameter('core.php_ext', $phpEx); +$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); + $phpbb_container->setAlias('cache.driver.install', 'cache.driver'); -$phpbb_container->set('container', $phpbb_container); $phpbb_class_loader = $phpbb_container->get('class_loader'); $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext'); |