11 files changed, 49 insertions, 49 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php
index 8baeae5b4e..9e9f1e27e6 100755
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -38,11 +38,11 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
 $phpbb_class_loader_ext->register();
 
-$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
-$phpbb_container_factory->set_use_extensions(false);
-$phpbb_container_factory->set_dump_container(false);
+$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
+$phpbb_container_builder->set_use_extensions(false);
+$phpbb_container_builder->set_dump_container(false);
 
-$phpbb_container = $phpbb_container_factory->get_container();
+$phpbb_container = $phpbb_container_builder->get_container();
 $phpbb_container->get('request')->enable_super_globals();
 require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 
diff --git a/phpBB/common.php b/phpBB/common.php
index 8c9e5b6023..b5aaedd6e0 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -95,8 +95,8 @@ $phpbb_class_loader_ext->register();
 phpbb_load_extensions_autoloaders($phpbb_root_path);
 
 // Set up container
-$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
-$phpbb_container = $phpbb_container_factory->get_container();
+$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
+$phpbb_container = $phpbb_container_builder->get_container();
 
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
 $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 84c1c51c1c..5507464209 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -61,8 +61,8 @@ if (isset($_GET['avatar']))
 	$phpbb_class_loader_ext->register();
 
 	// Set up container
-	$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
-	$phpbb_container = $phpbb_container_factory->get_container();
+	$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
+	$phpbb_container = $phpbb_container_builder->get_container();
 
 	$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
 	$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 869d650b7c..392bb2ad8c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -86,11 +86,11 @@ 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_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
-$phpbb_container_factory->set_use_extensions(false);
-$phpbb_container_factory->set_use_kernel_pass(false);
-$phpbb_container_factory->set_dump_container(false);
-$phpbb_container = $phpbb_container_factory->get_container();
+$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $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();
 
 // set up caching
 $cache = $phpbb_container->get('cache');
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index f350a329d2..1c81d552a2 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -120,18 +120,18 @@ $phpbb_class_loader_ext->register();
 
 // Set up container
 $phpbb_config_php_handler = new \phpbb\config_php($phpbb_root_path, $phpEx);
-$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
-$phpbb_container_factory->set_use_extensions(false);
-$phpbb_container_factory->set_dump_container(false);
-$phpbb_container_factory->set_use_custom_pass(false);
-$phpbb_container_factory->set_inject_config(false);
-$phpbb_container_factory->set_compile_container(false);
+$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $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);
 
 $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_factory->set_config_path($config_path);
+$phpbb_container_builder->set_config_path($config_path);
 
