5 files changed, 46 insertions, 34 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4746bb11f2..853848d637 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -80,11 +80,13 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 // Set up container (must be done here because extensions table may not exist)
-$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
-$phpbb_container_builder->set_use_extensions(false);
-$phpbb_container_builder->set_use_kernel_pass(false);
-$phpbb_container_builder->set_dump_container(false);
-$phpbb_container = $phpbb_container_builder->get_container();
+$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
+$phpbb_container = $phpbb_container_builder
+	->with_config($phpbb_config_php_file)
+	->without_extensions()
+	->without_cache()
+	->get_container()
+;
 
 // set up caching
 /* @var $cache \phpbb\cache\service */
@@ -184,9 +186,9 @@ define('IN_DB_UPDATE', true);
 /* @var $migrator \phpbb\db\migrator */
 $migrator = $phpbb_container->get('migrator');
 
-/** @var \phpbb\filesystem\filesystem_interface $filesystem */
-$filesystem = $phpbb_container->get('filesystem');
-$migrator->set_output_handler(new \phpbb\db\log_wrapper_migrator_output_handler($user, new \phpbb\db\html_migrator_output_handler($user), $phpbb_root_path . 'store/migrations_' . time() . '.log', $filesystem));
+/** @var \phpbb\filesystem\filesystem_interface $phpbb_filesystem */
+$phpbb_filesystem = $phpbb_container->get('filesystem');
+$migrator->set_output_handler(new \phpbb\db\log_wrapper_migrator_output_handler($user, new \phpbb\db\html_migrator_output_handler($user), $phpbb_root_path . 'store/migrations_' . time() . '.log', $phpbb_filesystem));
 
 $migrator->create_migrations_table();
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index dd3590e854..3559a10971 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -116,18 +116,18 @@ $phpbb_class_loader_ext->register();
 
 // Set up container
 $phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
-$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
-$phpbb_container_builder->set_use_extensions(false);
-$phpbb_container_builder->set_dump_container(false);
-$phpbb_container_builder->set_use_custom_pass(false);
-$phpbb_container_builder->set_inject_config(false);
-$phpbb_container_builder->set_compile_container(false);
+$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
+$phpbb_container_builder
+	->without_extensions()
+	->without_cache()
+	->without_compiled_container()
+;
 
 $other_config_path = $phpbb_root_path . 'install/update/new/config/';
 $config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config/';
-$phpbb_container_builder->set_config_path($config_path);
+$phpbb_container_builder->with_config_path($config_path);
 
