Merge pull request #6102 from CHItA/ticket/16671_master

[ticket/16671] Code style fixes

phpBB/phpbb/attachment/delete.php

@@ -13,10 +13,10 @@
 
 namespace phpbb\attachment;
 
-use \phpbb\config\config;
-use \phpbb\db\driver\driver_interface;
-use \phpbb\event\dispatcher;
-use \phpbb\storage\storage;
+use phpbb\config\config;
+use phpbb\db\driver\driver_interface;
+use phpbb\event\dispatcher;
+use phpbb\storage\storage;
 
 /**
  * Attachment delete class

phpBB/phpbb/attachment/upload.php

@@ -14,14 +14,14 @@
 namespace phpbb\attachment;
 
 use phpbb\auth\auth;
-use \phpbb\cache\service;
-use \phpbb\config\config;
-use \phpbb\event\dispatcher;
-use \phpbb\language\language;
-use \phpbb\plupload\plupload;
-use \phpbb\storage\storage;
-use \phpbb\filesystem\temp;
-use \phpbb\user;
+use phpbb\cache\service;
+use phpbb\config\config;
+use phpbb\event\dispatcher;
+use phpbb\language\language;
+use phpbb\plupload\plupload;
+use phpbb\storage\storage;
+use phpbb\filesystem\temp;
+use phpbb\user;
 
 /**
  * Attachment upload class

phpBB/phpbb/avatar/driver/upload.php

@@ -14,7 +14,7 @@
 namespace phpbb\avatar\driver;
 
 use bantu\IniGetWrapper\IniGetWrapper;
-use \phpbb\storage\exception\exception as storage_exception;
+use phpbb\storage\exception\exception as storage_exception;
 
 /**
 * Handles avatars uploaded to the board

phpBB/phpbb/composer/extension_manager.php

@@ -29,12 +29,12 @@ use phpbb\filesystem\filesystem;
 class extension_manager extends manager
 {
 	/**
-	 * @var \phpbb\extension\manager
+	 * @var manager
 	 */
 	protected $extension_manager;
 
 	/**
-	 * @var \phpbb\filesystem\filesystem
+	 * @var filesystem
 	 */
 	protected $filesystem;
 

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

@@ -31,7 +31,7 @@ class install extends \phpbb\console\command\command
 	protected $manager;
 
 	/**
-	 * @var \phpbb\language\language
+	 * @var language
 	 */
 	protected $language;
 

phpBB/phpbb/console/command/extension/manage.php

@@ -30,7 +30,7 @@ class manage extends \phpbb\console\command\command
 	protected $manager;
 
 	/**
-	 * @var \phpbb\language\language
+	 * @var language
 	 */
 	protected $language;
 

phpBB/phpbb/console/command/extension/remove.php

@@ -31,7 +31,7 @@ class remove extends \phpbb\console\command\command
 	protected $manager;
 
 	/**
-	 * @var \phpbb\language\language
+	 * @var language
 	 */
 	protected $language;
 

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

@@ -30,7 +30,7 @@ class update extends \phpbb\console\command\command
 	protected $manager;
 
 	/**
-	 * @var \phpbb\language\language
+	 * @var language
 	 */
 	protected $language;
 

phpBB/phpbb/filesystem/helper.php