-$phpbb_container_factory->set_custom_parameters(array(
+$phpbb_container_builder->set_custom_parameters(array(
 	'core.root_path'			=> $phpbb_root_path,
 	'core.adm_relative_path'	=> $phpbb_adm_relative_path,
 	'core.php_ext'				=> $phpEx,
@@ -139,7 +139,7 @@ $phpbb_container_factory->set_custom_parameters(array(
 	'cache.driver.class'		=> 'phpbb\cache\driver\file',
 ));
 
-$phpbb_container = $phpbb_container_factory->get_container();
+$phpbb_container = $phpbb_container_builder->get_container();
 $phpbb_container->register('dbal.conn')->setSynthetic(true);
 $phpbb_container->compile();
 
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 9e983d7f40..8f77d0be9a 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -127,8 +127,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_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
-		$phpbb_container = $phpbb_container_factory->get_container();
+		$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
+		$phpbb_container = $phpbb_container_builder->get_container();
 
 		// Create cache
 		$cache = $phpbb_container->get('cache');
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index d052297d81..1abe19e5b5 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -104,8 +104,8 @@ class install_install extends module
 				$request->enable_super_globals();
 
 				// Create a normal container now
-				$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
-				$phpbb_container = $phpbb_container_factory->get_container();
+				$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
+				$phpbb_container = $phpbb_container_builder->get_container();
 
 				// Sets the global variables
 				$cache = $phpbb_container->get('cache');
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 943b89f2d7..5474ae71bc 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -76,14 +76,14 @@ class install_update extends module
 		$request->enable_super_globals();
 
 		// Create a normal container now
-		$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
-		$phpbb_container_factory->set_dump_container(false);
-		$phpbb_container_factory->set_use_extensions(false);
+		$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
+		$phpbb_container_builder->set_dump_container(false);
+		$phpbb_container_builder->set_use_extensions(false);
 		if (file_exists($phpbb_root_path . 'install/update/new/config'))
 		{
-			$phpbb_container_factory->set_config_path($phpbb_root_path . 'install/update/new/config');
+			$phpbb_container_builder->set_config_path($phpbb_root_path . 'install/update/new/config');
 		}
-		$phpbb_container = $phpbb_container_factory->get_container();
+		$phpbb_container = $phpbb_container_builder->get_container();
 
 		// Writes into global $cache
 		$cache = $phpbb_container->get('cache');
diff --git a/phpBB/phpbb/di/container_factory.php b/phpBB/phpbb/di/container_builder.php
index 426c411e07..426c411e07 100644
--- a/phpBB/phpbb/di/container_factory.php
+++ b/phpBB/phpbb/di/container_builder.php
diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index a71da1734d..57500c2ad2 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -22,7 +22,7 @@ namespace
 		/**
 		* @var \phpbb\di\container_factory
 		*/
-		protected $factory;
+		protected $builder;
 		protected $phpbb_root_path;
 		protected $filename;
 
@@ -30,7 +30,7 @@ namespace
 		{
 			$this->phpbb_root_path = dirname(__FILE__) . '/';
 			$this->config_php = new \phpbb\config_php($this->phpbb_root_path . 'fixtures/', 'php');
-			$this->factory = new phpbb_mock_container_factory($this->config_php, $this->phpbb_root_path . 'fixtures/', 'php');
+			$this->builder = new phpbb_mock_phpbb_di_container_builder($this->config_php, $this->phpbb_root_path . 'fixtures/', 'php');
 
 			$this->filename = $this->phpbb_root_path . '../tmp/container.php';
 			if (is_file($this->filename))
@@ -43,7 +43,7 @@ namespace
 
 		public function test_default_container()
 		{
-			$container = $this->factory->get_container();
+			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
 			// Checks the core services
@@ -67,7 +67,7 @@ namespace
 			$this->assertTrue(is_file($this->filename));
 
 			// Checks the construction of a dumped container
-			$container = $this->factory->get_container();
+			$container = $this->builder->get_container();
 			$this->assertInstanceOf('phpbb_cache_container', $container);
 			$this->assertFalse($container->isFrozen());
 			$container->getParameterBag(); // needed, otherwise the container is not marked as frozen
@@ -76,15 +76,15 @@ namespace
 
 		public function test_dump_container()
 		{
-			$this->factory->set_dump_container(false);
-			$container = $this->factory->get_container();
+			$this->builder->set_dump_container(false);
+			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
 			// Checks dump_container
 			$this->assertFalse(is_file($this->filename));
 
 			// Checks the construction of a dumped container
-			$container = $this->factory->get_container();
+			$container = $this->builder->get_container();
 			$this->assertNotInstanceOf('phpbb_cache_container', $container);
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 			$this->assertTrue($container->isFrozen());
@@ -92,8 +92,8 @@ namespace
 
 		public function test_use_extensions()
 		{
-			$this->factory->set_use_extensions(false);
-			$container = $this->factory->get_container();
+			$this->builder->set_use_extensions(false);
+			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
 			// Checks the core services
@@ -107,8 +107,8 @@ namespace
 
 		public function test_compile_container()
 		{
-			$this->factory->set_compile_container(false);
-			$container = $this->factory->get_container();
+			$this->builder->set_compile_container(false);
+			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
 			// Checks compile_container
@@ -117,8 +117,8 @@ namespace
 
 		public function test_inject_config()
 		{
-			$this->factory->set_inject_config(false);
-			$container = $this->factory->get_container();
+			$this->builder->set_inject_config(false);
+			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
 			// Checks inject_config
@@ -127,8 +127,8 @@ namespace
 
 		public function test_set_config_path()
 		{
-			$this->factory->set_config_path($this->phpbb_root_path . 'fixtures/other_config/');
-			$container = $this->factory->get_container();
+			$this->builder->set_config_path($this->phpbb_root_path . 'fixtures/other_config/');
+			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
 			$this->assertTrue($container->hasParameter('other_config'));
@@ -137,8 +137,8 @@ namespace
 
 		public function test_set_custom_parameters()
 		{
-			$this->factory->set_custom_parameters(array('my_parameter' => true));
-			$container = $this->factory->get_container();
+			$this->builder->set_custom_parameters(array('my_parameter' => true));
+			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
 
 			$this->assertTrue($container->hasParameter('my_parameter'));
diff --git a/tests/mock/container_factory.php b/tests/mock/phpbb_di_container_builder.php
index d547c8dd68..235fa32b26 100644
--- a/tests/mock/container_factory.php
+++ b/tests/mock/phpbb_di_container_builder.php
@@ -11,7 +11,7 @@
 *
 */
 
-class phpbb_mock_container_factory extends \phpbb\di\container_factory
+class phpbb_mock_phpbb_di_container_builder extends \phpbb\di\container_factory
 {
 	protected function get_container_filename()
 	{