-$phpbb_container_builder->set_custom_parameters(array(
+$phpbb_container_builder->with_custom_parameters(array(
 	'core.root_path'			=> $phpbb_root_path,
 	'core.adm_relative_path'	=> $phpbb_adm_relative_path,
 	'core.php_ext'				=> $phpEx,
@@ -138,6 +138,7 @@ $phpbb_container_builder->set_custom_parameters(array(
 $phpbb_container = $phpbb_container_builder->get_container();
 $phpbb_container->register('dbal.conn.driver')->setSynthetic(true);
 $phpbb_container->register('template.twig.environment')->setSynthetic(true);
+$phpbb_container->register('language.loader')->setSynthetic(true);
 $phpbb_container->compile();
 
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
@@ -241,7 +242,8 @@ $sub = $request->variable('sub', '');
 // Set PHP error handler to ours
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
-$user = new \phpbb\user('\phpbb\datetime');
+$lang_service = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
+$user = new \phpbb\user($lang_service, '\phpbb\datetime');
 $auth = new \phpbb\auth\auth();
 
 // Add own hook handler, if present. :o
@@ -279,6 +281,7 @@ $cache_path = $phpbb_root_path . 'cache/';
 
 $twig_environment = new \phpbb\template\twig\environment(
 	$config,
+	$phpbb_filesystem,
 	$phpbb_path_helper,
 	$phpbb_container,
 	$cache_path,
@@ -286,14 +289,17 @@ $twig_environment = new \phpbb\template\twig\environment(
 	$phpbb_container->get('template.twig.loader')
 );
 
+$language_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
 $phpbb_container->set('template.twig.environment', $twig_environment);
+$phpbb_container->set('language.loader', $language_loader);
+$twig_context = new \phpbb\template\context();
 $template = new \phpbb\template\twig\twig(
 	$phpbb_path_helper,
 	$config,
-	$user,
-	new \phpbb\template\context(),
+	$twig_context,
 	$twig_environment,
 	$cache_path,
+	$user,
 	array($phpbb_container->get('template.twig.extensions.phpbb'))
 );
 
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index e268565be3..dd9835113b 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -131,8 +131,8 @@ class install_convert extends module
 		// Enable super globals to prevent issues with the new \phpbb\request\request object
 		$request->enable_super_globals();
 		// Create a normal container now
-		$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
-		$phpbb_container = $phpbb_container_builder->get_container();
+		$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
+		$phpbb_container = $phpbb_container_builder->with_config($phpbb_config_php_file)->get_container();
 
 		// Create cache
 		/* @var $cache \phpbb\cache\service */
@@ -153,7 +153,7 @@ class install_convert extends module
 				unset($dbpasswd);
 
 				// We need to fill the config to let internal functions correctly work
-				$config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE);
+				$config = new \phpbb\config\db($db, new \phpbb\cache\driver\dummy, CONFIG_TABLE);
 
 				// Detect if there is already a conversion in progress at this point and offer to resume
 				// It's quite possible that the user will get disconnected during a large conversion so they need to be able to resume it
@@ -392,7 +392,7 @@ class install_convert extends module
 		$this->page_title = $lang['STAGE_SETTINGS'];
 
 		// We need to fill the config to let internal functions correctly work
-		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE);
+		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\dummy, CONFIG_TABLE);
 
 		$convertor_tag = $request->variable('tag', '');
 
@@ -639,7 +639,7 @@ class install_convert extends module
 		unset($dbpasswd);
 
 		// We need to fill the config to let internal functions correctly work
-		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE);
+		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\dummy, CONFIG_TABLE);
 
 		// Override a couple of config variables for the duration
 		$config['max_quote_depth'] = 0;
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 3c37a028cb..e8890a3d08 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -110,8 +110,8 @@ class install_install extends module
 				$request->enable_super_globals();
 
 				// Create a normal container now
-				$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
-				$phpbb_container = $phpbb_container_builder->get_container();
+				$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
+				$phpbb_container = $phpbb_container_builder->with_config($phpbb_config_php_file)->get_container();
 
 				// Sets the global variables
 				/* @var $cache \phpbb\cache\service */
@@ -1522,7 +1522,7 @@ class install_install extends module
 		include_once($phpbb_root_path . 'phpbb/search/fulltext_native.' . $phpEx);
 
 		// We need to fill the config to let internal functions correctly work
-		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE);
+		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\dummy, CONFIG_TABLE);
 
 		$error = false;
 		$search = new \phpbb\search\fulltext_native($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user);
@@ -1937,7 +1937,7 @@ class install_install extends module
 		$data = $this->get_submitted_data();
 
 		// We need to fill the config to let internal functions correctly work
-		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE);
+		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\dummy, CONFIG_TABLE);
 
 		$sql = 'SELECT group_id
 			FROM ' . GROUPS_TABLE . "
@@ -2009,7 +2009,7 @@ class install_install extends module
 		$data = $this->get_submitted_data();
 
 		// We need to fill the config to let internal functions correctly work
-		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE);
+		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\dummy, CONFIG_TABLE);
 
 		$user->session_begin();
 		$auth->login($data['admin_name'], $data['admin_pass1'], false, true, true);
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 410a8afb66..d9ba2e7fe9 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -76,12 +76,16 @@ class install_update extends module
 		$request->enable_super_globals();
 
 		// Create a normal container now
-		$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
-		$phpbb_container_builder->set_dump_container(false);
-		$phpbb_container_builder->set_use_extensions(false);
+		$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
+		$phpbb_container = $phpbb_container_builder
+			->with_config($phpbb_config_php_file)
+			->without_cache()
+			->without_extensions()
+		;
+
 		if (file_exists($phpbb_root_path . 'install/update/new/config'))
 		{
-			$phpbb_container_builder->set_config_path($phpbb_root_path . 'install/update/new/config');
+			$phpbb_container_builder->with_config_path($phpbb_root_path . 'install/update/new/config');
 		}
 		$phpbb_container = $phpbb_container_builder->get_container();
 
@@ -118,7 +122,7 @@ class install_update extends module
 		unset($dbpasswd);
 
 		// We need to fill the config to let internal functions correctly work
-		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\null, CONFIG_TABLE);
+		$config = new \phpbb\config\db($db, new \phpbb\cache\driver\dummy, CONFIG_TABLE);
 
 		// Force template recompile
 		$config['load_tplcompile'] = 1;