@@ -18,7 +18,7 @@ use Symfony\Component\Filesystem\Filesystem as symfony_filesystem;
 class helper
 {
 	/**
-	* @var \Symfony\Component\Filesystem\Filesystem
+	* @var symfony_filesystem
 	*/
 	protected static $symfony_filesystem;
 
@@ -371,7 +371,7 @@ class helper
 	/**
 	 * Get an instance of symfony's filesystem object.
 	 *
-	 * @return \Symfony\Component\Filesystem\Filesystem	Symfony filesystem
+	 * @return symfony_filesystem	Symfony filesystem
 	 */
 	protected static function get_symfony_filesystem()
 	{

phpBB/phpbb/install/module/install_data/task/add_modules.php

@@ -31,7 +31,7 @@ class add_modules extends \phpbb\install\task_base
 	protected $db;
 
 	/**
-	 * @var \phpbb\install\helper\iohandler\iohandler_interface
+	 * @var iohandler_interface
 	 */
 	protected $iohandler;
 

phpBB/phpbb/storage/adapter/local.php

@@ -29,21 +29,21 @@ class local implements adapter_interface, stream_interface
 	/**
 	 * Filesystem component
 	 *
-	 * @var \phpbb\filesystem\filesystem
+	 * @var filesystem
 	 */
 	protected $filesystem;
 
 	/**
 	 * FastImageSize
 	 *
-	 * @var \FastImageSize\FastImageSize
+	 * @var FastImageSize
 	 */
 	protected $imagesize;
 
 	/**
 	 * Mimetype Guesser component
 	 *
-	 * @var \phpbb\mimetype\guesser
+	 * @var guesser
 	 */
 	protected $mimetype_guesser;
 
@@ -209,7 +209,7 @@ class local implements adapter_interface, stream_interface
 	 *
 	 * @param string	$path	The directory path
 	 *
-	 * @throws \phpbb\storage\exception\exception	On any directory creation failure
+	 * @throws exception	On any directory creation failure
 	 */
 	protected function create_dir($path)
 	{
@@ -342,7 +342,7 @@ class local implements adapter_interface, stream_interface
 	 *
 	 * @param string	$path	The file
 	 *
-	 * @throws \phpbb\storage\exception\exception		When cannot get size
+	 * @throws exception		When cannot get size
 	 *
 	 * @return array Properties
 	 */

phpBB/phpbb/storage/adapter_factory.php

@@ -20,26 +20,26 @@ use phpbb\storage\exception\exception;
 class adapter_factory
 {
 	/**
-	 * @var \phpbb\config\config
+	 * @var config
 	 */
 	protected $config;
 
 	/**
-	 * @var \phpbb\di\service_collection
+	 * @var service_collection
 	 */
 	protected $adapters;
 
 	/**
-	 * @var \phpbb\di\service_collection
+	 * @var service_collection
 	 */
 	protected $providers;
 
 	/**
 	 * Constructor
 	 *
-	 * @param \phpbb\config\config				$config
-	 * @param \phpbb\di\service_collection		$adapters
-	 * @param \phpbb\di\service_collection		$providers
+	 * @param config				$config
+	 * @param service_collection	$adapters
+	 * @param service_collection	$providers
 	 */
 	public function __construct(config $config, service_collection $adapters, service_collection $providers)
 	{

phpBB/phpbb/storage/file_info.php

@@ -19,7 +19,7 @@ use phpbb\storage\adapter\adapter_interface;
 class file_info
 {
 	/**
-	 * @var \phpbb\storage\adapter\adapter_interface
+	 * @var adapter_interface
 	 */
 	protected $adapter;
 

phpBB/phpbb/storage/storage.php

@@ -28,13 +28,13 @@ class storage
 	protected $adapter;
 
 	/**
-	 * @var \phpbb\db\driver\driver_interface
+	 * @var db
 	 */
 	protected $db;
 
 	/**
 	 * Cache driver
-	 * @var \phpbb\cache\driver\driver_interface
+	 * @var cache
 	 */
 	protected $cache;
 
@@ -56,8 +56,8 @@ class storage
 	/**
 	 * Constructor
 	 *
-	 * @param \phpbb\db\driver\driver_interface	$db
-	 * @param \phpbb\cache\driver\driver_interface	$cache
+	 * @param db								$db
+	 * @param cache								$cache
 	 * @param \phpbb\storage\adapter_factory	$factory
 	 * @param string							$storage_name
 	 * @param string							$storage_table
@@ -102,8 +102,8 @@ class storage
 	 * @param string	path		The file to be written to.
 	 * @param string	content		The data to write into the file.
 	 *
-	 * @throws \phpbb\storage\exception\exception		When the file already exists
-	 * 													When the file cannot be written
+	 * @throws exception	When the file already exists
+	 * 						When the file cannot be written
 	 */
 	public function put_contents($path, $content)
 	{
@@ -121,8 +121,8 @@ class storage
 	 *
 	 * @param string	$path	The file to read
 	 *
-	 * @throws \phpbb\storage\exception\exception	When the file doesn't exist
-	 * 													When cannot read file contents
+	 * @throws exception	When the file doesn't exist
+	 * 						When cannot read file contents
 	 *
 	 * @return string	Returns file contents
 	 *
@@ -155,8 +155,8 @@ class storage
 	 *
 	 * @param string	$path	file/directory to remove
 	 *
-	 * @throws \phpbb\storage\exception\exception		When removal fails
-	 *													When the file doesn't exist
+	 * @throws exception	When removal fails
+	 *						When the file doesn't exist
 	 */
 	public function delete($path)
 	{
@@ -175,9 +175,9 @@ class storage
 	 * @param string	$path_orig	The original file/direcotry
 	 * @param string	$path_dest	The target file/directory
 	 *
-	 * @throws \phpbb\storage\exception\exception		When the file doesn't exist
-	 *													When target exists
-	 * 													When file/directory cannot be renamed
+	 * @throws exception	When the file doesn't exist
+	 *						When target exists
+	 * 						When file/directory cannot be renamed
 	 */
 	public function rename($path_orig, $path_dest)
 	{
@@ -201,9 +201,9 @@ class storage
 	 * @param string	$path_orig	The original filename
 	 * @param string	$path_dest	The target filename
 	 *
-	 * @throws \phpbb\storage\exception\exception		When the file doesn't exist
-	 *													When target exists
-	 * 													When the file cannot be copied
+	 * @throws exception	When the file doesn't exist
+	 *						When target exists
+	 * 						When the file cannot be copied
 	 */
 	public function copy($path_orig, $path_dest)
 	{
@@ -226,8 +226,8 @@ class storage
 	 *
 	 * @param string	$path	File to read
 	 *
-	 * @throws \phpbb\storage\exception\exception		When the file doesn't exist
-	 *													When unable to open file
+	 * @throws exception	When the file doesn't exist
+	 *						When unable to open file
 	 *
 	 * @return resource	Returns a file pointer
 	 */
@@ -262,8 +262,8 @@ class storage
 	 * @param string	$path		The target file
 	 * @param resource	$resource	The resource
 	 *
-	 * @throws \phpbb\storage\exception\exception		When the file exist
-	 *													When target file cannot be created
+	 * @throws exception	When the file exist
+	 *						When target file cannot be created
 	 */
 	public function write_stream($path, $resource)
 	{
@@ -484,7 +484,7 @@ class storage
 	/**
 	 * Get space available in bytes
 	 *
-	 * @throws \phpbb\storage\exception\exception		When unable to retrieve available storage space
+	 * @throws exception		When unable to retrieve available storage space
 	 *
 	 * @return float	Returns available space
 	 */