mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/15276] Use mimetype guesser

Browse Source 
PHPBB3-15276
This commit is contained in:
Rubén Calvo
2017-08-11 00:50:19 +02:00
parent 09856aeb26
commit c3e9aa1c18
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
phpBB/phpbb/storage/adapter/local.php
View File

@@ -18,6 +18,7 @@ use phpbb\storage\exception\exception;
use phpbb\filesystem\exception\filesystem_exception;
use phpbb\filesystem\filesystem;
use phpbb\filesystem\helper as filesystem_helper;
use phpbb\mimetype\guesser;
use FastImageSize\FastImageSize;
/**
@@ -33,12 +34,19 @@ class local implements adapter_interface, stream_interface
protected $filesystem;
/**
* Filesystem component
* FastImageSize
*
* @var \FastImageSize\FastImageSize
*/
protected $imagesize;
/**
* Mimetype Guesser component
*
* @var \phpbb\mimetype\guesser
*/
protected $mimetype_guesser;
/**
* @var string path
*/
@@ -52,10 +60,11 @@ class local implements adapter_interface, stream_interface
/**
* Constructor
*/
public function __construct(filesystem $filesystem, FastImageSize $imagesize, $phpbb_root_path)
public function __construct(filesystem $filesystem, FastImageSize $imagesize, guesser $mimetype_guesser, $phpbb_root_path)
{
$this->filesystem = $filesystem;
$this->imagesize = $imagesize;
$this->mimetype_guesser = $mimetype_guesser;
$this->phpbb_root_path = $phpbb_root_path;
}
@@ -275,17 +284,7 @@ class local implements adapter_interface, stream_interface
*/
public function file_mimetype($path)
{
if (class_exists('finfo'))
{
$finfo = new \finfo(FILEINFO_MIME_TYPE);
$mimetype = $finfo->file($this->root_path . $path);
}
else
{
$mimetype = mime_content_type($this->root_path . $path);
}
return ['mimetype' => $mimetype];
return ['mimetype' => $this->mimetype_guesser->guess($this->root_path . $path)];
}
/**