mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge PR #1147 branch 'marc1706/ticket/10763' into develop

Browse Source 
* marc1706/ticket/10763:
  [ticket/10763] Use self when calling get_extension() in filespec class
  [ticket/10763] Make functions for remote avatars static
This commit is contained in:
Oleg Pudeyev
2012-12-18 04:11:56 -05:00
parent da2f0757d7 4ae0c78782
commit 3af5531d0d
3 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/mock/fileupload.php
View File

@@ -20,33 +20,4 @@ class phpbb_mock_fileupload
{
return true;
}
/**
* Copied verbatim from phpBB/includes/functions_upload.php's fileupload
* class to ensure the correct behaviour of filespec::move_file.
*
* Maps file extensions to the constant in second index of the array
* returned by getimagesize()
*/
public function image_types()
{
return array(
IMAGETYPE_GIF => array('gif'),
IMAGETYPE_JPEG => array('jpg', 'jpeg'),
IMAGETYPE_PNG => array('png'),
IMAGETYPE_SWF => array('swf'),
IMAGETYPE_PSD => array('psd'),
IMAGETYPE_BMP => array('bmp'),
IMAGETYPE_TIFF_II => array('tif', 'tiff'),
IMAGETYPE_TIFF_MM => array('tif', 'tiff'),
IMAGETYPE_JPC => array('jpg', 'jpeg'),
IMAGETYPE_JP2 => array('jpg', 'jpeg'),
IMAGETYPE_JPX => array('jpg', 'jpeg'),
IMAGETYPE_JB2 => array('jpg', 'jpeg'),
IMAGETYPE_SWC => array('swc'),
IMAGETYPE_IFF => array('iff'),
IMAGETYPE_WBMP => array('wbmp'),
IMAGETYPE_XBM => array('xbm'),
);
}
}

3
tests/upload/filespec_test.php
View File

@@ -205,8 +205,7 @@ class phpbb_filespec_test extends phpbb_test_case
*/
public function test_get_extension($filename, $expected)
{
$filespec = $this->get_filespec();
$this->assertEquals($expected, $filespec->get_extension($filename));
$this->assertEquals($expected, filespec::get_extension($filename));
}
public function is_image_variables()