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

Merge pull request #3524 from marc1706/ticket/8672

Browse Source 
[ticket/8672] Add class for retrieving imagesize without download
This commit is contained in:
Tristan Darricau
2015-04-27 16:26:40 +02:00
parent e7d2977401 9088f44863
commit 734b89e75c
24 changed files with 221 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/upload/filespec_test.php
View File

@@ -289,7 +289,7 @@ class phpbb_filespec_test extends phpbb_test_case
array('txt_copy', 'txt_as_img', 'image/jpg', 'txt', false, true),
array('txt_copy_2', 'txt_moved', 'text/plain', 'txt', false, true),
array('jpg_copy', 'jpg_moved', 'image/png', 'jpg', false, true),
array('png_copy', 'png_moved', 'image/png', 'jpg', 'IMAGE_FILETYPE_MISMATCH', true),
array('png_copy', 'png_moved', 'image/png', 'jpg', 'IMAGE_FILETYPE_MISMATCH png jpg', true),
);
}

BIN
tests/upload/fixture/bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 64 B

BIN
tests/upload/fixture/iff Normal file
View File

Binary file not shown.

BIN
tests/upload/fixture/iff_maya Normal file
View File

Binary file not shown.

BIN
tests/upload/fixture/jp2 Normal file
View File

Binary file not shown.

BIN
tests/upload/fixture/jpx Normal file
View File

Binary file not shown.

BIN
tests/upload/fixture/psd Normal file
View File

Binary file not shown.

BIN
tests/upload/fixture/tif_compressed Normal file
View File

Binary file not shown.

BIN
tests/upload/fixture/tif_msb Normal file
View File

Binary file not shown.

BIN
tests/upload/fixture/wbmp Normal file
View File

Binary file not shown.

99
tests/upload/imagesize_test.php Normal file
View File

@@ -0,0 +1,99 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
require_once(__DIR__ . '/../../phpBB/includes/functions.php');
class phpbb_upload_imagesize_test extends \phpbb_test_case
{
/** @var \fastImageSize\fastImageSize */
protected $imagesize;
/** @var string Path to fixtures */
protected $path;
public function setUp()
{
parent::setUp();
$this->imagesize = new \fastImageSize\fastImageSize();
$this->path = __DIR__ . '/fixture/';
}
public function data_get_imagesize()
{
return array(
array('foobar', 'image/bmp', false),
array('png', 'image/png', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
array('gif', 'image/png', false),
array('png', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
array('gif', 'image/gif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_GIF)),
array('jpg', 'image/gif', false),
array('gif', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_GIF)),
array('jpg', 'image/jpg', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
array('jpg', 'image/jpeg', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
array('png', 'image/jpg', false),
array('jpg', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
array('psd', 'image/psd', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)),
array('psd', 'image/photoshop', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)),
array('jpg', 'image/psd', false),
array('psd', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)),
array('bmp', 'image/bmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_BMP)),
array('png', 'image/bmp', false),
array('bmp', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_BMP)),
array('tif', 'image/tif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
array('png', 'image/tif', false),
array('tif', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
array('tif_compressed', 'image/tif', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
array('png', 'image/tiff', false),
array('tif_compressed', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
array('tif_msb', 'image/tif', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_MM)),
array('tif_msb', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_MM)),
array('wbmp', 'image/wbmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)),
array('wbmp', 'image/vnd.wap.wbmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)),
array('png', 'image/vnd.wap.wbmp', false),
array('wbmp', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)),
array('iff', 'image/iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
array('iff', 'image/x-iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
array('iff_maya', 'iamge/iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
array('png', 'image/iff', false),
array('png', 'image/x-iff', false),
array('iff', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
array('iff_maya', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
array('jp2', 'image/jp2', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
array('jp2', 'image/jpx', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
array('jp2', 'image/jpm', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
array('jpg', 'image/jp2', false),
array('jpx', 'image/jpx', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
array('jp2', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
array('jpx', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
);
}
/**
* @dataProvider data_get_imagesize
*/
public function test_get_imagesize($file, $mime_type, $expected)
{
$this->assertEquals($expected, $this->imagesize->getImageSize($this->path . $file, $mime_type));
}
public function test_get_imagesize_remote()
{
$this->assertSame(array(
'width' => 80,
'height' => 80,
'type' => IMAGETYPE_JPEG,
),
$this->imagesize->getImageSize('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg'));
}
}