diff options
| -rw-r--r-- | ext/standard/tests/image/getimagesize.phpt | 17 | ||||
| -rw-r--r-- | ext/standard/tests/image/image_type_to_mime_type.phpt | 6 | ||||
| -rw-r--r-- | ext/standard/tests/image/skipif_imagetype.inc | 3 |
3 files changed, 5 insertions, 21 deletions
diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt index 8e107a6f48..57310c32f7 100644 --- a/ext/standard/tests/image/getimagesize.phpt +++ b/ext/standard/tests/image/getimagesize.phpt @@ -11,7 +11,7 @@ GetImageSize() $result = array(); $files = array(); while (($file = readdir($dir)) !== FALSE) { - if (preg_match('/^test.+pix\./',$file)) { + if (preg_match('/^test.+pix\./',$file) && $file != "test13pix.swf") { $files[] = $file; } } @@ -23,20 +23,7 @@ GetImageSize() var_dump($result); ?> --EXPECT-- -array(11) { - ["test13pix.swf"]=> - array(5) { - [0]=> - int(550) - [1]=> - int(400) - [2]=> - int(13) - [3]=> - string(24) "width="550" height="400"" - ["mime"]=> - string(29) "application/x-shockwave-flash" - } +array(10) { ["test1pix.bmp"]=> array(6) { [0]=> diff --git a/ext/standard/tests/image/image_type_to_mime_type.phpt b/ext/standard/tests/image/image_type_to_mime_type.phpt index 1def8fe02a..0f2eed1e32 100644 --- a/ext/standard/tests/image/image_type_to_mime_type.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type.phpt @@ -12,7 +12,7 @@ image_type_to_mime_type() $result = array(); $files = array(); while (($file = readdir($dir)) !== FALSE) { - if (preg_match('/^test.+pix\./',$file)) { + if (preg_match('/^test.+pix\./',$file) && $file != "test13pix.swf") { $files[] = $file; } } @@ -25,9 +25,7 @@ image_type_to_mime_type() var_dump($result); ?> --EXPECT-- -array(11) { - ["test13pix.swf"]=> - string(29) "application/x-shockwave-flash" +array(10) { ["test1pix.bmp"]=> string(9) "image/bmp" ["test1pix.jpc"]=> diff --git a/ext/standard/tests/image/skipif_imagetype.inc b/ext/standard/tests/image/skipif_imagetype.inc index 4c0cb3c6ba..827f10c179 100644 --- a/ext/standard/tests/image/skipif_imagetype.inc +++ b/ext/standard/tests/image/skipif_imagetype.inc @@ -2,7 +2,7 @@ if (!defined('IMAGETYPE_GIF')) die('skip images of type GIF not supported'); if (!defined('IMAGETYPE_JPEG')) die('skip images of type JPEG not supported'); if (!defined('IMAGETYPE_PNG')) die('skip images of type PNG not supported'); -//if (!defined('IMAGETYPE_SWF')) die('skip images of type SWF not supported'); +if (!defined('IMAGETYPE_SWF')) die('skip images of type SWF not supported'); if (!defined('IMAGETYPE_PSD')) die('skip images of type PSD not supported'); if (!defined('IMAGETYPE_BMP')) die('skip images of type BMP not supported'); if (!defined('IMAGETYPE_TIFF_II')) die('skip images of type TIFF not supported'); @@ -11,6 +11,5 @@ if (!defined('IMAGETYPE_JPC')) die('skip images of type JPC not supported'); //if (!defined('IMAGETYPE_JP2')) die('skip images of type JP2 not supported'); //if (!defined('IMAGETYPE_JPX')) die('skip images of type JPX not supported'); //if (!defined('IMAGETYPE_JB2')) die('skip images of type JB2 not supported'); -//if (!defined('IMAGETYPE_SWC')) die('skip images of type SWC not supported'); // SWC requires zlib if (!defined('IMAGETYPE_IFF')) die('skip images of type IFF not supported'); ?> |