diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-26 16:18:10 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-09 08:28:11 +0200 |
| commit | 36545d5cbe7188efbedf2e1f44b1a7b9617b50c1 (patch) | |
| tree | 60d7452d7cf146c9f3af3fbfa7d1d07f15778571 /phpBB/phpbb/files/filespec.php | |
| parent | cdde86ce7e0c594fad5992789b3fae466bd526cc (diff) | |
| download | forums-36545d5cbe7188efbedf2e1f44b1a7b9617b50c1.tar forums-36545d5cbe7188efbedf2e1f44b1a7b9617b50c1.tar.gz forums-36545d5cbe7188efbedf2e1f44b1a7b9617b50c1.tar.bz2 forums-36545d5cbe7188efbedf2e1f44b1a7b9617b50c1.tar.xz forums-36545d5cbe7188efbedf2e1f44b1a7b9617b50c1.zip | |
[ticket/13904] Switch around constructor arguments
PHPBB3-13904
Diffstat (limited to 'phpBB/phpbb/files/filespec.php')
| -rw-r--r-- | phpBB/phpbb/files/filespec.php | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php index 34d86116c2..48e12f23ef 100644 --- a/phpBB/phpbb/files/filespec.php +++ b/phpBB/phpbb/files/filespec.php @@ -69,9 +69,7 @@ class filespec /** @var upload Instance of upload class */ public $upload; - /** - * @var \phpbb\filesystem\filesystem_interface - */ + /** @var \phpbb\filesystem\filesystem_interface */ protected $filesystem; /** @var \phpbb\php\ini ini_get() wrapper class */ @@ -83,33 +81,27 @@ class filespec /** @var string phpBB root path */ protected $phpbb_root_path; - /** - * The plupload object - * @var \phpbb\plupload\plupload - */ + /** @var \phpbb\plupload\plupload The plupload object */ protected $plupload; - /** - * phpBB Mimetype guesser - * @var \phpbb\mimetype\guesser - */ + /** @var \phpbb\mimetype\guesser phpBB Mimetype guesser */ protected $mimetype_guesser; /** * File upload class * * @param \phpbb\filesystem\filesystem_interface $phpbb_filesystem Filesystem - * @param \phpbb\php\ini $php_ini ini_get() wrapper * @param language $language Language + * @param \phpbb\php\ini $php_ini ini_get() wrapper * @param string $phpbb_root_path phpBB root path * @param \phpbb\mimetype\guesser $mimetype_guesser Mime type guesser * @param \phpbb\plupload\plupload $plupload Plupload */ - public function __construct(\phpbb\filesystem\filesystem_interface $phpbb_filesystem, \phpbb\php\ini $php_ini, language $language, $phpbb_root_path, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null) + public function __construct(\phpbb\filesystem\filesystem_interface $phpbb_filesystem, language $language, \phpbb\php\ini $php_ini, $phpbb_root_path, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null) { $this->filesystem = $phpbb_filesystem; - $this->php_ini = $php_ini; $this->language = $language; + $this->php_ini = $php_ini; $this->phpbb_root_path = $phpbb_root_path; $this->plupload = $plupload; $this->mimetype_guesser = $mimetype_guesser; |