diff --git a/phpBB/config/mimetype_guessers.yml b/phpBB/config/mimetype_guessers.yml index c19fb85254..2949b0aa96 100644 --- a/phpBB/config/mimetype_guessers.yml +++ b/phpBB/config/mimetype_guessers.yml @@ -11,9 +11,6 @@ services: mimetype.content_guesser: class: phpbb\mimetype\content_guesser - arguments: - - %core.root_path% - - @php_ini tags: - { name: mimetype.guessers } diff --git a/phpBB/phpbb/mimetype/content_guesser.php b/phpBB/phpbb/mimetype/content_guesser.php index e6554666fc..65c4703e2a 100644 --- a/phpBB/phpbb/mimetype/content_guesser.php +++ b/phpBB/phpbb/mimetype/content_guesser.php @@ -23,16 +23,6 @@ if (!defined('IN_PHPBB')) class content_guesser { - /** - * @var phpbb_root_path - */ - protected $phpbb_root_path; - - /** - * @var \phpbb\php\ini - */ - protected $php_ini; - /** * @var file extension map */ @@ -488,24 +478,7 @@ class content_guesser ); /** - * @const mime_magic_file - */ - const mime_magic_file = 'phpbb/mimetype/fixture/magic.mgc'; - - /** - * Construct a content_guesser object - * - * @param string $phpbb_root_path phpBB root path - * @param \phpbb\php\ini $php_ini - */ - public function __construct($phpbb_root_path, \phpbb\php\ini $php_ini) - { - $this->phpbb_root_path = $phpbb_root_path; - $this->php_ini = $php_ini; - } - - /** - * + * @inheritdoc */ public function is_supported() {