- killed off UEXPECT

diff --git a/ext/standard/tests/image/bug13213.phpt b/ext/standard/tests/image/bug13213.phpt
index a19190584703847dc4502f2b932bb4d13071fcdd..7be72e7a201ba4641bdc01c1b37faad8ca0b5ba6 100644 (file)
--- a/ext/standard/tests/image/bug13213.phpt
+++ b/ext/standard/tests/image/bug13213.phpt
@@ -5,23 +5,6 @@ Bug #13213 (GetImageSize and wrong JPEG Comments)
 var_dump(GetImageSize(dirname(__FILE__).'/bug13213.jpg'));
 ?>
 --EXPECT--
-array(7) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  string(20) "width="1" height="1""
-  ["bits"]=>
-  int(8)
-  ["channels"]=>
-  int(3)
-  ["mime"]=>
-  string(10) "image/jpeg"
-}
---UEXPECT--
 array(7) {
   [0]=>
   int(1)

diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt
index 368da04ceaddf4cccebe251751a5c75528fcf641..eeb82f059956bd525415881a7fa817eacb2e08b8 100644 (file)
--- a/ext/standard/tests/image/getimagesize.phpt
+++ b/ext/standard/tests/image/getimagesize.phpt
@@ -23,178 +23,6 @@ GetImageSize()
        var_dump($result);
 ?>
 --EXPECT--
-array(11) {
-  ["test1pix.bmp"]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(1)
-    [2]=>
-    int(6)
-    [3]=>
-    string(20) "width="1" height="1""
-    ["bits"]=>
-    int(24)
-    ["mime"]=>
-    string(9) "image/bmp"
-  }
-  ["test1pix.jp2"]=>
-  array(7) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(1)
-    [2]=>
-    int(10)
-    [3]=>
-    string(20) "width="1" height="1""
-    ["bits"]=>
-    int(8)
-    ["channels"]=>
-    int(3)
-    ["mime"]=>
-    string(9) "image/jp2"
-  }
-  ["test1pix.jpc"]=>
-  array(7) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(1)
-    [2]=>
-    int(9)
-    [3]=>
-    string(20) "width="1" height="1""
-    ["bits"]=>
-    int(8)
-    ["channels"]=>
-    int(3)
-    ["mime"]=>
-    string(24) "application/octet-stream"
-  }
-  ["test1pix.jpg"]=>
-  array(7) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    string(20) "width="1" height="1""
-    ["bits"]=>
-    int(8)
-    ["channels"]=>
-    int(3)
-    ["mime"]=>
-    string(10) "image/jpeg"
-  }
-  ["test2pix.gif"]=>
-  array(7) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(1)
-    [2]=>
-    int(1)
-    [3]=>
-    string(20) "width="2" height="1""
-    ["bits"]=>
-    int(1)
-    ["channels"]=>
-    int(3)
-    ["mime"]=>
-    string(9) "image/gif"
-  }
-  ["test4pix.gif"]=>
-  array(7) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(1)
-    [2]=>
-    int(1)
-    [3]=>
-    string(20) "width="4" height="1""
-    ["bits"]=>
-    int(2)
-    ["channels"]=>
-    int(3)
-    ["mime"]=>
-    string(9) "image/gif"
-  }
-  ["test4pix.iff"]=>
-  array(6) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(1)
-    [2]=>
-    int(14)
-    [3]=>
-    string(20) "width="4" height="1""
-    ["bits"]=>
-    int(4)
-    ["mime"]=>
-    string(9) "image/iff"
-  }
-  ["test4pix.png"]=>
-  array(6) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(1)
-    [2]=>
-    int(3)
-    [3]=>
-    string(20) "width="4" height="1""
-    ["bits"]=>
-    int(4)
-    ["mime"]=>
-    string(9) "image/png"
-  }
-  ["test4pix.psd"]=>
-  array(5) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(1)
-    [2]=>
-    int(5)
-    [3]=>
-    string(20) "width="4" height="1""
-    ["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]=>
-    int(4)
-    [1]=>
-    int(1)
-    [2]=>
-    int(7)
-    [3]=>
-    string(20) "width="4" height="1""
-    ["mime"]=>
-    string(10) "image/tiff"
-  }
-}
---UEXPECT--
 array(11) {
   [u"test1pix.bmp"]=>
   array(6) {

diff --git a/ext/standard/tests/image/getimagesize_246x247.phpt b/ext/standard/tests/image/getimagesize_246x247.phpt
index 6f1c44124d119206fa63629b9f8c144d23f8cf50..8ceabd30736e6cd54cf8c5dc0770cc3edca74fc7 100644 (file)
--- a/ext/standard/tests/image/getimagesize_246x247.phpt
+++ b/ext/standard/tests/image/getimagesize_246x247.phpt
@@ -23,24 +23,6 @@ GetImageSize() with 246x247 pixels
        var_dump($result);
 ?>
 --EXPECT--
-array(1) {
-  ["246x247.png"]=>
-  array(6) {
-    [0]=>
-    int(246)
-    [1]=>
-    int(247)
-    [2]=>
-    int(3)
-    [3]=>
-    string(24) "width="246" height="247""
-    ["bits"]=>
-    int(4)
-    ["mime"]=>
-    string(9) "image/png"
-  }
-}
---UEXPECT--
 array(1) {
   [u"246x247.png"]=>
   array(6) {

diff --git a/ext/standard/tests/image/getimagesize_384x385.phpt b/ext/standard/tests/image/getimagesize_384x385.phpt
index a75c8e051a3542ba3a1c4600f54b97005ab156ed..3cece88b7ac2ac1892248dda878a57555cb5b5bd 100644 (file)
--- a/ext/standard/tests/image/getimagesize_384x385.phpt
+++ b/ext/standard/tests/image/getimagesize_384x385.phpt
@@ -23,24 +23,6 @@ GetImageSize() with 384x385 pixels
        var_dump($result);
 ?>
 --EXPECT--
-array(1) {
-  ["384x385.png"]=>
-  array(6) {
-    [0]=>
-    int(384)
-    [1]=>
-    int(385)
-    [2]=>
-    int(3)
-    [3]=>
-    string(24) "width="384" height="385""
-    ["bits"]=>
-    int(1)
-    ["mime"]=>
-    string(9) "image/png"
-  }
-}
---UEXPECT--
 array(1) {
   [u"384x385.png"]=>
   array(6) {

diff --git a/ext/standard/tests/image/getimagesize_swc.phpt b/ext/standard/tests/image/getimagesize_swc.phpt
index 516164d7a98e3ca2f05aaa0301c189098faff252..aa7a5ffe1997085b30c846592c69c24141df1434 100644 (file)
--- a/ext/standard/tests/image/getimagesize_swc.phpt
+++ b/ext/standard/tests/image/getimagesize_swc.phpt
@@ -11,19 +11,6 @@ GetImageSize() for compressed swf files
        var_dump(getimagesize(dirname(__FILE__) . "/test13pix.swf"));
 ?>
 --EXPECT--
-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"
-}
---UEXPECT--
 array(5) {
   [0]=>
   int(550)

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 d241aaf4edeb6f87bbeb3533c159e4e17a11ede0..c713f929c467272ea9f6572936de8f1ffab0413e 100644 (file)
--- a/ext/standard/tests/image/image_type_to_mime_type.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type.phpt
@@ -25,31 +25,6 @@ image_type_to_mime_type()
        var_dump($result);
 ?>
 --EXPECT--
-array(11) {
-  ["test1pix.bmp"]=>
-  string(9) "image/bmp"
-  ["test1pix.jp2"]=>
-  string(9) "image/jp2"
-  ["test1pix.jpc"]=>
-  string(24) "application/octet-stream"
-  ["test1pix.jpg"]=>
-  string(10) "image/jpeg"
-  ["test2pix.gif"]=>
-  string(9) "image/gif"
-  ["test4pix.gif"]=>
-  string(9) "image/gif"
-  ["test4pix.iff"]=>
-  string(9) "image/iff"
-  ["test4pix.png"]=>
-  string(9) "image/png"
-  ["test4pix.psd"]=>
-  string(9) "image/psd"
-  ["test4pix.swf"]=>
-  string(29) "application/x-shockwave-flash"
-  ["test4pix.tif"]=>
-  string(10) "image/tiff"
-}
---UEXPECT--
 array(11) {
   [u"test1pix.bmp"]=>
   unicode(9) "image/bmp"
@@ -73,4 +48,4 @@ array(11) {
   unicode(29) "application/x-shockwave-flash"
   [u"test4pix.tif"]=>
   unicode(10) "image/tiff"
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
index e4f935db2c5932027e4a5977e867d67a74780c57..77a0f177782af3c13d199b46e71a39d2c9c8351f 100755 (executable)
--- a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
@@ -20,66 +20,6 @@ for($imagetype = 0; $imagetype <= IMAGETYPE_COUNT; ++$imagetype) {
 --EXPECTREGEX--
 \*\*\* Testing image_type_to_mime_type\(\) : usage variations \*\*\*
 
--- Iteration 0 --
-string\(24\) "application\/octet-stream"
-
--- Iteration 1 --
-string\(9\) "image\/gif"
-
--- Iteration 2 --
-string\(10\) "image\/jpeg"
-
--- Iteration 3 --
-string\(9\) "image\/png"
-
--- Iteration 4 --
-string\(29\) "application\/x-shockwave-flash"
-
--- Iteration 5 --
-string\(9\) "image\/psd"
-
--- Iteration 6 --
-string\(9\) "image\/bmp"
-
--- Iteration 7 --
-string\(10\) "image\/tiff"
-
--- Iteration 8 --
-string\(10\) "image\/tiff"
-
--- Iteration 9 --
-string\(24\) "application\/octet-stream"
-
--- Iteration 10 --
-string\(9\) "image\/jp2"
-
--- Iteration 11 --
-string\(24\) "application\/octet-stream"
-
--- Iteration 12 --
-string\(24\) "application\/octet-stream"
-
--- Iteration 13 --
-string\(2[49]\) "application\/(x-shockwave-flash|octet-stream)"
-
--- Iteration 14 --
-string\(9\) "image\/iff"
-
--- Iteration 15 --
-string\(18\) "image\/vnd.wap.wbmp"
-
--- Iteration 16 --
-string\(9\) "image\/xbm"
-
--- Iteration 17 --
-string\(24\) "image\/vnd.microsoft.icon"
-
--- Iteration 18 --
-string\(24\) "application\/octet-stream"
-===DONE===
---UEXPECTREGEX--
-\*\*\* Testing image_type_to_mime_type\(\) : usage variations \*\*\*
-
 -- Iteration 0 --
 unicode\(24\) "application\/octet-stream"
 

diff --git a/ext/standard/tests/image/iptcembed_001.phpt b/ext/standard/tests/image/iptcembed_001.phpt
index edb8d36ee242ceb122add6b49ddb7ada9c954ac1..f519eb1712c48edcdb76ea1aaf2ea35e8ea2ea66 100644 (file)
--- a/ext/standard/tests/image/iptcembed_001.phpt
+++ b/ext/standard/tests/image/iptcembed_001.phpt
@@ -13,6 +13,6 @@ unlink($file);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
-Done   
+Done