iliaa Thu Nov 7 21:50:28 2002 EDT
Modified files:
/php4/ext/standard/tests/image getimagesize.phpt
image_type_to_mime_type.phpt
skipif_imagetype.inc
Log:
Move SWC (compressed swf) check into a separate test because this check
requires zlib. This separation allows us to skip the test if zlib is
not available and not fail.
Index: php4/ext/standard/tests/image/getimagesize.phpt
diff -u php4/ext/standard/tests/image/getimagesize.phpt:1.2
php4/ext/standard/tests/image/getimagesize.phpt:1.3
--- php4/ext/standard/tests/image/getimagesize.phpt:1.2 Thu Nov 7 11:38:57 2002
+++ php4/ext/standard/tests/image/getimagesize.phpt Thu Nov 7 21:50:28 2002
@@ -11,7 +11,7 @@
$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 @@
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]=>
Index: php4/ext/standard/tests/image/image_type_to_mime_type.phpt
diff -u php4/ext/standard/tests/image/image_type_to_mime_type.phpt:1.2
php4/ext/standard/tests/image/image_type_to_mime_type.phpt:1.3
--- php4/ext/standard/tests/image/image_type_to_mime_type.phpt:1.2 Thu Nov 7
11:42:32 2002
+++ php4/ext/standard/tests/image/image_type_to_mime_type.phpt Thu Nov 7 21:50:28
+2002
@@ -12,7 +12,7 @@
$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 @@
var_dump($result);
?>
--EXPECT--
-array(11) {
- ["test13pix.swf"]=>
- string(29) "application/x-shockwave-flash"
+array(10) {
["test1pix.bmp"]=>
string(9) "image/bmp"
["test1pix.jpc"]=>
Index: php4/ext/standard/tests/image/skipif_imagetype.inc
diff -u php4/ext/standard/tests/image/skipif_imagetype.inc:1.1
php4/ext/standard/tests/image/skipif_imagetype.inc:1.2
--- php4/ext/standard/tests/image/skipif_imagetype.inc:1.1 Sun Nov 3 08:52:45
2002
+++ php4/ext/standard/tests/image/skipif_imagetype.inc Thu Nov 7 21:50:28 2002
@@ -1,16 +1,15 @@
-<?php
-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_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');
-if (!defined('IMAGETYPE_TIFF_MM')) die('skip images of type TIFF not supported');
-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');
-?>
+<?php
+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_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');
+if (!defined('IMAGETYPE_TIFF_MM')) die('skip images of type TIFF not supported');
+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_IFF')) die('skip images of type IFF not supported');
+?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
