9 files changed, 18 insertions, 18 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 612446a2a8..be0fbf5831 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -72,7 +72,7 @@ class oauth extends \phpbb\auth\provider\base
 	/**
 	* All OAuth service providers
 	*
-	* @var \phpbb\di\service_collection\service_collection Contains \phpbb\auth\provider\oauth\service_interface
+	* @var \phpbb\di\service_collection Contains \phpbb\auth\provider\oauth\service_interface
 	*/
 	protected $service_providers;
 
@@ -121,13 +121,13 @@ class oauth extends \phpbb\auth\provider\base
 	* @param	\phpbb\user		$user
 	* @param	string			$auth_provider_oauth_token_storage_table
 	* @param	string			$auth_provider_oauth_token_account_assoc
-	* @param	\phpbb\di\service_collection\service_collection	$service_providers Contains \phpbb\auth\provider\oauth\service_interface
+	* @param	\phpbb\di\service_collection	$service_providers Contains \phpbb\auth\provider\oauth\service_interface
 	* @param	string			$users_table
 	* @param	\Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container DI container
 	* @param	string			$phpbb_root_path
 	* @param	string			$php_ext
 	*/
-	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request_interface $request, \phpbb\user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, \phpbb\di\service_collection\service_collection $service_providers, $users_table, \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container, $phpbb_root_path, $php_ext)
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $passwords_manager, \phpbb\request\request_interface $request, \phpbb\user $user, $auth_provider_oauth_token_storage_table, $auth_provider_oauth_token_account_assoc, \phpbb\di\service_collection $service_providers, $users_table, \Symfony\Component\DependencyInjection\ContainerInterface $phpbb_container, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;
 		$this->config = $config;
diff --git a/phpBB/phpbb/auth/provider_collection.php b/phpBB/phpbb/auth/provider_collection.php
index 71da30e4c4..8e7e9e2cc1 100644
--- a/phpBB/phpbb/auth/provider_collection.php
+++ b/phpBB/phpbb/auth/provider_collection.php
@@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Collection of auth providers to be configured at container compile time.
 */
-class provider_collection extends \phpbb\di\service_collection\service_collection
+class provider_collection extends \phpbb\di\service_collection
 {
 	/** @var \phpbb\config\config phpBB Config */
 	protected $config;
diff --git a/phpBB/phpbb/captcha/factory.php b/phpBB/phpbb/captcha/factory.php
index 1357e919bb..dd44aca8bb 100644
--- a/phpBB/phpbb/captcha/factory.php
+++ b/phpBB/phpbb/captcha/factory.php
@@ -21,7 +21,7 @@ class factory
 	private $container;
 
 	/**
-	* @var \phpbb\di\service_collection\service_collection
+	* @var \phpbb\di\service_collection
 	*/
 	private $plugins;
 
@@ -29,9 +29,9 @@ class factory
 	* Constructor
 	*
 	* @param \Symfony\Component\DependencyInjection\ContainerInterface $container
-	* @param \phpbb\di\service_collection\service_collection                              $plugins
+	* @param \phpbb\di\service_collection                              $plugins
 	*/
-	public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, \phpbb\di\service_collection\service_collection $plugins)
+	public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, \phpbb\di\service_collection $plugins)
 	{
 		$this->container = $container;
 		$this->plugins = $plugins;
diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
index fa847cd64d..bc4897af18 100644
--- a/phpBB/phpbb/console/application.php
+++ b/phpBB/phpbb/console/application.php
@@ -89,9 +89,9 @@ class application extends \Symfony\Component\Console\Application
 	/**
 	* Register a set of commands from the container
 	*
-	* @param \phpbb\di\service_collection\service_collection	$command_collection	The console service collection
+	* @param \phpbb\di\service_collection	$command_collection	The console service collection
 	*/
-	public function register_container_commands(\phpbb\di\service_collection\service_collection $command_collection)
+	public function register_container_commands(\phpbb\di\service_collection $command_collection)
 	{
 		foreach ($command_collection as $service_command)
 		{
diff --git a/phpBB/phpbb/di/service_collection/ordered_service_collection.php b/phpBB/phpbb/di/ordered_service_collection.php
index 8d56434504..46f397a004 100644
--- a/phpBB/phpbb/di/service_collection/ordered_service_collection.php
+++ b/phpBB/phpbb/di/ordered_service_collection.php
@@ -11,7 +11,7 @@
  *
  */
 
-namespace phpbb\di\service_collection;
+namespace phpbb\di;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
diff --git a/phpBB/phpbb/di/service_collection/service_collection.php b/phpBB/phpbb/di/service_collection.php
index 8085128fed..82ca9bf679 100644
--- a/phpBB/phpbb/di/service_collection/service_collection.php
+++ b/phpBB/phpbb/di/service_collection.php
@@ -11,7 +11,7 @@
 *
 */
 
-namespace phpbb\di\service_collection;
+namespace phpbb\di;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
diff --git a/phpBB/phpbb/di/service_collection/service_collection_iterator.php b/phpBB/phpbb/di/service_collection_iterator.php
index 76e22b048e..0d031ab52d 100644
--- a/phpBB/phpbb/di/service_collection/service_collection_iterator.php
+++ b/phpBB/phpbb/di/service_collection_iterator.php
@@ -11,7 +11,7 @@
 *
 */
 
-namespace phpbb\di\service_collection;
+namespace phpbb\di;
 
 /**
 * Iterator which loads the services when they are requested
@@ -19,14 +19,14 @@ namespace phpbb\di\service_collection;
 class service_collection_iterator extends \ArrayIterator
 {
 	/**
-	* @var \phpbb\di\service_collection\service_collection
+	* @var \phpbb\di\service_collection
 	*/
 	protected $collection;
 
 	/**
 	* Construct an ArrayIterator for service_collection
 	*
-	* @param \phpbb\di\service_collection\service_collection $collection The collection to iterate over
+	* @param \phpbb\di\service_collection $collection The collection to iterate over
 	* @param int $flags Flags to control the behaviour of the ArrayObject object.
 	* @see ArrayObject::setFlags()
 	*/
diff --git a/phpBB/phpbb/passwords/manager.php b/phpBB/phpbb/passwords/manager.php
index 8974dc36d1..aa9147ecf4 100644
--- a/phpBB/phpbb/passwords/manager.php
+++ b/phpBB/phpbb/passwords/manager.php
@@ -89,7 +89,7 @@ class manager
 	/**
 	* Fill algorithm type map
 	*
-	* @param \phpbb\di\service_collection\service_collection $hashing_algorithms
+	* @param \phpbb\di\service_collection $hashing_algorithms
 	*/
 	protected function fill_type_map($hashing_algorithms)
 	{
diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 802629a10e..4ad3214ae4 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -50,7 +50,7 @@ class manager
 
 	/**
 	* Service Collection object
-	* @var \phpbb\di\service_collection\service_collection
+	* @var \phpbb\di\service_collection
 	*/
 	protected $type_collection;
 
@@ -76,13 +76,13 @@ class manager
 	* @param	\phpbb\event\dispatcher_interface		$dispatcher	Event dispatcher object
 	* @param	\phpbb\request\request		$request	Request object
 	* @param	\phpbb\template\template	$template	Template object
-	* @param	\phpbb\di\service_collection\service_collection $type_collection
+	* @param	\phpbb\di\service_collection $type_collection
 	* @param	\phpbb\user					$user		User object
 	* @param	string				$fields_table
 	* @param	string				$fields_language_table
 	* @param	string				$fields_data_table
 	*/
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
 	{
 		$this->auth = $auth;
 		$this->db = $db;