diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml index d5d17b54a0..5f58ed9f75 100644 --- a/phpBB/config/default/container/services_avatar.yml +++ b/phpBB/config/default/container/services_avatar.yml @@ -65,7 +65,6 @@ services: - '@path_helper' - '@dispatcher' - '@files.factory' - - '@cache.driver' calls: - [set_name, [avatar.driver.upload]] tags: diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 32a902604d..f1ea533a89 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -61,11 +61,6 @@ class upload extends \phpbb\avatar\driver\driver */ protected $php_ini; - /** - * @var \phpbb\cache\driver\driver_interface - */ - protected $cache; - /** * Construct a driver object * @@ -77,9 +72,8 @@ class upload extends \phpbb\avatar\driver\driver * @param \phpbb\event\dispatcher_interface $dispatcher phpBB Event dispatcher object * @param \phpbb\files\factory $files_factory File classes factory * @param IniGetWrapper $php_ini ini_get() wrapper - * @param \phpbb\cache\driver\driver_interface $cache Cache driver */ - public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\storage\storage $storage, \phpbb\path_helper $path_helper, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\files\factory $files_factory, IniGetWrapper $php_ini, \phpbb\cache\driver\driver_interface $cache = null) + public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\storage\storage $storage, \phpbb\path_helper $path_helper, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\files\factory $files_factory, IniGetWrapper $php_ini) { $this->config = $config; $this->phpbb_root_path = $phpbb_root_path; @@ -89,7 +83,6 @@ class upload extends \phpbb\avatar\driver\driver $this->dispatcher = $dispatcher; $this->files_factory = $files_factory; $this->php_ini = $php_ini; - $this->cache = $cache; } /**