makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13904] Remove unneeded parameters from avatars and fix tests

Browse source 
PHPBB3-13904
This commit is contained in:
Marc Alexander 2015-08-14 09:10:05 +02:00
parent 0a98fc2561
commit 57de896286
3 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/config/default/container/services_avatar.yml
View file

@ -61,10 +61,9 @@ services:
- @config - @config
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
- @filesystem
- @path_helper - @path_helper
- @mimetype.guesser
- @dispatcher - @dispatcher
- @files.factory
- @cache.driver - @cache.driver
calls: calls:
- [set_name, [avatar.driver.upload]] - [set_name, [avatar.driver.upload]]

18
phpBB/phpbb/avatar/driver/upload.php
View file

@ -18,22 +18,12 @@ namespace phpbb\avatar\driver;
*/ */
class upload extends \phpbb\avatar\driver\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 * @var \phpbb\event\dispatcher_interface
*/ */
protected $dispatcher; protected $dispatcher;
/** /**sts
* @var \phpbb\files\factory * @var \phpbb\files\factory
*/ */
protected $files_factory; protected $files_factory;
@ -44,21 +34,17 @@ class upload extends \phpbb\avatar\driver\driver
* @param \phpbb\config\config $config phpBB configuration * @param \phpbb\config\config $config phpBB configuration
* @param string $phpbb_root_path Path to the phpBB root * @param string $phpbb_root_path Path to the phpBB root
* @param string $php_ext PHP file extension * @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\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\event\dispatcher_interface $dispatcher phpBB Event dispatcher object
* @param \phpbb\files\factory $files_factory File classes factory * @param \phpbb\files\factory $files_factory File classes factory
* @param \phpbb\cache\driver\driver_interface $cache Cache driver * @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->config = $config;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $this->php_ext = $php_ext;
$this->filesystem = $filesystem;
$this->path_helper = $path_helper; $this->path_helper = $path_helper;
$this->mimetype_guesser = $mimetype_guesser;
$this->dispatcher = $dispatcher; $this->dispatcher = $dispatcher;
$this->files_factory = $files_factory; $this->files_factory = $files_factory;
$this->cache = $cache; $this->cache = $cache;

4
tests/avatar/manager_test.php
View file

@ -73,6 +73,8 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
->will($this->returnValue('avatar.driver.barfoo')); ->will($this->returnValue('avatar.driver.barfoo'));
$avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo); $avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo);
$files_factory = new \phpbb\files\factory($phpbb_container);
foreach ($this->avatar_drivers() as $driver) foreach ($this->avatar_drivers() as $driver)
{ {
if ($driver !== 'upload') if ($driver !== 'upload')
@ -81,7 +83,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
} }
else else
{ {
$cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($this->config, $phpbb_root_path, $phpEx, $filesystem, $path_helper, $guesser, $dispatcher, $cache)); $cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($this->config, $phpbb_root_path, $phpEx, $path_helper, $dispatcher, $files_factory, $cache));
} }
$cur_avatar->expects($this->any()) $cur_avatar->expects($this->any())
->method('get_name') ->method('get_name')