Merge branch '3.3.x'

phpBB/phpbb/install/console/command/install/install.php

@@ -98,7 +98,7 @@ class install extends \phpbb\console\command\command
 	{
 		$this->iohandler_factory->set_environment('cli');
 
-		/** @var \phpbb\install\helper\iohandler\cli_iohandler $iohandler */
+		/** @var cli_iohandler $iohandler */
 		$iohandler = $this->iohandler_factory->get();
 		$style = new SymfonyStyle($input, $output);
 		$iohandler->set_style($style, $output);

phpBB/phpbb/install/console/command/update/update.php

@@ -98,7 +98,7 @@ class update extends \phpbb\console\command\command
 	{
 		$this->iohandler_factory->set_environment('cli');
 
-		/** @var \phpbb\install\helper\iohandler\cli_iohandler $iohandler */
+		/** @var cli_iohandler $iohandler */
 		$iohandler = $this->iohandler_factory->get();
 		$style = new SymfonyStyle($input, $output);
 		$iohandler->set_style($style, $output);

phpBB/phpbb/install/controller/helper.php

@@ -40,7 +40,7 @@ class helper
 	protected $installer_config;
 
 	/**
-	 * @var \phpbb\language\language
+	 * @var language
 	 */
 	protected $language;
 
@@ -50,37 +50,37 @@ class helper
 	protected $language_cookie;
 
 	/**
-	 * @var \phpbb\language\language_file_helper
+	 * @var language_file_helper
 	 */
 	protected $lang_helper;
 
 	/**
-	 * @var \phpbb\install\helper\navigation\navigation_provider
+	 * @var navigation_provider
 	 */
 	protected $navigation_provider;
 
 	/**
-	 * @var \phpbb\template\template
+	 * @var template
 	 */
 	protected $template;
 
 	/**
-	 * @var \phpbb\path_helper
+	 * @var path_helper
 	 */
 	protected $path_helper;
 
 	/**
-	 * @var \phpbb\request\request
+	 * @var request
 	 */
 	protected $phpbb_request;
 
 	/**
-	 * @var \phpbb\symfony_request
+	 * @var symfony_request
 	 */
 	protected $request;
 
 	/**
-	 * @var \phpbb\routing\router
+	 * @var router
 	 */
 	protected $router;
 

phpBB/phpbb/install/helper/container_factory.php

@@ -35,7 +35,7 @@ class container_factory
 	protected $php_ext;
 
 	/**
-	 * @var \phpbb\request\request
+	 * @var request
 	 */
 	protected $request;
 
@@ -78,7 +78,7 @@ class container_factory
 	 * @return \Symfony\Component\DependencyInjection\ContainerInterface|Object	phpBB's dependency injection container
 	 * 																			or the service specified in $service_name
 	 *
-	 * @throws \phpbb\install\exception\cannot_build_container_exception							When container cannot be built
+	 * @throws cannot_build_container_exception														When container cannot be built
 	 * @throws \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException			If the service is not defined
 	 * @throws \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException	When a circular reference is detected
 	 * @throws \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException			When the service is not defined
@@ -101,7 +101,7 @@ class container_factory
 	 *
 	 * @return mixed
 	 *
-	 * @throws \phpbb\install\exception\cannot_build_container_exception	When container cannot be built
+	 * @throws cannot_build_container_exception	When container cannot be built
 	 */
 	public function get_parameter($param_name)
 	{
@@ -117,7 +117,7 @@ class container_factory
 	/**
 	 * Build dependency injection container
 	 *
-	 * @throws \phpbb\install\exception\cannot_build_container_exception	When container cannot be built
+	 * @throws cannot_build_container_exception	When container cannot be built
 	 */
 	protected function build_container()
 	{

phpBB/phpbb/install/helper/database.php

@@ -231,7 +231,7 @@ class database
 	 *
 	 * @return bool|array	true if table prefix is valid, array of errors otherwise
 	 *
-	 * @throws \phpbb\install\exception\invalid_dbms_exception When $dbms is not a valid
+	 * @throws invalid_dbms_exception When $dbms is not a valid
 	 */
 	public function validate_table_prefix($dbms, $table_prefix)
 	{

phpBB/phpbb/install/helper/iohandler/factory.php

@@ -54,7 +54,7 @@ class factory
 	 *
 	 * @return \phpbb\install\helper\iohandler\iohandler_interface
 	 *
-	 * @throws \phpbb\install\helper\iohandler\exception\iohandler_not_implemented_exception
+	 * @throws iohandler_not_implemented_exception
 	 * 		When the specified iohandler_interface does not exists
 	 */
 	public function get()

phpBB/phpbb/install/installer.php

@@ -137,7 +137,7 @@ class installer
 
 		if (!$this->install_config->get('cache_purged_before', false) && $this->purge_cache_before)
 		{
-			/** @var \phpbb\cache\driver\driver_interface $cache */
+			/** @var driver_interface $cache */
 			$cache = $this->container_factory->get('cache.driver');
 			$cache->purge();
 			$this->install_config->set('cache_purged_before', true);
@@ -311,7 +311,7 @@ class installer
 
 				try
 				{
-					/** @var \phpbb\cache\driver\driver_interface $cache */
+					/** @var driver_interface $cache */
 					$cache = $this->container_factory->get('cache.driver');
 					$cache->purge();
 				}

phpBB/phpbb/install/installer_configuration.php

@@ -22,7 +22,7 @@ class installer_configuration implements ConfigurationInterface
 	/**
 	 * Generates the configuration tree builder.
 	 *
-	 * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder
+	 * @return TreeBuilder The tree builder
 	 */
 	public function getConfigTreeBuilder()
 	{

phpBB/phpbb/install/module/install_finish/task/notify_user.php

@@ -36,7 +36,7 @@ class notify_user extends \phpbb\install\task_base
 	protected $auth;
 
 	/**
-	 * @var \phpbb\config\db
+	 * @var db
 	 */
 	protected $config;
 

phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php

@@ -91,7 +91,7 @@ class obtain_admin_data extends \phpbb\install\task_base implements \phpbb\insta
 	 *
 	 * @param bool $use_request_data Whether to use submited data
 	 *
-	 * @throws \phpbb\install\exception\user_interaction_required_exception When the user is required to provide data
+	 * @throws user_interaction_required_exception When the user is required to provide data
 	 */
 	protected function request_form_data($use_request_data = false)
 	{

phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php

@@ -110,7 +110,7 @@ class obtain_board_data extends \phpbb\install\task_base implements \phpbb\insta
 	 *
 	 * @param bool $use_request_data Whether to use submited data
 	 *
-	 * @throws \phpbb\install\exception\user_interaction_required_exception When the user is required to provide data
+	 * @throws user_interaction_required_exception When the user is required to provide data
 	 */
 	protected function request_form_data($use_request_data = false)
 	{

phpBB/phpbb/install/module/obtain_data/task/obtain_database_data.php

@@ -108,7 +108,7 @@ class obtain_database_data extends \phpbb\install\task_base implements \phpbb\in
 	 *
 	 * @param bool $use_request_data Whether to use submited data
 	 *
-	 * @throws \phpbb\install\exception\user_interaction_required_exception When the user is required to provide data
+	 * @throws user_interaction_required_exception When the user is required to provide data
 	 */
 	protected function request_form_data($use_request_data = false)
 	{

phpBB/phpbb/install/module/obtain_data/task/obtain_file_updater_method.php

@@ -28,12 +28,12 @@ class obtain_file_updater_method extends task_base
 	protected $available_methods;
 
 	/**
-	 * @var \phpbb\install\helper\config
+	 * @var config
 	 */
 	protected $installer_config;
 
 	/**
-	 * @var \phpbb\install\helper\iohandler\iohandler_interface
+	 * @var iohandler_interface
 	 */
 	protected $iohandler;
 

phpBB/phpbb/install/module/obtain_data/task/obtain_update_ftp_data.php

@@ -22,12 +22,12 @@ use phpbb\install\task_base;
 class obtain_update_ftp_data extends task_base
 {
 	/**
-	 * @var \phpbb\install\helper\config
+	 * @var config
 	 */
 	protected $installer_config;
 
 	/**
-	 * @var \phpbb\install\helper\iohandler\iohandler_interface
+	 * @var iohandler_interface
 	 */
 	protected $iohandler;
 

phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php

@@ -21,12 +21,12 @@ use phpbb\install\task_base;
 class obtain_update_settings extends task_base
 {
 	/**
-	 * @var \phpbb\install\helper\config
+	 * @var config
 	 */
 	protected $installer_config;
 
 	/**
-	 * @var \phpbb\install\helper\iohandler\iohandler_interface
+	 * @var iohandler_interface
 	 */
 	protected $iohandler;
 

phpBB/phpbb/install/updater_configuration.php

@@ -22,7 +22,7 @@ class updater_configuration implements ConfigurationInterface
 	/**
 	 * Generates the configuration tree builder.
 	 *
-	 * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder
+	 * @return TreeBuilder The tree builder
 	 */
 	public function getConfigTreeBuilder()
 	{