diff options
author | Marc Alexander <admin@m-a-styles.de> | 2015-08-14 09:10:05 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-09 08:27:42 +0200 |
commit | 57de89628622a80fcb386c0d95724fe4c6148929 (patch) | |
tree | 481b83e609fe57214662ef8e9c36c5ec0fba1c9e /phpBB/phpbb | |
parent | 0a98fc256157c2d4861693e693731f7b2d7a9ac7 (diff) | |
download | forums-57de89628622a80fcb386c0d95724fe4c6148929.tar forums-57de89628622a80fcb386c0d95724fe4c6148929.tar.gz forums-57de89628622a80fcb386c0d95724fe4c6148929.tar.bz2 forums-57de89628622a80fcb386c0d95724fe4c6148929.tar.xz forums-57de89628622a80fcb386c0d95724fe4c6148929.zip |
[ticket/13904] Remove unneeded parameters from avatars and fix tests
PHPBB3-13904
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index d330eadd18..e848f9d2e7 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -19,21 +19,11 @@ namespace phpbb\avatar\driver; class upload extends \phpbb\avatar\driver\driver { /** - * @var \phpbb\filesystem\filesystem_interface - */ - protected $filesystem; - - /** - * @var \phpbb\mimetype\guesser - */ - protected $mimetype_guesser; - - /** * @var \phpbb\event\dispatcher_interface */ protected $dispatcher; - /** + /**sts * @var \phpbb\files\factory */ protected $files_factory; @@ -44,21 +34,17 @@ class upload extends \phpbb\avatar\driver\driver * @param \phpbb\config\config $config phpBB configuration * @param string $phpbb_root_path Path to the phpBB root * @param string $php_ext PHP file extension - * @param \phpbb\filesystem\filesystem_interface phpBB filesystem helper * @param \phpbb\path_helper $path_helper phpBB path helper - * @param \phpbb\mimetype\guesser $mimetype_guesser Mimetype guesser * @param \phpbb\event\dispatcher_interface $dispatcher phpBB Event dispatcher object * @param \phpbb\files\factory $files_factory File classes factory * @param \phpbb\cache\driver\driver_interface $cache Cache driver */ - public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\filesystem\filesystem_interface $filesystem, \phpbb\path_helper $path_helper, \phpbb\mimetype\guesser $mimetype_guesser, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\files\factory $files_factory, \phpbb\cache\driver\driver_interface $cache = null) + public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\files\factory $files_factory, \phpbb\cache\driver\driver_interface $cache = null) { $this->config = $config; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; - $this->filesystem = $filesystem; $this->path_helper = $path_helper; - $this->mimetype_guesser = $mimetype_guesser; $this->dispatcher = $dispatcher; $this->files_factory = $files_factory; $this->cache = $cache; |