mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00
Code Issues Releases Wiki Activity

[ticket/13904] Improve test coverage of filespec class

Browse Source 
PHPBB3-13904
This commit is contained in:
Marc Alexander
2015-09-03 17:20:54 +02:00
parent c3ccd423d2
commit 591995267a
6 changed files with 126 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/files/filespec.php
View File

@@ -75,6 +75,9 @@ class filespec
/** @var \bantu\IniGetWrapper\IniGetWrapper ini_get() wrapper class */
protected $php_ini;
/** @var \fastImageSize\fastImageSize */
protected $imagesize;
/** @var language Language class */
protected $language;
@@ -97,11 +100,12 @@ class filespec
* @param \phpbb\mimetype\guesser $mimetype_guesser Mime type guesser
* @param \phpbb\plupload\plupload $plupload Plupload
*/
public function __construct(\phpbb\filesystem\filesystem_interface $phpbb_filesystem, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, $phpbb_root_path, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
public function __construct(\phpbb\filesystem\filesystem_interface $phpbb_filesystem, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, \fastImageSize\fastImageSize $imagesize, $phpbb_root_path, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
{
$this->filesystem = $phpbb_filesystem;
$this->language = $language;
$this->php_ini = $php_ini;
$this->imagesize = $imagesize;
$this->phpbb_root_path = $phpbb_root_path;
$this->plupload = $plupload;
$this->mimetype_guesser = $mimetype_guesser;
@@ -500,10 +504,7 @@ class filespec
{
$this->width = $this->height = 0;
// Get imagesize class
$imagesize = new \fastImageSize\fastImageSize();
$this->image_info = $imagesize->getImageSize($this->destination_file, $this->mimetype);
$this->image_info = $this->imagesize->getImageSize($this->destination_file, $this->mimetype);
if ($this->image_info !== false)
{