mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/13904] Switch around constructor arguments

Browse Source 
PHPBB3-13904
This commit is contained in:
Marc Alexander
2015-08-26 16:18:10 +02:00
parent cdde86ce7e
commit 36545d5cbe
7 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/phpbb/files/filespec.php
View File

@@ -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;

6
phpBB/phpbb/files/upload.php
View File

@@ -73,17 +73,17 @@ class upload
*
* @param filesystem_interface $filesystem
* @param factory $factory Files factory
* @param \phpbb\php\ini $php_ini ini_get() wrapper
* @param language $language Language class
* @param \phpbb\php\ini $php_ini ini_get() wrapper
* @param request_interface $request Request class
* @param string $phpbb_root_path phpBB root path
*/
public function __construct(filesystem_interface $filesystem, factory $factory, \phpbb\php\ini $php_ini, language $language, request_interface $request, $phpbb_root_path)
public function __construct(filesystem_interface $filesystem, factory $factory, language $language, \phpbb\php\ini $php_ini, request_interface $request, $phpbb_root_path)
{
$this->filesystem = $filesystem;
$this->factory = $factory;
$this->php_ini = $php_ini;
$this->language = $language;
$this->php_ini = $php_ini;
$this->request = $request;
$this->phpbb_root_path = $phpbb_root_path;
}