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');