Added swf and swc (compressed swf) test cases and added 'bits' portion to

the expected bmp test results.

diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt
index 3a543a79913181bd17d21895fdcad160cdd3bc2d..8e107a6f4873d80f8655ae30ec90e39f17e1fc39 100644 (file)
--- a/ext/standard/tests/image/getimagesize.phpt
+++ b/ext/standard/tests/image/getimagesize.phpt
@@ -23,9 +23,22 @@ GetImageSize()
        var_dump($result);
 ?>
 --EXPECT--
-array(9) {
-  ["test1pix.bmp"]=>
+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"
+  }
+  ["test1pix.bmp"]=>
+  array(6) {
     [0]=>
     int(1)
     [1]=>
@@ -34,6 +47,8 @@ array(9) {
     int(6)
     [3]=>
     string(20) "width="1" height="1""
+    ["bits"]=>
+    int(24)
     ["mime"]=>
     string(9) "image/bmp"
   }
@@ -144,6 +159,19 @@ array(9) {
     ["mime"]=>
     string(9) "image/psd"
   }
+  ["test4pix.swf"]=>
+  array(5) {
+    [0]=>
+    int(550)
+    [1]=>
+    int(400)
+    [2]=>
+    int(4)
+    [3]=>
+    string(24) "width="550" height="400""
+    ["mime"]=>
+    string(29) "application/x-shockwave-flash"
+  }
   ["test4pix.tif"]=>
   array(5) {
     [0]=>
@@ -157,4 +185,4 @@ array(9) {
     ["mime"]=>
     string(10) "image/tiff"
   }
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/image/test13pix.swf b/ext/standard/tests/image/test13pix.swf
new file mode 100755 (executable)
index 0000000..0d40cb7
Binary files /dev/null and b/ext/standard/tests/image/test13pix.swf differ

diff --git a/ext/standard/tests/image/test4pix.swf b/ext/standard/tests/image/test4pix.swf
new file mode 100755 (executable)
index 0000000..b1d41c6
Binary files /dev/null and b/ext/standard/tests/image/test4pix.swf differ