aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-07-15 18:00:26 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-09-09 08:28:01 +0200
commit5b21830ba81b5512b7c3f945a899da9103c80558 (patch)
tree2691bd112815b8efde67b05fd8e24c6b6d256d69 /phpBB/phpbb/files
parent[ticket/13904] Split up local_upload method (diff)
downloadphpbb-5b21830ba81b5512b7c3f945a899da9103c80558.tar.gz
phpbb-5b21830ba81b5512b7c3f945a899da9103c80558.tar.bz2
phpbb-5b21830ba81b5512b7c3f945a899da9103c80558.zip
[ticket/13904] Improve docblock
PHPBB3-13904
Diffstat (limited to 'phpBB/phpbb/files')
-rw-r--r--phpBB/phpbb/files/filespec.php4
-rw-r--r--phpBB/phpbb/files/types/local.php3
-rw-r--r--phpBB/phpbb/files/upload.php13
3 files changed, 9 insertions, 11 deletions
diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php
index 736610f6c2..ed64b7ff5c 100644
--- a/phpBB/phpbb/files/filespec.php
+++ b/phpBB/phpbb/files/filespec.php
@@ -83,7 +83,7 @@ class filespec
*/
protected $mimetype_guesser;
- /** @var \phpbb\language\language Language class */
+ /** @var language Language class */
protected $language;
/** @var string phpBB root path */
@@ -93,7 +93,7 @@ class filespec
* File upload class
*
* @param \phpbb\filesystem\filesystem_interface $phpbb_filesystem Filesystem
- * @param \phpbb\language\language $language Language
+ * @param language $language Language
* @param string $phpbb_root_path phpBB root path
* @param \phpbb\mimetype\guesser $mimetype_guesser Mime type guesser
* @param \phpbb\plupload\plupload $plupload Plupload
diff --git a/phpBB/phpbb/files/types/local.php b/phpBB/phpbb/files/types/local.php
index d439f01866..bb5994841f 100644
--- a/phpBB/phpbb/files/types/local.php
+++ b/phpBB/phpbb/files/types/local.php
@@ -15,7 +15,6 @@ namespace phpbb\files\types;
use \phpbb\files\factory;
use \phpbb\files\filespec;
-use \phpbb\files\upload;
use \phpbb\language\language;
use \phpbb\request\request_interface;
@@ -30,7 +29,7 @@ class local extends base
/** @var request_interface */
protected $request;
- /** @var upload */
+ /** @var \phpbb\files\upload */
protected $upload;
/**
diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php
index 471c9c378f..43f06c3503 100644
--- a/phpBB/phpbb/files/upload.php
+++ b/phpBB/phpbb/files/upload.php
@@ -15,7 +15,6 @@ namespace phpbb\files;
use \phpbb\filesystem\filesystem_interface;
use \phpbb\language\language;
-use \phpbb\plupload\plupload;
use \phpbb\request\request_interface;
/**
@@ -51,7 +50,7 @@ class upload
/** @var int Timeout for remote upload */
var $upload_timeout = 6;
- /** @var \phpbb\filesystem\filesystem_interface */
+ /** @var filesystem_interface */
protected $filesystem;
/** @var \phpbb\files\factory Files factory */
@@ -60,7 +59,7 @@ class upload
/** @var \phpbb\language\language Language class */
protected $language;
- /** @var \phpbb\request\request_interface Request class */
+ /** @var request_interface Request class */
protected $request;
/** @var string phpBB root path */
@@ -69,10 +68,10 @@ class upload
/**
* Init file upload class.
*
- * @param \phpbb\filesystem\filesystem_interface $filesystem
- * @param \phpbb\files\factory $factory Files factory
- * @param \phpbb\language\language $language Language class
- * @param \phpbb\request\request_interface $request Request class
+ * @param filesystem_interface $filesystem
+ * @param factory $factory Files factory
+ * @param language $language Language class
+ * @param request_interface $request Request class
* @param string $phpbb_root_path phpBB root path
*/
public function __construct(filesystem_interface $filesystem, factory $factory, language $language, request_interface $request, $phpbb_root_path)