From: Steph Fox <sfox@php.net>
Date: Mon, 26 May 2008 14:33:44 +0000 (+0000)
Subject: - killed off UEXPECT
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1670
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d8760677d34ba96d596d2ba2ae6494a732979ee;p=php

- killed off UEXPECT
- altered EXPECT for parser errors. This may or may not be a Good Thing.
---

diff --git a/Zend/tests/001.phpt b/Zend/tests/001.phpt
index 78d982a7ad..40a1877d93 100644
--- a/Zend/tests/001.phpt
+++ b/Zend/tests/001.phpt
@@ -35,7 +35,7 @@ var_dump(func_num_args());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 int(1)
 
diff --git a/Zend/tests/002.phpt b/Zend/tests/002.phpt
index 73c8d3ec43..5c4ff79ef5 100644
--- a/Zend/tests/002.phpt
+++ b/Zend/tests/002.phpt
@@ -42,7 +42,7 @@ var_dump(func_get_arg(1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
 bool(false)
 
diff --git a/Zend/tests/003.phpt b/Zend/tests/003.phpt
index 81f70b8d87..2ab64c4fd6 100644
--- a/Zend/tests/003.phpt
+++ b/Zend/tests/003.phpt
@@ -36,7 +36,7 @@ var_dump(func_get_args());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(0) {
 }
 array(1) {
diff --git a/Zend/tests/004.phpt b/Zend/tests/004.phpt
index 6beafe7076..179684d076 100644
--- a/Zend/tests/004.phpt
+++ b/Zend/tests/004.phpt
@@ -12,7 +12,7 @@ var_dump(strncmp("qwerty", "qwerty123", 7));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strncmp() expects exactly 3 parameters, 2 given in %s on line %d
 NULL
 int(0)
diff --git a/Zend/tests/005.phpt b/Zend/tests/005.phpt
index 2ca7d6c254..e48d3d88e5 100644
--- a/Zend/tests/005.phpt
+++ b/Zend/tests/005.phpt
@@ -14,18 +14,7 @@ var_dump(strcasecmp("01", "01"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-Warning: strcasecmp() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-int(0)
-int(-3)
-int(-1)
-int(0)
-int(0)
-int(0)
-int(0)
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: strcasecmp() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 int(0)
diff --git a/Zend/tests/006.phpt b/Zend/tests/006.phpt
index f95a56e7ef..70fc072d93 100644
--- a/Zend/tests/006.phpt
+++ b/Zend/tests/006.phpt
@@ -15,21 +15,7 @@ var_dump(strncasecmp("01", "01", 1000));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-Warning: strncasecmp() expects exactly 3 parameters, 1 given in %s on line %d
-NULL
-
-Warning: Length must be greater than or equal to 0 in %s on line %d
-bool(false)
-int(0)
-int(-3)
-int(0)
-int(0)
-int(2)
-int(0)
-int(0)
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: strncasecmp() expects exactly 3 parameters, 1 given in %s on line %d
 NULL
 
diff --git a/Zend/tests/007.phpt b/Zend/tests/007.phpt
index f26ff83531..3c81a722b1 100644
--- a/Zend/tests/007.phpt
+++ b/Zend/tests/007.phpt
@@ -21,47 +21,7 @@ var_dump(each($a));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-Warning: Wrong parameter count for each() in %s on line %d
-NULL
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-array(4) {
-  [1]=>
-  int(1)
-  ["value"]=>
-  int(1)
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-array(4) {
-  [1]=>
-  int(1)
-  ["value"]=>
-  int(1)
-  [0]=>
-  string(1) "a"
-  ["key"]=>
-  string(1) "a"
-}
-array(4) {
-  [1]=>
-  int(1)
-  ["value"]=>
-  int(1)
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: Wrong parameter count for each() in %s on line %d
 NULL
 
diff --git a/Zend/tests/008.phpt b/Zend/tests/008.phpt
index 5b229a0704..cd631003dd 100644
--- a/Zend/tests/008.phpt
+++ b/Zend/tests/008.phpt
@@ -22,7 +22,7 @@ var_dump(constant("test const"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Wrong parameter count for define() in %s on line %d
 NULL
 
diff --git a/Zend/tests/009.phpt b/Zend/tests/009.phpt
index b65eab796c..885115e6d2 100644
--- a/Zend/tests/009.phpt
+++ b/Zend/tests/009.phpt
@@ -29,22 +29,7 @@ var_dump(get_class($f2));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
-string(3) "foo"
-
-Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
-string(3) "foo"
-string(3) "foo"
-string(3) "foo"
-
-Warning: get_class() called without object from outside a class in %s on line %d
-bool(false)
-bool(false)
-string(3) "foo"
-string(4) "foo2"
-Done
---UEXPECTF--
+--EXPECTF--
 Strict Standards: Non-static method foo::bar() should not be called statically in %s on line %d
 unicode(3) "foo"
 
diff --git a/Zend/tests/010.phpt b/Zend/tests/010.phpt
index 5adc7b62ac..81d884ac03 100644
--- a/Zend/tests/010.phpt
+++ b/Zend/tests/010.phpt
@@ -41,23 +41,7 @@ var_dump(get_parent_class(1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-bool(false)
-bool(false)
-string(3) "foo"
-string(3) "foo"
-bool(false)
-string(3) "foo"
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-Done
---UEXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 unicode(3) "foo"
diff --git a/Zend/tests/011.phpt b/Zend/tests/011.phpt
index 58ed8d74d2..9513d5a948 100644
--- a/Zend/tests/011.phpt
+++ b/Zend/tests/011.phpt
@@ -52,7 +52,7 @@ $bar->test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Wrong parameter count for property_exists() in %s on line %d
 NULL
 
diff --git a/Zend/tests/012.phpt b/Zend/tests/012.phpt
index 18f63f828a..128f6eaf4b 100644
--- a/Zend/tests/012.phpt
+++ b/Zend/tests/012.phpt
@@ -18,7 +18,7 @@ var_dump(class_exists("stdClass"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: class_exists() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 bool(false)
diff --git a/Zend/tests/013.phpt b/Zend/tests/013.phpt
index fd52ac1621..883b616bc5 100644
--- a/Zend/tests/013.phpt
+++ b/Zend/tests/013.phpt
@@ -18,7 +18,7 @@ var_dump(interface_exists("stdClass"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: interface_exists() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 bool(false)
diff --git a/Zend/tests/014.phpt b/Zend/tests/014.phpt
index 20e6b87d9c..9769ed6ddc 100644
--- a/Zend/tests/014.phpt
+++ b/Zend/tests/014.phpt
@@ -20,37 +20,7 @@ var_dump(get_included_files());
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(1) {
-  [0]=>
-  string(%d) "%s"
-}
-array(2) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-}
-
-Warning: get_included_files() expects exactly 0 parameters, 2 given in %s on line %d
-NULL
-array(2) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-}
-
-Warning: get_included_files() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
-array(2) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-}
-Done
---UEXPECTF--
+--EXPECTF--
 array(1) {
   [0]=>
   unicode(%d) "%s"
diff --git a/Zend/tests/015.phpt b/Zend/tests/015.phpt
index a802542813..a838e19da8 100644
--- a/Zend/tests/015.phpt
+++ b/Zend/tests/015.phpt
@@ -12,7 +12,7 @@ var_dump(trigger_error("error", E_USER_WARNING));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Wrong parameter count for trigger_error() in %s on line %d
 NULL
 
diff --git a/Zend/tests/016.phpt b/Zend/tests/016.phpt
index 6ec507e6b1..875e05d344 100644
--- a/Zend/tests/016.phpt
+++ b/Zend/tests/016.phpt
@@ -8,5 +8,5 @@ isset($foo->bar->bar);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 Done
diff --git a/Zend/tests/017.phpt b/Zend/tests/017.phpt
index 780e8d7116..7cac6dd315 100644
--- a/Zend/tests/017.phpt
+++ b/Zend/tests/017.phpt
@@ -44,47 +44,7 @@ var_dump(count(get_extension_funcs("zend")));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-Warning: Wrong parameter count for get_resource_type() in %s on line %d
-NULL
-
-Warning: Supplied argument is not a valid resource handle in %s on line %d
-bool(false)
-string(6) "stream"
-string(7) "Unknown"
-string(5) "array"
-int(%d)
-string(5) "array"
-int(%d)
-
-Warning: get_loaded_extensions() expects at most 1 parameter, 2 given in %s line %d
-NULL
-
-Warning: get_defined_constants() expects at most 1 parameter, 2 given in %s on line %d
-NULL
-string(5) "array"
-string(5) "array"
-int(%d)
-
-Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
-string(5) "array"
-int(%d)
-
-Warning: get_declared_interfaces() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
-string(5) "array"
-int(%d)
-
-Warning: get_extension_funcs() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-bool(false)
-string(5) "array"
-int(%d)
-string(5) "array"
-int(%d)
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: Wrong parameter count for get_resource_type() in %s on line %d
 NULL
 
diff --git a/Zend/tests/018.phpt b/Zend/tests/018.phpt
index d44362143c..569096e949 100644
--- a/Zend/tests/018.phpt
+++ b/Zend/tests/018.phpt
@@ -17,22 +17,7 @@ var_dump(constant("TEST_CONST2"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-Warning: constant() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: constant() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: constant(): Couldn't find constant  in %s on line %d
-NULL
-
-Warning: constant() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d
-NULL
-int(1)
-string(4) "test"
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: constant() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt
index 77e04c41d4..cb59a71a68 100644
--- a/Zend/tests/019.phpt
+++ b/Zend/tests/019.phpt
@@ -965,976 +965,6 @@ bool(true)
 array(0) {
 }
 
-Notice: Undefined variable: array_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
---- Outerloop Iteration 8 ---
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
--- Innerloop Iteration 1 of Outerloop Iteration 8 --
-array(1) {
-  [2]=>
-  string(3) "two"
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(1) {
-  [2]=>
-  string(3) "two"
-}
--- Innerloop Iteration 2 of Outerloop Iteration 8 --
-array(0) {
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(0) {
-}
-
-Notice: Undefined variable: array_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
---- Outerloop Iteration 9 ---
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
--- Innerloop Iteration 1 of Outerloop Iteration 9 --
-array(1) {
-  ["Age"]=>
-  string(2) "30"
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(1) {
-  ["Age"]=>
-  string(2) "30"
-}
--- Innerloop Iteration 2 of Outerloop Iteration 9 --
-array(0) {
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(0) {
-}
-
-Notice: Undefined variable: array_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
---- Outerloop Iteration 10 ---
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
--- Innerloop Iteration 1 of Outerloop Iteration 10 --
-array(4) {
-  [1]=>
-  int(2)
-  ["One"]=>
-  string(1) "1"
-  [2]=>
-  string(3) "two"
-  [""]=>
-  string(0) ""
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(4) {
-  [1]=>
-  int(2)
-  ["One"]=>
-  string(1) "1"
-  [2]=>
-  string(3) "two"
-  [""]=>
-  string(0) ""
-}
--- Innerloop Iteration 2 of Outerloop Iteration 10 --
-array(3) {
-  ["One"]=>
-  string(1) "1"
-  [2]=>
-  string(3) "two"
-  [""]=>
-  string(0) ""
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(3) {
-  ["One"]=>
-  string(1) "1"
-  [2]=>
-  string(3) "two"
-  [""]=>
-  string(0) ""
-}
--- Innerloop Iteration 3 of Outerloop Iteration 10 --
-array(2) {
-  [2]=>
-  string(3) "two"
-  [""]=>
-  string(0) ""
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(2) {
-  [2]=>
-  string(3) "two"
-  [""]=>
-  string(0) ""
-}
--- Innerloop Iteration 4 of Outerloop Iteration 10 --
-array(1) {
-  [""]=>
-  string(0) ""
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(1) {
-  [""]=>
-  string(0) ""
-}
--- Innerloop Iteration 5 of Outerloop Iteration 10 --
-array(0) {
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(0) {
-}
-
-Notice: Undefined variable: array_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-
-*** Testing unset(), emtpy() & isset() with resource variables ***
--- Iteration 1 --
-resource(5) of type (stream)
-bool(true)
-bool(false)
-bool(true)
-resource(5) of type (stream)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
-
-Notice: Undefined variable: resource in %s on line %d
-NULL
--- Iteration 2 --
-resource(6) of type (stream)
-bool(true)
-bool(false)
-bool(true)
-resource(6) of type (stream)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
-
-Notice: Undefined variable: resource in %s on line %d
-NULL
-
-Notice: Undefined variable: resources in %s on line %d
-NULL
-bool(false)
-bool(true)
-
-*** Testing unset(), empty() & isset() with objects ***
-object(Point)#1 (3) {
-  ["x"]=>
-  int(30)
-  ["y"]=>
-  int(40)
-  ["lable"]=>
-  NULL
-}
-bool(true)
-bool(false)
-
-Notice: Undefined variable: lable in %s on line %d
-bool(false)
-
-Notice: Undefined variable: lable in %s on line %d
-bool(true)
-
-Notice: Undefined variable: lable in %s on line %d
-bool(false)
-
-Notice: Undefined variable: lable in %s on line %d
-bool(true)
-object(Point)#1 (3) {
-  ["x"]=>
-  int(30)
-  ["y"]=>
-  int(40)
-  ["lable"]=>
-  string(6) "Point1"
-}
-object(Point)#1 (2) {
-  ["y"]=>
-  int(40)
-  ["lable"]=>
-  string(6) "Point1"
-}
-bool(false)
-bool(true)
-object(Point)#1 (0) {
-}
-bool(true)
-bool(false)
-bool(false)
-bool(true)
-
-Notice: Undefined variable: point1 in %s on line %d
-NULL
-bool(false)
-bool(true)
-bool(false)
-bool(true)
-array(3) {
-  [0]=>
-  string(5) "Point"
-  [1]=>
-  string(8) "setLable"
-  [2]=>
-  string(9) "testPoint"
-}
-object(Point)#1 (3) {
-  ["x"]=>
-  int(5)
-  ["y"]=>
-  int(6)
-  ["lable"]=>
-  NULL
-}
-
-*** Testing possible variation in operation for isset(), empty() & unset() ***
-
-** Testing unset() variation 1: unset on static variable inside a function **
-value of static_var before unset: 1
-bool(true)
-bool(false)
-
-Notice: Undefined variable: static_var in %s on line %d
-value of static_var after unset: 
-bool(false)
-bool(true)
-value of static_var after new assignment: 20
-value of static_var before unset: 2
-bool(true)
-bool(false)
-
-Notice: Undefined variable: static_var in %s on line %d
-value of static_var after unset: 
-bool(false)
-bool(true)
-value of static_var after new assignment: 20
-value of static_var before unset: 3
-bool(true)
-bool(false)
-
-Notice: Undefined variable: static_var in %s on line %d
-value of static_var after unset: 
-bool(false)
-bool(true)
-value of static_var after new assignment: 20
-
-** Testing unset() variation 2: unset on a variable passed by ref. inside of a function **
-string(5) "value"
-bool(false)
-bool(true)
-string(5) "value"
-
-** Testing unset() variation 3: unset on a global variable inside of a function **
-int(10)
-bool(true)
-bool(false)
-bool(false)
-bool(true)
-int(10)
-Done
---UEXPECTF--
-*** Testing unset(), empty() & isset() with scalar variables ***
--- Iteration 1 --
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 2 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 3 --
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 4 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 5 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 6 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 7 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 8 --
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 9 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 10 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 11 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 12 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 13 --
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 14 --
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 15 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 16 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 17 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 18 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 19 --
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 20 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 21 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 22 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 23 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 24 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 25 --
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 26 --
-bool(true)
-bool(true)
-bool(false)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
--- Iteration 27 --
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined variable: scalar_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(false)
-
-*** Testing unset(), empty() & isset() with arrays ***
---- Outerloop Iteration 1 ---
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-
-Notice: Undefined variable: array_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
---- Outerloop Iteration 2 ---
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
--- Innerloop Iteration 1 of Outerloop Iteration 2 --
-array(0) {
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(0) {
-}
-
-Notice: Undefined variable: array_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
---- Outerloop Iteration 3 ---
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
--- Innerloop Iteration 1 of Outerloop Iteration 3 --
-array(0) {
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(0) {
-}
-
-Notice: Undefined variable: array_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
---- Outerloop Iteration 4 ---
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
--- Innerloop Iteration 1 of Outerloop Iteration 4 --
-array(0) {
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(0) {
-}
-
-Notice: Undefined variable: array_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
---- Outerloop Iteration 5 ---
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
--- Innerloop Iteration 1 of Outerloop Iteration 5 --
-array(0) {
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(0) {
-}
-
-Notice: Undefined variable: array_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
---- Outerloop Iteration 6 ---
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
--- Innerloop Iteration 1 of Outerloop Iteration 6 --
-array(3) {
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(3) {
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-}
--- Innerloop Iteration 2 of Outerloop Iteration 6 --
-array(2) {
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(2) {
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-}
--- Innerloop Iteration 3 of Outerloop Iteration 6 --
-array(1) {
-  [3]=>
-  int(4)
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(1) {
-  [3]=>
-  int(4)
-}
--- Innerloop Iteration 4 of Outerloop Iteration 6 --
-array(0) {
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(0) {
-}
-
-Notice: Undefined variable: array_var in %s on line %d
-NULL
-bool(false)
-bool(false)
-bool(true)
---- Outerloop Iteration 7 ---
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-bool(true)
--- Innerloop Iteration 1 of Outerloop Iteration 7 --
-array(2) {
-  [1]=>
-  float(2.5)
-  [2]=>
-  float(5.6)
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(2) {
-  [1]=>
-  float(2.5)
-  [2]=>
-  float(5.6)
-}
--- Innerloop Iteration 2 of Outerloop Iteration 7 --
-array(1) {
-  [2]=>
-  float(5.6)
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(1) {
-  [2]=>
-  float(5.6)
-}
--- Innerloop Iteration 3 of Outerloop Iteration 7 --
-array(0) {
-}
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(false)
-
-Notice: Undefined variable: key_val in %s on line %d
-bool(true)
-array(0) {
-}
-
 Notice: Undefined variable: array_var in %s on line %d
 NULL
 bool(false)
diff --git a/Zend/tests/020.phpt b/Zend/tests/020.phpt
index fa49a93279..98865f921e 100644
--- a/Zend/tests/020.phpt
+++ b/Zend/tests/020.phpt
@@ -19,7 +19,7 @@ foo(1,2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(false)
 
 Warning: func_get_arg():  Called from the global scope - no function context in %s on line %d
diff --git a/Zend/tests/021.phpt b/Zend/tests/021.phpt
index 6238795fd8..9190fc0883 100644
--- a/Zend/tests/021.phpt
+++ b/Zend/tests/021.phpt
@@ -27,18 +27,6 @@ print_r($e);
 bool(true)
 bool(true)
 int(23)
-string(3) "bar"
-int(23)
-float(23.5)
-int(1)
-Array
-(
-    [e] => e
-)
---UEXPECT--
-bool(true)
-bool(true)
-int(23)
 unicode(3) "bar"
 int(23)
 float(23.5)
diff --git a/Zend/tests/023.phpt b/Zend/tests/023.phpt
index 8912ad159b..fc26a80a18 100644
--- a/Zend/tests/023.phpt
+++ b/Zend/tests/023.phpt
@@ -41,10 +41,5 @@ var_dump($$$$d('foo'));
 --EXPECT--
 Test
 foo!
-string(4) "bar!"
-string(3) "FOO"
---UEXPECT--
-Test
-foo!
 unicode(4) "bar!"
 unicode(3) "FOO"
diff --git a/Zend/tests/029.phpt b/Zend/tests/029.phpt
index 469dd081bb..306dfc539c 100644
--- a/Zend/tests/029.phpt
+++ b/Zend/tests/029.phpt
@@ -16,40 +16,6 @@ var_dump($arr);
 
 ?>
 --EXPECT--
-array(1) {
-  [0]=>
-  object(stdClass)#1 (1) {
-    ["a"]=>
-    object(stdClass)#2 (0) {
-    }
-  }
-}
-array(1) {
-  [0]=>
-  object(stdClass)#1 (2) {
-    ["a"]=>
-    object(stdClass)#2 (0) {
-    }
-    ["b"]=>
-    object(stdClass)#3 (0) {
-    }
-  }
-}
-array(1) {
-  [0]=>
-  object(stdClass)#1 (3) {
-    ["a"]=>
-    object(stdClass)#2 (0) {
-    }
-    ["b"]=>
-    object(stdClass)#3 (0) {
-    }
-    ["c"]=>
-    object(stdClass)#2 (0) {
-    }
-  }
-}
---UEXPECT--
 array(1) {
   [0]=>
   object(stdClass)#1 (1) {
diff --git a/Zend/tests/030.phpt b/Zend/tests/030.phpt
index 3bdc0dc740..dab506983b 100644
--- a/Zend/tests/030.phpt
+++ b/Zend/tests/030.phpt
@@ -31,42 +31,6 @@ $test->bar();
 
 ?>
 --EXPECTF--
-object(Exception)#2 (6) {
-  ["message":protected]=>
-  string(3) "foo"
-  ["string":"Exception":private]=>
-  string(0) ""
-  ["code":protected]=>
-  int(0)
-  ["file":protected]=>
-  string(%d) "%s"
-  ["line":protected]=>
-  int(%d)
-  ["trace":"Exception":private]=>
-  array(1) {
-    [0]=>
-    array(6) {
-      ["file"]=>
-      string(%d) "%s"
-      ["line"]=>
-      int(%d)
-      ["function"]=>
-      string(3) "bar"
-      ["class"]=>
-      string(3) "foo"
-      ["type"]=>
-      string(2) "->"
-      ["args"]=>
-      array(0) {
-      }
-    }
-  }
-}
-'test' => '0'
-'test_2' => '1'
-'test_3' => '2'
-ok
---UEXPECTF--
 object(Exception)#2 (6) {
   [u"message":protected]=>
   unicode(3) "foo"
diff --git a/Zend/tests/access_modifiers_001.phpt b/Zend/tests/access_modifiers_001.phpt
index 989b926be3..f89d55bd93 100644
--- a/Zend/tests/access_modifiers_001.phpt
+++ b/Zend/tests/access_modifiers_001.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple access type modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_002.phpt b/Zend/tests/access_modifiers_002.phpt
index cc5df306f1..f0b15e43dc 100644
--- a/Zend/tests/access_modifiers_002.phpt
+++ b/Zend/tests/access_modifiers_002.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple access type modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_003.phpt b/Zend/tests/access_modifiers_003.phpt
index 9c5a20a28c..01afb73931 100644
--- a/Zend/tests/access_modifiers_003.phpt
+++ b/Zend/tests/access_modifiers_003.phpt
@@ -9,5 +9,5 @@ final final class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-Parse error: syntax error, unexpected T_FINAL, expecting T_CLASS in %s on line %d
+--EXPECTF--
+Parse error: parse error, expecting `T_CLASS' in %saccess_modifiers_003.php on line %d
diff --git a/Zend/tests/access_modifiers_004.phpt b/Zend/tests/access_modifiers_004.phpt
index c023d2cb6d..2be203a917 100644
--- a/Zend/tests/access_modifiers_004.phpt
+++ b/Zend/tests/access_modifiers_004.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple abstract modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_005.phpt b/Zend/tests/access_modifiers_005.phpt
index b32394d7f6..7780cf4ca6 100644
--- a/Zend/tests/access_modifiers_005.phpt
+++ b/Zend/tests/access_modifiers_005.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple final modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_006.phpt b/Zend/tests/access_modifiers_006.phpt
index 293fc1c64c..aefe27c68a 100644
--- a/Zend/tests/access_modifiers_006.phpt
+++ b/Zend/tests/access_modifiers_006.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple static modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_007.phpt b/Zend/tests/access_modifiers_007.phpt
index 26779e6e68..4860c52c29 100644
--- a/Zend/tests/access_modifiers_007.phpt
+++ b/Zend/tests/access_modifiers_007.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d
diff --git a/Zend/tests/add_001.phpt b/Zend/tests/add_001.phpt
index b2e3475053..95e0e7563d 100644
--- a/Zend/tests/add_001.phpt
+++ b/Zend/tests/add_001.phpt
@@ -29,49 +29,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(3) {
-  ["a"]=>
-  string(3) "aaa"
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(3) {
-  ["a"]=>
-  string(3) "aaa"
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(3) {
-  ["a"]=>
-  string(3) "aaa"
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-Done
---UEXPECTF--
+--EXPECT--
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/add_002.phpt b/Zend/tests/add_002.phpt
index 437ac9113a..e9e601c153 100644
--- a/Zend/tests/add_002.phpt
+++ b/Zend/tests/add_002.phpt
@@ -13,7 +13,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Object of class stdClass could not be converted to int in %s on line %d
 
 Fatal error: Unsupported operand types in %s on line %d
diff --git a/Zend/tests/add_003.phpt b/Zend/tests/add_003.phpt
index 4223af3f19..6647939106 100644
--- a/Zend/tests/add_003.phpt
+++ b/Zend/tests/add_003.phpt
@@ -13,7 +13,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Object of class stdClass could not be converted to int in %s on line %d
 
 Fatal error: Unsupported operand types in %s on line %d
diff --git a/Zend/tests/add_004.phpt b/Zend/tests/add_004.phpt
index 492ff31ba3..bf4499809c 100644
--- a/Zend/tests/add_004.phpt
+++ b/Zend/tests/add_004.phpt
@@ -10,5 +10,5 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Unsupported operand types in %s on line %d
diff --git a/Zend/tests/add_005.phpt b/Zend/tests/add_005.phpt
index 7e9bc25d8f..f5c20124cc 100644
--- a/Zend/tests/add_005.phpt
+++ b/Zend/tests/add_005.phpt
@@ -16,7 +16,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 float(2834756759.1231)
 float(2834756759.1231)
 Done
diff --git a/Zend/tests/add_006.phpt b/Zend/tests/add_006.phpt
index d56df2f329..18b55499bf 100644
--- a/Zend/tests/add_006.phpt
+++ b/Zend/tests/add_006.phpt
@@ -37,7 +37,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(75636)
 int(951858)
 int(48550510)
diff --git a/Zend/tests/add_007.phpt b/Zend/tests/add_007.phpt
index b2f1559b7a..c9ea4212c5 100644
--- a/Zend/tests/add_007.phpt
+++ b/Zend/tests/add_007.phpt
@@ -12,5 +12,5 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Unsupported operand types in %s on line %d
diff --git a/Zend/tests/and_001.phpt b/Zend/tests/and_001.phpt
index c793828c21..c4bc2f29b3 100644
--- a/Zend/tests/and_001.phpt
+++ b/Zend/tests/and_001.phpt
@@ -30,7 +30,7 @@ var_dump($s);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 string(3) "020"
 string(4) "pead"
 string(4) "pead"
diff --git a/Zend/tests/array_append_COW.phpt b/Zend/tests/array_append_COW.phpt
index 3aa99f1b01..0e3008589b 100644
--- a/Zend/tests/array_append_COW.phpt
+++ b/Zend/tests/array_append_COW.phpt
@@ -14,8 +14,3 @@ array(1) {
   [0]=>
   int(1)
 }
---UEXPECT--	
-array(1) {
-  [0]=>
-  int(1)
-}
diff --git a/Zend/tests/assign_to_var_001.phpt b/Zend/tests/assign_to_var_001.phpt
index d37ebbcbd8..c6b8c6298c 100644
--- a/Zend/tests/assign_to_var_001.phpt
+++ b/Zend/tests/assign_to_var_001.phpt
@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(2)
 int(2)
 Done
diff --git a/Zend/tests/assign_to_var_002.phpt b/Zend/tests/assign_to_var_002.phpt
index c905161385..7a85379005 100644
--- a/Zend/tests/assign_to_var_002.phpt
+++ b/Zend/tests/assign_to_var_002.phpt
@@ -12,11 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(1) "g"
-string(1) "g"
-Done
---UEXPECTF--
+--EXPECT--
 unicode(1) "g"
 unicode(1) "g"
 Done
diff --git a/Zend/tests/assign_to_var_003.phpt b/Zend/tests/assign_to_var_003.phpt
index 911ee0bb8e..b915c7231e 100644
--- a/Zend/tests/assign_to_var_003.phpt
+++ b/Zend/tests/assign_to_var_003.phpt
@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 NULL
 NULL
 Done
diff --git a/Zend/tests/assign_to_var_004.phpt b/Zend/tests/assign_to_var_004.phpt
index 73a39a7632..d3cb5c5ac3 100644
--- a/Zend/tests/assign_to_var_004.phpt
+++ b/Zend/tests/assign_to_var_004.phpt
@@ -15,12 +15,7 @@ var_dump($var2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(5) "space"
-string(5) "space"
-string(5) "space"
-Done
---UEXPECTF--
+--EXPECT--
 unicode(5) "space"
 unicode(5) "space"
 unicode(5) "space"
diff --git a/Zend/tests/bug22836.phpt b/Zend/tests/bug22836.phpt
index eefd80dfab..8313d2d026 100644
--- a/Zend/tests/bug22836.phpt
+++ b/Zend/tests/bug22836.phpt
@@ -15,24 +15,7 @@ for ($i = 0; $i < 8; $i++) {
 	$h =& f();
 }
 ?>
---EXPECTF--
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
-string(3) "foo"
-'foo'
---UEXPECTF--
+--EXPECT--
 unicode(3) "foo"
 'foo'
 unicode(3) "foo"
diff --git a/Zend/tests/bug23104.phpt b/Zend/tests/bug23104.phpt
index 9c4e805cdd..79c473aefc 100644
--- a/Zend/tests/bug23104.phpt
+++ b/Zend/tests/bug23104.phpt
@@ -9,6 +9,4 @@ function foo($bar = array("a", "b", "c"))
 foo();
 ?>
 --EXPECT--
-string(1) "a"
---UEXPECT--
 unicode(1) "a"
diff --git a/Zend/tests/bug26010.phpt b/Zend/tests/bug26010.phpt
index 83192f799b..ed673a27ce 100644
--- a/Zend/tests/bug26010.phpt
+++ b/Zend/tests/bug26010.phpt
@@ -12,11 +12,6 @@ $obj_vars = get_object_vars($data);
 var_dump($obj_vars);
 ?>
 --EXPECT--
-array(1) {
-  ["public"]=>
-  string(6) "public"
-}
---UEXPECT--
 array(1) {
   [u"public"]=>
   unicode(6) "public"
diff --git a/Zend/tests/bug26166.phpt b/Zend/tests/bug26166.phpt
index d83b6c299f..1e2edd000b 100755
--- a/Zend/tests/bug26166.phpt
+++ b/Zend/tests/bug26166.phpt
@@ -68,13 +68,6 @@ catch (Exception $e) {
 --EXPECTF--
 Hello World!
 ===NONE===
-string(52) "Method None::__toString() must return a string value"
-===THROW===
-
-Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d
---UEXPECTF--
-Hello World!
-===NONE===
 unicode(52) "Method None::__toString() must return a string value"
 ===THROW===
 
diff --git a/Zend/tests/bug26696.phpt b/Zend/tests/bug26696.phpt
index 62ceacda58..14083dfb9f 100755
--- a/Zend/tests/bug26696.phpt
+++ b/Zend/tests/bug26696.phpt
@@ -19,4 +19,4 @@ for ($i = 0; $i < $len; $i++) {
 ===DONE===
 --EXPECT--
 a-s-d-d-/-?+
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/Zend/tests/bug26697.phpt b/Zend/tests/bug26697.phpt
index 8266a23e34..b304e5790f 100755
--- a/Zend/tests/bug26697.phpt
+++ b/Zend/tests/bug26697.phpt
@@ -16,7 +16,7 @@ var_dump(class_exists('NotExistingClass'));
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 __autoload(NotExistingClass)
 bool(false)
 __autoload(NotExistingClass), done
diff --git a/Zend/tests/bug27669.phpt b/Zend/tests/bug27669.phpt
index 4d513e91aa..26f5918881 100755
--- a/Zend/tests/bug27669.phpt
+++ b/Zend/tests/bug27669.phpt
@@ -13,6 +13,6 @@ Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dy
 	A::$y[0]();
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Hello World
 ===DONE===
diff --git a/Zend/tests/bug27798.phpt b/Zend/tests/bug27798.phpt
index 25c03e91a0..5051cd26c2 100755
--- a/Zend/tests/bug27798.phpt
+++ b/Zend/tests/bug27798.phpt
@@ -35,43 +35,6 @@ var_dump(get_object_vars(new Child));
 ===DONE===
 --EXPECT--
 Base::__construct
-array(3) {
-  ["Foo"]=>
-  int(1)
-  ["Bar"]=>
-  int(2)
-  ["Baz"]=>
-  int(3)
-}
-array(1) {
-  ["Foo"]=>
-  int(1)
-}
-Base::__construct
-array(3) {
-  ["Foo"]=>
-  int(1)
-  ["Bar"]=>
-  int(2)
-  ["Baz"]=>
-  int(3)
-}
-Child::__construct
-array(3) {
-  ["Baz"]=>
-  int(4)
-  ["Foo"]=>
-  int(1)
-  ["Bar"]=>
-  int(2)
-}
-array(1) {
-  ["Foo"]=>
-  int(1)
-}
-===DONE===
---UEXPECT--
-Base::__construct
 array(3) {
   [u"Foo"]=>
   int(1)
diff --git a/Zend/tests/bug28442.phpt b/Zend/tests/bug28442.phpt
index 99ed5e6cbe..0040144b4f 100755
--- a/Zend/tests/bug28442.phpt
+++ b/Zend/tests/bug28442.phpt
@@ -45,25 +45,7 @@ var_dump(ClassC::$prop);
 
 ?>
 ===DONE===
---EXPECTF--
-===INIT===
-string(1) "A"
-string(1) "C"
-string(1) "C"
-===SetA===
-string(2) "A2"
-string(1) "C"
-string(1) "C"
-===SetB===
-string(2) "A2"
-string(2) "B2"
-string(2) "B2"
-===SetC===
-string(2) "A2"
-string(2) "C2"
-string(2) "C2"
-===DONE===
---UEXPECTF--
+--EXPECT--
 ===INIT===
 unicode(1) "A"
 unicode(1) "C"
diff --git a/Zend/tests/bug28444.phpt b/Zend/tests/bug28444.phpt
index 3c8cfa6df7..1c13bca3b9 100755
--- a/Zend/tests/bug28444.phpt
+++ b/Zend/tests/bug28444.phpt
@@ -56,30 +56,6 @@ var_dump($y->z->x = 6);
 ?>
 ===DONE===
 --EXPECTF--
-object(Object)#%d (1) {
-  ["x"]=>
-  int(2)
-}
-int(2)
-int(3)
-Overloaded::__set(y,3)
-int(3)
-Overloaded::__get(y)
-int(3)
-string(55) "Object of class Object could not be converted to string"
-Overloaded::__set(z,)
-object(Object)#%d (1) {
-  ["x"]=>
-  int(4)
-}
-Overloaded::__get(z)
-int(4)
-Overloaded::__get(z)
-int(5)
-Overloaded::__get(z)
-int(6)
-===DONE===
---UEXPECTF--
 object(Object)#%d (1) {
   [u"x"]=>
   int(2)
diff --git a/Zend/tests/bug29210.phpt b/Zend/tests/bug29210.phpt
index a2f5c9ee55..cfe08d3a7d 100644
--- a/Zend/tests/bug29210.phpt
+++ b/Zend/tests/bug29210.phpt
@@ -89,7 +89,7 @@ if (is_callable(array('test_class','test_func4'))) {
 $object = new foo();
 $object->test();
 ?>
---EXPECTF--
+--EXPECT--
 test_func1
 test_func2
 test_func3
diff --git a/Zend/tests/bug29368.phpt b/Zend/tests/bug29368.phpt
index c16399abbc..1987fa9b45 100755
--- a/Zend/tests/bug29368.phpt
+++ b/Zend/tests/bug29368.phpt
@@ -28,7 +28,7 @@ unset($bar);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 Foo::__construct
 Caught exception!
 ===DONE===
diff --git a/Zend/tests/bug29505.phpt b/Zend/tests/bug29505.phpt
index 2814157b58..5316df4ec4 100755
--- a/Zend/tests/bug29505.phpt
+++ b/Zend/tests/bug29505.phpt
@@ -13,23 +13,6 @@ var_dump(get_class_vars('Test'));
 ?>
 ===DONE===
 --EXPECT--
-array(2) {
-  ["empty"]=>
-  array(0) {
-  }
-  ["three"]=>
-  array(3) {
-    [0]=>
-    int(1)
-    ["b"]=>
-    string(1) "c"
-    [3]=>
-    array(0) {
-    }
-  }
-}
-===DONE===
---UEXPECT--
 array(2) {
   [u"empty"]=>
   array(0) {
diff --git a/Zend/tests/bug29674.phpt b/Zend/tests/bug29674.phpt
index 06133ba4d6..544e170bc0 100755
--- a/Zend/tests/bug29674.phpt
+++ b/Zend/tests/bug29674.phpt
@@ -31,16 +31,6 @@ $obj->printVars();
 ===DONE===
 --EXPECTF--
 ===BASE===
-string(4) "Base"
-
-Notice: Undefined property: BaseClass::$private_child in %sbug29674.php on line %d
-NULL
-===CHILD===
-string(4) "Base"
-
-Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d
---UEXPECTF--
-===BASE===
 unicode(4) "Base"
 
 Notice: Undefined property: BaseClass::$private_child in %sbug29674.php on line %d
diff --git a/Zend/tests/bug29896.phpt b/Zend/tests/bug29896.phpt
index 1e2eb0b067..35a92d459c 100755
--- a/Zend/tests/bug29896.phpt
+++ b/Zend/tests/bug29896.phpt
@@ -25,4 +25,3 @@ GenerateError2("Test2");
 #0  userErrorHandler(8, Undefined variable: b, %sbug29896.php, 11, Array ([A1] => Test1)) called at [%sbug29896.php:11]
 #1  GenerateError1(Test1) called at [%sbug29896.php:16]
 #2  GenerateError2(Test2) called at [%sbug29896.php:19]
-
diff --git a/Zend/tests/bug29944.phpt b/Zend/tests/bug29944.phpt
index 6c0cf1ec7a..41a8159d52 100644
--- a/Zend/tests/bug29944.phpt
+++ b/Zend/tests/bug29944.phpt
@@ -13,4 +13,3 @@ switch ($a) {
 ?>
 --EXPECT--
 ok
-
diff --git a/Zend/tests/bug30080.phpt b/Zend/tests/bug30080.phpt
index bd8401e1be..061f2b2930 100755
--- a/Zend/tests/bug30080.phpt
+++ b/Zend/tests/bug30080.phpt
@@ -2,13 +2,13 @@
 Bug #30080 (Passing array or non array of objects)
 --FILE--
 <?php
-class foo { 	
-  function foo($arrayobj) { 
+class foo {
+  function foo($arrayobj) {
     var_dump($arrayobj);
   } 
 } 
 
-new foo(array(new stdClass)); 
+new foo(array(new stdClass));
 ?>
 --EXPECT--
 array(1) {
diff --git a/Zend/tests/bug30140.phpt b/Zend/tests/bug30140.phpt
index 1a17a1f6c1..fe2d444ab3 100755
--- a/Zend/tests/bug30140.phpt
+++ b/Zend/tests/bug30140.phpt
@@ -22,13 +22,6 @@ var_dump(B::$test2);
 var_dump(B::$test3);
 ?>
 --EXPECT--
-string(1) "x"
-string(1) "y"
-string(1) "z"
-string(1) "x"
-string(1) "y"
-string(1) "z"
---UEXPECT--
 unicode(1) "x"
 unicode(1) "y"
 unicode(1) "z"
diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/bug30162.phpt
index a94ed5d7af..22d58ea40a 100755
--- a/Zend/tests/bug30162.phpt
+++ b/Zend/tests/bug30162.phpt
@@ -44,15 +44,6 @@ var_dump($db);
 --EXPECTF--
 Notice: Undefined variable: db in %sbug30162.php on line 35
 NULL
-object(hariCow)#1 (2) {
-  ["x"]=>
-  string(1) "x"
-  ["y"]=>
-  string(1) "y"
-}
---UEXPECTF--
-Notice: Undefined variable: db in %sbug30162.php on line 35
-NULL
 object(hariCow)#1 (2) {
   [u"x"]=>
   unicode(1) "x"
diff --git a/Zend/tests/bug30407.phpt b/Zend/tests/bug30407.phpt
index dd43bd47d3..cffa2011cd 100644
--- a/Zend/tests/bug30407.phpt
+++ b/Zend/tests/bug30407.phpt
@@ -13,10 +13,6 @@ haricow();
 ?>
 ===DONE===
 --EXPECT--
-string(3) "one"
-string(3) "one"
-===DONE===
---UEXPECT--
 unicode(3) "one"
 unicode(3) "one"
 ===DONE===
diff --git a/Zend/tests/bug30519.phpt b/Zend/tests/bug30519.phpt
index 7d70cba071..f633d11445 100755
--- a/Zend/tests/bug30519.phpt
+++ b/Zend/tests/bug30519.phpt
@@ -7,4 +7,3 @@ class test implements a {
 ?>
 --EXPECTF--
 Fatal error: Interface 'a' not found in %sbug30519.php on line 2
-
diff --git a/Zend/tests/bug30702.phpt b/Zend/tests/bug30702.phpt
index b8ae438c22..604d66a989 100644
--- a/Zend/tests/bug30702.phpt
+++ b/Zend/tests/bug30702.phpt
@@ -23,21 +23,6 @@ $x= new bar();
 var_dump($x);
 ?>
 --EXPECT--
-object(bar)#1 (6) {
-  ["c1"]=>
-  int(1)
-  ["c2"]=>
-  int(2)
-  ["c3"]=>
-  int(1)
-  ["c4"]=>
-  int(2)
-  ["c5"]=>
-  int(1)
-  ["c6"]=>
-  int(1)
-}
---UEXPECT--
 object(bar)#1 (6) {
   [u"c1"]=>
   int(1)
diff --git a/Zend/tests/bug30791.phpt b/Zend/tests/bug30791.phpt
index edc2caca7e..f37bbd5d17 100755
--- a/Zend/tests/bug30791.phpt
+++ b/Zend/tests/bug30791.phpt
@@ -25,15 +25,6 @@ var_dump($c);
 
 ?>
 --EXPECT--
-string(50) "Object of class a could not be converted to string"
-
-string(50) "Object of class a could not be converted to string"
-
-object(a)#2 (1) {
-  ["a"]=>
-  int(4)
-}
---UEXPECT--
 unicode(50) "Object of class a could not be converted to string"
 
 unicode(50) "Object of class a could not be converted to string"
diff --git a/Zend/tests/bug31683.phpt b/Zend/tests/bug31683.phpt
index 306ed81b64..9ec6354f2e 100644
--- a/Zend/tests/bug31683.phpt
+++ b/Zend/tests/bug31683.phpt
@@ -69,33 +69,6 @@ for ($i=0; $i < 2; $i++) {
 }
 ?>
 --EXPECT--
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-NULL
-string(2) "ok"
-string(2) "ok"
----
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-string(2) "ok"
-NULL
-string(2) "ok"
-string(2) "ok"
----
---UEXPECT--
 unicode(2) "ok"
 unicode(2) "ok"
 unicode(2) "ok"
diff --git a/Zend/tests/bug32596.phpt b/Zend/tests/bug32596.phpt
index 2dd0cfe9f0..b2232515e9 100755
--- a/Zend/tests/bug32596.phpt
+++ b/Zend/tests/bug32596.phpt
@@ -24,4 +24,3 @@ echo "this is still executed\n";
 BUG
 please fix this thing, it wasted a nice part of my life!
 this is still executed
-
diff --git a/Zend/tests/bug33318.phpt b/Zend/tests/bug33318.phpt
index dc1afbb153..48abe0ad11 100755
--- a/Zend/tests/bug33318.phpt
+++ b/Zend/tests/bug33318.phpt
@@ -5,4 +5,4 @@ Bug #33318 (throw 1; results in Invalid opcode 108/1/8)
 throw 1;
 ?>
 --EXPECTF--
-Fatal error: Can only throw objects in %sbug33318.php on line 2
\ No newline at end of file
+Fatal error: Can only throw objects in %sbug33318.php on line 2
diff --git a/Zend/tests/bug33512.phpt b/Zend/tests/bug33512.phpt
index a4af5addee..9891717cc4 100755
--- a/Zend/tests/bug33512.phpt
+++ b/Zend/tests/bug33512.phpt
@@ -58,13 +58,6 @@ class TheObj {
 	print $SomeObj->{'Virtual'.(3)}."\n";
 ?>
 --EXPECT--
-string(9) "somevalue"
-othervaluetoo
-int(-1)
--1
--1
--1
---UEXPECT--
 unicode(9) "somevalue"
 othervaluetoo
 int(-1)
diff --git a/Zend/tests/bug33558.phpt b/Zend/tests/bug33558.phpt
index 9c87fc6017..5c00ad7ca6 100755
--- a/Zend/tests/bug33558.phpt
+++ b/Zend/tests/bug33558.phpt
@@ -18,4 +18,3 @@ echo "$a\n";
 ?>
 --EXPECT--
 ok
-
diff --git a/Zend/tests/bug33771.phpt b/Zend/tests/bug33771.phpt
index 5d6f5ca96d..761bad9377 100644
--- a/Zend/tests/bug33771.phpt
+++ b/Zend/tests/bug33771.phpt
@@ -33,7 +33,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(16383)
 int(16383)
 int(14335)
diff --git a/Zend/tests/bug33999.phpt b/Zend/tests/bug33999.phpt
index 477179e9be..22245b9b90 100755
--- a/Zend/tests/bug33999.phpt
+++ b/Zend/tests/bug33999.phpt
@@ -18,17 +18,6 @@ $baz = (float)$foo;
 var_dump($baz);
 ?>
 --EXPECTF--
-object(Foo)#1 (1) {
-  ["bar"]=>
-  string(3) "bat"
-}
-
-Notice: Object of class Foo could not be converted to int in %sbug33999.php on line 9
-int(1)
-
-Notice: Object of class Foo could not be converted to double in %sbug33999.php on line 12
-float(1)
---UEXPECTF--
 object(Foo)#1 (1) {
   [u"bar"]=>
   unicode(3) "bat"
diff --git a/Zend/tests/bug34062.phpt b/Zend/tests/bug34062.phpt
index bcb4ad8c64..f1c0e477a9 100755
--- a/Zend/tests/bug34062.phpt
+++ b/Zend/tests/bug34062.phpt
@@ -21,4 +21,3 @@ try {
 (((
 here
 )))
-
diff --git a/Zend/tests/bug34064.phpt b/Zend/tests/bug34064.phpt
index d8d9f546be..c153a36536 100755
--- a/Zend/tests/bug34064.phpt
+++ b/Zend/tests/bug34064.phpt
@@ -26,13 +26,6 @@ $o = new XmlTest();
 $o->run();
 ?>
 --EXPECTF--
-array(1) {
-  [0]=>
-  string(2) "ok"
-}
-
-Fatal error: Cannot use [] for reading in %sbug34064.php on line 18
---UEXPECTF--
 array(1) {
   [0]=>
   unicode(2) "ok"
diff --git a/Zend/tests/bug34617.phpt b/Zend/tests/bug34617.phpt
index 23c43c4f9f..247f9085ee 100755
--- a/Zend/tests/bug34617.phpt
+++ b/Zend/tests/bug34617.phpt
@@ -15,4 +15,4 @@ function boom()
 boom();
 ?>
 --EXPECT--
-ok
\ No newline at end of file
+ok
diff --git a/Zend/tests/bug34873.phpt b/Zend/tests/bug34873.phpt
index a1b6e4b76a..a71b52461f 100644
--- a/Zend/tests/bug34873.phpt
+++ b/Zend/tests/bug34873.phpt
@@ -22,9 +22,6 @@ $myPwa->test();
 
 echo "Done\n";
 ?>
---EXPECT--	
-string(7) "myvalue"
-Done
---UEXPECT--
+--EXPECT--
 unicode(7) "myvalue"
 Done
diff --git a/Zend/tests/bug34879.phpt b/Zend/tests/bug34879.phpt
index 606142bde7..6c422ca268 100755
--- a/Zend/tests/bug34879.phpt
+++ b/Zend/tests/bug34879.phpt
@@ -8,4 +8,4 @@ print_r(str_replace('a', 'b', array(-1 =>-1)));
 Array
 (
     [-1] => -1
-)
\ No newline at end of file
+)
diff --git a/Zend/tests/bug35163_2.phpt b/Zend/tests/bug35163_2.phpt
index 4adf7709ae..3a6f4f730c 100755
--- a/Zend/tests/bug35163_2.phpt
+++ b/Zend/tests/bug35163_2.phpt
@@ -62,4 +62,3 @@ array(3) {
     }
   }
 }
-
diff --git a/Zend/tests/bug35163_3.phpt b/Zend/tests/bug35163_3.phpt
index d34b94e9df..4f835010c0 100755
--- a/Zend/tests/bug35163_3.phpt
+++ b/Zend/tests/bug35163_3.phpt
@@ -12,32 +12,6 @@ $a->b = null;
 $a = null;
 ?>
 --EXPECT--
-object(stdClass)#1 (1) {
-  ["b"]=>
-  &array(3) {
-    [0]=>
-    int(2)
-    [1]=>
-    &array(3) {
-      [0]=>
-      int(2)
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
-    [2]=>
-    &array(3) {
-      [0]=>
-      int(2)
-      [1]=>
-      *RECURSION*
-      [2]=>
-      *RECURSION*
-    }
-  }
-}
---UEXPECT--
 object(stdClass)#1 (1) {
   [u"b"]=>
   &array(3) {
diff --git a/Zend/tests/bug35239.phpt b/Zend/tests/bug35239.phpt
index 5fb08fc27f..7c88b68b62 100755
--- a/Zend/tests/bug35239.phpt
+++ b/Zend/tests/bug35239.phpt
@@ -13,33 +13,6 @@ $a->x0->y1 = "ok\n";
 echo $a->x0;
 ?>
 --EXPECT--
-object(stdClass)#1 (1) {
-  ["x0"]=>
-  &object(stdClass)#2 (3) {
-    ["y0"]=>
-    string(1) "b"
-    ["y1"]=>
-    &object(stdClass)#2 (3) {
-      ["y0"]=>
-      string(1) "b"
-      ["y1"]=>
-      *RECURSION*
-      ["y2"]=>
-      *RECURSION*
-    }
-    ["y2"]=>
-    &object(stdClass)#2 (3) {
-      ["y0"]=>
-      string(1) "b"
-      ["y1"]=>
-      *RECURSION*
-      ["y2"]=>
-      *RECURSION*
-    }
-  }
-}
-ok
---UEXPECT--
 object(stdClass)#1 (1) {
   [u"x0"]=>
   &object(stdClass)#2 (3) {
diff --git a/Zend/tests/bug36214.phpt b/Zend/tests/bug36214.phpt
index eae7f6bc7a..da4f5da58f 100755
--- a/Zend/tests/bug36214.phpt
+++ b/Zend/tests/bug36214.phpt
@@ -46,28 +46,6 @@ array(2) {
   [1]=>
   int(2)
 }
-object(ArrayObject)#%d (1) {
-  ["storage":"ArrayObject":private]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
---UEXPECTF--
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
 object(ArrayObject)#%d (1) {
   [u"storage":u"ArrayObject":private]=>
   array(2) {
diff --git a/Zend/tests/bug37138.phpt b/Zend/tests/bug37138.phpt
index f8503f8da9..c81b167467 100755
--- a/Zend/tests/bug37138.phpt
+++ b/Zend/tests/bug37138.phpt
@@ -18,4 +18,3 @@ stch::g ();
 EHLO
 EHLO
 EHLO
-
diff --git a/Zend/tests/bug37212.phpt b/Zend/tests/bug37212.phpt
index 0a75c4e8cc..8f3a757659 100755
--- a/Zend/tests/bug37212.phpt
+++ b/Zend/tests/bug37212.phpt
@@ -40,20 +40,6 @@ var_dump($B);
 ?>
 ===DONE===
 --EXPECTF--
-object(B)#%d (1) {
-  ["value":protected]=>
-  string(1) "B"
-}
-object(C)#%d (1) {
-  ["value":protected]=>
-  string(1) "C"
-}
-object(B)#%d (1) {
-  ["value":protected]=>
-  string(1) "C"
-}
-===DONE===
---UEXPECTF--
 object(B)#%d (1) {
   [u"value":protected]=>
   unicode(1) "B"
diff --git a/Zend/tests/bug37667.phpt b/Zend/tests/bug37667.phpt
index cd54b3b232..084f4082a1 100755
--- a/Zend/tests/bug37667.phpt
+++ b/Zend/tests/bug37667.phpt
@@ -28,30 +28,6 @@ var_dump($obj);
 ?>
 ===DONE===
 --EXPECTF--
-string(3) "bar"
-
-Notice: Undefined offset: 2 in %sbug37667.php on line 16
-NULL
-object(Test)#%d (1) {
-  ["property":protected]=>
-  array(1) {
-    ["foo"]=>
-    string(3) "bar"
-  }
-}
-
-Notice: Indirect modification of overloaded property Test::$property has no effect in %sbug37667.php on line 20
-
-Notice: Indirect modification of overloaded property Test::$property has no effect in %sbug37667.php on line 21
-object(Test)#%d (1) {
-  ["property":protected]=>
-  array(1) {
-    ["foo"]=>
-    string(3) "bar"
-  }
-}
-===DONE===
---UEXPECTF--
 unicode(3) "bar"
 
 Notice: Undefined offset: 2 in %sbug37667.php on line %d
diff --git a/Zend/tests/bug37707.phpt b/Zend/tests/bug37707.phpt
index 1964958526..ac2dfb8777 100755
--- a/Zend/tests/bug37707.phpt
+++ b/Zend/tests/bug37707.phpt
@@ -13,4 +13,3 @@ echo "NO LEAK\n";
 --EXPECT--
 clonned
 NO LEAK
-
diff --git a/Zend/tests/bug37811.phpt b/Zend/tests/bug37811.phpt
index def4e04d7c..d7f292d5ff 100755
--- a/Zend/tests/bug37811.phpt
+++ b/Zend/tests/bug37811.phpt
@@ -19,14 +19,6 @@ var_dump(Baz);
 ?>
 ===DONE===
 --EXPECTF--
-string(3) "Foo"
-
-Warning: Constants may only evaluate to scalar values in %sbug37811.php on line %d
-
-Notice: Use of undefined constant Baz - assumed 'Baz' in %sbug37811.php on line %d
-string(3) "Baz"
-===DONE===
---UEXPECTF--
 unicode(3) "Foo"
 
 Warning: Constants may only evaluate to scalar values in %sbug37811.php on line %d
diff --git a/Zend/tests/bug38461.phpt b/Zend/tests/bug38461.phpt
index 281d999019..6f571876b8 100644
--- a/Zend/tests/bug38461.phpt
+++ b/Zend/tests/bug38461.phpt
@@ -21,5 +21,5 @@ $op->x = 'test';
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 Done
diff --git a/Zend/tests/bug38624.phpt b/Zend/tests/bug38624.phpt
index 081e35c72a..bed1a7a3bf 100644
--- a/Zend/tests/bug38624.phpt
+++ b/Zend/tests/bug38624.phpt
@@ -25,7 +25,7 @@ $impl = new impl();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught exception 'Exception' with message 'doesn't work' in %s:%d
 Stack trace:
 #0 %s(%d): impl->__get('counter')
diff --git a/Zend/tests/bug38779.phpt b/Zend/tests/bug38779.phpt
index 919a13c0ac..e7f74c8ca9 100644
--- a/Zend/tests/bug38779.phpt
+++ b/Zend/tests/bug38779.phpt
@@ -30,5 +30,5 @@ require 'Loader://qqq.php';
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Parse error: %s error%sin Loader://qqq.php on line %d
diff --git a/Zend/tests/bug38779_1.phpt b/Zend/tests/bug38779_1.phpt
index 0a92a63906..e6b64f9169 100644
--- a/Zend/tests/bug38779_1.phpt
+++ b/Zend/tests/bug38779_1.phpt
@@ -38,14 +38,11 @@ fwrite($fp1, "<"."?php blah blah?".">");
 fclose($fp1);
 
 include $filename;
-
-echo "Done\n";
 ?>
---EXPECTF--	
-Parse error: %s error%sin %s on line %d
-string(6) "flush!"
-string(6) "close!"
---UEXPECTF--
+===DONE===
+--CLEAN--
+<?php unlink(dirname(__FILE__) . '/bug38779.txt'); ?>
+--EXPECTF--
 Parse error: %s error%sin %s on line %d
 unicode(6) "flush!"
 unicode(6) "close!"
diff --git a/Zend/tests/bug38808.phpt b/Zend/tests/bug38808.phpt
index 0fc4bfecdc..487a569b6d 100755
--- a/Zend/tests/bug38808.phpt
+++ b/Zend/tests/bug38808.phpt
@@ -14,4 +14,4 @@ echo $current($a)."\n";
 ?>
 --EXPECT--
 one
-two
\ No newline at end of file
+two
diff --git a/Zend/tests/bug39003.phpt b/Zend/tests/bug39003.phpt
index 7a3da849bd..4506a54330 100644
--- a/Zend/tests/bug39003.phpt
+++ b/Zend/tests/bug39003.phpt
@@ -20,5 +20,5 @@ test($obj);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Catchable fatal error: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s on line %d
diff --git a/Zend/tests/bug39036.phpt b/Zend/tests/bug39036.phpt
index 017012fddf..419810eaa1 100644
--- a/Zend/tests/bug39036.phpt
+++ b/Zend/tests/bug39036.phpt
@@ -13,7 +13,7 @@ var_dump($key);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: key in %s on line %d
 NULL
 Done
diff --git a/Zend/tests/bug39127.phpt b/Zend/tests/bug39127.phpt
index c05bcd3f73..edbbb5fb6a 100644
--- a/Zend/tests/bug39127.phpt
+++ b/Zend/tests/bug39127.phpt
@@ -13,7 +13,7 @@ var_dump(is_callable(array($b,"__construct")));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 %s(13) "a::a() called"
 bool(true)
 bool(false)
diff --git a/Zend/tests/bug40621.phpt b/Zend/tests/bug40621.phpt
index 564ba55be2..916a49d526 100644
--- a/Zend/tests/bug40621.phpt
+++ b/Zend/tests/bug40621.phpt
@@ -14,7 +14,7 @@ Foo::get();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Strict Standards: Non-static method Foo::get() should not be called statically in %s on line %d
 
 Fatal error: Non-static method Foo::__construct() cannot be called statically in %s on line %d
diff --git a/Zend/tests/bug40784.phpt b/Zend/tests/bug40784.phpt
index 6da8f2a16b..17d16f6481 100644
--- a/Zend/tests/bug40784.phpt
+++ b/Zend/tests/bug40784.phpt
@@ -18,7 +18,7 @@ $b = new B;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 I'm A
 I'm A
 Done
diff --git a/Zend/tests/bug40815.phpt b/Zend/tests/bug40815.phpt
index 6f7477a9eb..3386097523 100644
--- a/Zend/tests/bug40815.phpt
+++ b/Zend/tests/bug40815.phpt
@@ -14,5 +14,5 @@ set_exception_handler("ehandle::exh");
 throw new Exception ("Whiii");
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 foo
diff --git a/Zend/tests/bug41026.phpt b/Zend/tests/bug41026.phpt
index 7caac215e0..3b8701d09d 100644
--- a/Zend/tests/bug41026.phpt
+++ b/Zend/tests/bug41026.phpt
@@ -20,7 +20,7 @@ try_class::main ();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Done
 
 Warning: (Registered shutdown functions) Unable to call self::on_shutdown() - function does not exist in Unknown on line 0
diff --git a/Zend/tests/bug41075.phpt b/Zend/tests/bug41075.phpt
index d2b4baf456..fbac58e1aa 100644
--- a/Zend/tests/bug41075.phpt
+++ b/Zend/tests/bug41075.phpt
@@ -26,9 +26,6 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(40) "Creating default object from empty value"
-Done
---UEXPECTF--	
+--EXPECT--
 unicode(40) "Creating default object from empty value"
 Done
diff --git a/Zend/tests/bug41117_1.phpt b/Zend/tests/bug41117_1.phpt
index f555b637ad..2e54583239 100755
--- a/Zend/tests/bug41117_1.phpt
+++ b/Zend/tests/bug41117_1.phpt
@@ -11,4 +11,3 @@ $obj = new foo("Hello world");
 ?>
 --EXPECTF--
 Fatal error: Cannot re-assign $this in %sbug41117_1.php on line 3
-
diff --git a/Zend/tests/bug41209.phpt b/Zend/tests/bug41209.phpt
index 5498ede020..d1d98bc6ec 100644
--- a/Zend/tests/bug41209.phpt
+++ b/Zend/tests/bug41209.phpt
@@ -38,7 +38,7 @@ var_dump(isset($cache[$id]));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught exception 'ErrorException' with message 'Undefined variable: id' in %s:%d
 Stack trace:
 #0 %s(%d): env::errorHandler(8, '%s', '%s', 34, Array)
diff --git a/Zend/tests/bug41351.phpt b/Zend/tests/bug41351.phpt
index 62af6a0336..6e40669341 100644
--- a/Zend/tests/bug41351.phpt
+++ b/Zend/tests/bug41351.phpt
@@ -10,5 +10,5 @@ foreach($a[] as $b) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for reading in %s on line %d
diff --git a/Zend/tests/bug41351_2.phpt b/Zend/tests/bug41351_2.phpt
index 7009eaa457..0a36189d74 100644
--- a/Zend/tests/bug41351_2.phpt
+++ b/Zend/tests/bug41351_2.phpt
@@ -10,5 +10,5 @@ foreach($a[]['test'] as $b) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for reading in %s on line %d
diff --git a/Zend/tests/bug41351_3.phpt b/Zend/tests/bug41351_3.phpt
index 9cb23882c2..0137ff7920 100644
--- a/Zend/tests/bug41351_3.phpt
+++ b/Zend/tests/bug41351_3.phpt
@@ -10,5 +10,5 @@ foreach($a['test'][] as $b) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for reading in %s on line %d
diff --git a/Zend/tests/bug41401.phpt b/Zend/tests/bug41401.phpt
index 50d2109cac..096091e439 100755
--- a/Zend/tests/bug41401.phpt
+++ b/Zend/tests/bug41401.phpt
@@ -7,4 +7,4 @@ echo "\n";
 echo 6/+2*-3;
 --EXPECT--
 -2.5
--9
\ No newline at end of file
+-9
diff --git a/Zend/tests/bug41421.phpt b/Zend/tests/bug41421.phpt
index f10db10980..a4fbb3cd68 100644
--- a/Zend/tests/bug41421.phpt
+++ b/Zend/tests/bug41421.phpt
@@ -18,7 +18,7 @@ feof($fp);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: feof(): wrapper::stream_eof is not implemented! Assuming EOF in %s on line %d
 
 Fatal error: Uncaught exception 'Exception' in %s:%d
diff --git a/Zend/tests/bug41640.phpt b/Zend/tests/bug41640.phpt
index 11ef334f45..44e52b4e9b 100644
--- a/Zend/tests/bug41640.phpt
+++ b/Zend/tests/bug41640.phpt
@@ -9,11 +9,6 @@ class foo {
 
 var_dump(get_class_vars("foo"));
 --EXPECT--
-array(1) {
-  ["x"]=>
-  int(1)
-}
---UEXPECT--
 array(1) {
   [u"x"]=>
   int(1)
diff --git a/Zend/tests/bug41813.phpt b/Zend/tests/bug41813.phpt
index c330b14fe8..c17554a1a0 100644
--- a/Zend/tests/bug41813.phpt
+++ b/Zend/tests/bug41813.phpt
@@ -8,5 +8,5 @@ $foo[0]->bar = "xyz";
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use string offset as an array in %s on line %d
diff --git a/Zend/tests/bug42211.phpt b/Zend/tests/bug42211.phpt
index e9f2a1e212..80f6b8b004 100644
--- a/Zend/tests/bug42211.phpt
+++ b/Zend/tests/bug42211.phpt
@@ -27,4 +27,3 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
diff --git a/Zend/tests/bug42818.phpt b/Zend/tests/bug42818.phpt
index 09ad693b44..9874a09cb7 100644
--- a/Zend/tests/bug42818.phpt
+++ b/Zend/tests/bug42818.phpt
@@ -6,4 +6,3 @@ $foo = clone(array());
 ?>
 --EXPECTF--
 Fatal error: __clone method called on non-object in %sbug42818.php on line 2
-
diff --git a/Zend/tests/bug42820.phpt b/Zend/tests/bug42820.phpt
index 0a6c7d7876..c5b13b43eb 100755
--- a/Zend/tests/bug42820.phpt
+++ b/Zend/tests/bug42820.phpt
@@ -28,4 +28,3 @@ bool(true)
 bool(false)
 bool(false)
 bool(false)
-
diff --git a/Zend/tests/bug43183.phpt b/Zend/tests/bug43183.phpt
index 61313eb2c6..8da2c833a1 100755
--- a/Zend/tests/bug43183.phpt
+++ b/Zend/tests/bug43183.phpt
@@ -9,4 +9,4 @@ class Bar {}
 use Test::Bar;
 echo "ok\n";
 --EXPECT--
-ok
\ No newline at end of file
+ok
diff --git a/Zend/tests/bug43477.phpt b/Zend/tests/bug43477.phpt
index 6f59e833ed..580ffdbec1 100644
--- a/Zend/tests/bug43477.phpt
+++ b/Zend/tests/bug43477.phpt
@@ -6,4 +6,3 @@ var_dump(unicode_decode(b"\xF8", 'UTF-8', U_CONV_ERROR_SKIP));
 ?>
 --EXPECT--
 unicode(0) ""
-
diff --git a/Zend/tests/bug44830.phpt b/Zend/tests/bug44830.phpt
index 28e2a51a42..fd9b651e65 100644
--- a/Zend/tests/bug44830.phpt
+++ b/Zend/tests/bug44830.phpt
@@ -11,6 +11,4 @@ var_dump($backslash);
 
 ?>
 --EXPECT--
-string(1) "\"
---UEXPECT--
 unicode(1) "\"
diff --git a/Zend/tests/bug_debug_backtrace.phpt b/Zend/tests/bug_debug_backtrace.phpt
index 3e4a0ec946..71ce129201 100755
--- a/Zend/tests/bug_debug_backtrace.phpt
+++ b/Zend/tests/bug_debug_backtrace.phpt
@@ -5,17 +5,17 @@ Bug - crash in debug_backtrace when trace starts in eval
 function foo() {
     bar();
 }
-                                                                                                            
+
 function bar() {
     boo();
 }
-                                                                                                            
+
 function boo(){
     debug_print_backtrace();
 }
-                                                                                                            
+
 eval("foo();");
-                                                                                                            
+
 echo "Done\n";
 ?>
 ===DONE===
diff --git a/Zend/tests/cast_to_array.phpt b/Zend/tests/cast_to_array.phpt
index 5c59d916cf..eed0b81fe7 100644
Binary files a/Zend/tests/cast_to_array.phpt and b/Zend/tests/cast_to_array.phpt differ
diff --git a/Zend/tests/cast_to_bool.phpt b/Zend/tests/cast_to_bool.phpt
index 75ab09d1b5..ebb1df6dfd 100644
--- a/Zend/tests/cast_to_bool.phpt
+++ b/Zend/tests/cast_to_bool.phpt
@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 bool(true)
 bool(true)
 bool(false)
diff --git a/Zend/tests/cast_to_double.phpt b/Zend/tests/cast_to_double.phpt
index a5b9819b02..211f3a90ae 100644
--- a/Zend/tests/cast_to_double.phpt
+++ b/Zend/tests/cast_to_double.phpt
@@ -38,7 +38,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(0)
 float(8754456)
 float(0)
diff --git a/Zend/tests/cast_to_int.phpt b/Zend/tests/cast_to_int.phpt
index 28c57ddf63..2a637e15e5 100644
--- a/Zend/tests/cast_to_int.phpt
+++ b/Zend/tests/cast_to_int.phpt
@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 int(8754456)
 int(0)
diff --git a/Zend/tests/cast_to_object.phpt b/Zend/tests/cast_to_object.phpt
index 586b76ae52..1a3ed3db72 100644
Binary files a/Zend/tests/cast_to_object.phpt and b/Zend/tests/cast_to_object.phpt differ
diff --git a/Zend/tests/cast_to_string.phpt b/Zend/tests/cast_to_string.phpt
index bcbc402958..816c7f86de 100644
Binary files a/Zend/tests/cast_to_string.phpt and b/Zend/tests/cast_to_string.phpt differ
diff --git a/Zend/tests/class_alias_017.phpt b/Zend/tests/class_alias_017.phpt
index f4d3626e45..555e776227 100644
--- a/Zend/tests/class_alias_017.phpt
+++ b/Zend/tests/class_alias_017.phpt
@@ -26,7 +26,7 @@ baz::test();
 bar::test();
 
 ?>
---EXPECTF--
+--EXPECT--
 foo
 baz
 foo
diff --git a/Zend/tests/class_constants_001.phpt b/Zend/tests/class_constants_001.phpt
index f2c3b3e548..26cd87a94e 100644
--- a/Zend/tests/class_constants_001.phpt
+++ b/Zend/tests/class_constants_001.phpt
@@ -15,12 +15,7 @@ var_dump(test::val3);
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(6) "string"
-int(1)
-
-Fatal error: Undefined class constant 'val3' in %s on line %d
---UEXPECTF--
+--EXPECTF--
 unicode(6) "string"
 int(1)
 
diff --git a/Zend/tests/class_constants_002.phpt b/Zend/tests/class_constants_002.phpt
index 9aad8088da..726b9b8357 100644
--- a/Zend/tests/class_constants_002.phpt
+++ b/Zend/tests/class_constants_002.phpt
@@ -23,7 +23,7 @@ bar();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(1)
 int(5)
 int(10)
diff --git a/Zend/tests/class_constants_003.phpt b/Zend/tests/class_constants_003.phpt
index c2782ff1c9..14222a4960 100644
--- a/Zend/tests/class_constants_003.phpt
+++ b/Zend/tests/class_constants_003.phpt
@@ -27,7 +27,7 @@ unlink($filename);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(1)
 int(5)
 Done
diff --git a/Zend/tests/compare_001.phpt b/Zend/tests/compare_001.phpt
index 059ed4a465..9029c2f667 100644
--- a/Zend/tests/compare_001.phpt
+++ b/Zend/tests/compare_001.phpt
@@ -48,346 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} == array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} == bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != object(stdClass)#1 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != object(stdClass)#2 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != object(test)#3 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != int(-2147483648)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(11) "-2147483648"
-string(0) "" != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" == string(0) ""
-string(0) "" != int(1)
-string(0) "" != float(2.5)
-string(0) "" == int(0)
-string(0) "" != string(6) "string"
-string(0) "" != string(3) "123"
-string(0) "" != string(3) "2.5"
-string(0) "" == NULL
-string(0) "" != bool(true)
-string(0) "" == bool(false)
-string(0) "" != object(stdClass)#1 (0) {}
-string(0) "" != object(stdClass)#2 (0) {}
-string(0) "" != object(test)#3 (0) {}
-string(0) "" != array(0) {}
-string(0) "" != int(-2147483648)
-string(0) "" != string(11) "-2147483648"
-int(1) != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) != string(0) ""
-int(1) == int(1)
-int(1) != float(2.5)
-int(1) != int(0)
-int(1) != string(6) "string"
-int(1) != string(3) "123"
-int(1) != string(3) "2.5"
-int(1) != NULL
-int(1) == bool(true)
-int(1) != bool(false)
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- == object(stdClass)#1 (0) {}
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- == object(stdClass)#2 (0) {}
-int(1)
-Notice: Object of class test could not be converted to int in %s on line %d
- == object(test)#3 (0) {}
-int(1) != array(0) {}
-int(1) != int(-2147483648)
-int(1) != string(11) "-2147483648"
-float(2.5) != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) != string(0) ""
-float(2.5) != int(1)
-float(2.5) == float(2.5)
-float(2.5) != int(0)
-float(2.5) != string(6) "string"
-float(2.5) != string(3) "123"
-float(2.5) == string(3) "2.5"
-float(2.5) != NULL
-float(2.5) == bool(true)
-float(2.5) != bool(false)
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- != object(stdClass)#1 (0) {}
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- != object(stdClass)#2 (0) {}
-float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
- != object(test)#3 (0) {}
-float(2.5) != array(0) {}
-float(2.5) != int(-2147483648)
-float(2.5) != string(11) "-2147483648"
-int(0) != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) == string(0) ""
-int(0) != int(1)
-int(0) != float(2.5)
-int(0) == int(0)
-int(0) == string(6) "string"
-int(0) != string(3) "123"
-int(0) != string(3) "2.5"
-int(0) == NULL
-int(0) != bool(true)
-int(0) == bool(false)
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != object(stdClass)#1 (0) {}
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != object(stdClass)#2 (0) {}
-int(0)
-Notice: Object of class test could not be converted to int in %s on line %d
- != object(test)#3 (0) {}
-int(0) != array(0) {}
-int(0) != int(-2147483648)
-int(0) != string(11) "-2147483648"
-string(6) "string" != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" != string(0) ""
-string(6) "string" != int(1)
-string(6) "string" != float(2.5)
-string(6) "string" == int(0)
-string(6) "string" == string(6) "string"
-string(6) "string" != string(3) "123"
-string(6) "string" != string(3) "2.5"
-string(6) "string" != NULL
-string(6) "string" == bool(true)
-string(6) "string" != bool(false)
-string(6) "string" != object(stdClass)#1 (0) {}
-string(6) "string" != object(stdClass)#2 (0) {}
-string(6) "string" != object(test)#3 (0) {}
-string(6) "string" != array(0) {}
-string(6) "string" != int(-2147483648)
-string(6) "string" != string(11) "-2147483648"
-string(3) "123" != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" != string(0) ""
-string(3) "123" != int(1)
-string(3) "123" != float(2.5)
-string(3) "123" != int(0)
-string(3) "123" != string(6) "string"
-string(3) "123" == string(3) "123"
-string(3) "123" != string(3) "2.5"
-string(3) "123" != NULL
-string(3) "123" == bool(true)
-string(3) "123" != bool(false)
-string(3) "123" != object(stdClass)#1 (0) {}
-string(3) "123" != object(stdClass)#2 (0) {}
-string(3) "123" != object(test)#3 (0) {}
-string(3) "123" != array(0) {}
-string(3) "123" != int(-2147483648)
-string(3) "123" != string(11) "-2147483648"
-string(3) "2.5" != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" != string(0) ""
-string(3) "2.5" != int(1)
-string(3) "2.5" == float(2.5)
-string(3) "2.5" != int(0)
-string(3) "2.5" != string(6) "string"
-string(3) "2.5" != string(3) "123"
-string(3) "2.5" == string(3) "2.5"
-string(3) "2.5" != NULL
-string(3) "2.5" == bool(true)
-string(3) "2.5" != bool(false)
-string(3) "2.5" != object(stdClass)#1 (0) {}
-string(3) "2.5" != object(stdClass)#2 (0) {}
-string(3) "2.5" != object(test)#3 (0) {}
-string(3) "2.5" != array(0) {}
-string(3) "2.5" != int(-2147483648)
-string(3) "2.5" != string(11) "-2147483648"
-NULL != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL == string(0) ""
-NULL != int(1)
-NULL != float(2.5)
-NULL == int(0)
-NULL != string(6) "string"
-NULL != string(3) "123"
-NULL != string(3) "2.5"
-NULL == NULL
-NULL != bool(true)
-NULL == bool(false)
-NULL != object(stdClass)#1 (0) {}
-NULL != object(stdClass)#2 (0) {}
-NULL != object(test)#3 (0) {}
-NULL == array(0) {}
-NULL != int(-2147483648)
-NULL != string(11) "-2147483648"
-bool(true) == array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) != string(0) ""
-bool(true) == int(1)
-bool(true) == float(2.5)
-bool(true) != int(0)
-bool(true) == string(6) "string"
-bool(true) == string(3) "123"
-bool(true) == string(3) "2.5"
-bool(true) != NULL
-bool(true) == bool(true)
-bool(true) != bool(false)
-bool(true) == object(stdClass)#1 (0) {}
-bool(true) == object(stdClass)#2 (0) {}
-bool(true) == object(test)#3 (0) {}
-bool(true) != array(0) {}
-bool(true) == int(-2147483648)
-bool(true) == string(11) "-2147483648"
-bool(false) != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) == string(0) ""
-bool(false) != int(1)
-bool(false) != float(2.5)
-bool(false) == int(0)
-bool(false) != string(6) "string"
-bool(false) != string(3) "123"
-bool(false) != string(3) "2.5"
-bool(false) == NULL
-bool(false) != bool(true)
-bool(false) == bool(false)
-bool(false) != object(stdClass)#1 (0) {}
-bool(false) != object(stdClass)#2 (0) {}
-bool(false) != object(test)#3 (0) {}
-bool(false) == array(0) {}
-bool(false) != int(-2147483648)
-bool(false) != string(11) "-2147483648"
-object(stdClass)#1 (0) {} != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#1 (0) {} != string(0) ""
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- == int(1)
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- != float(2.5)
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != int(0)
-object(stdClass)#1 (0) {} != string(6) "string"
-object(stdClass)#1 (0) {} != string(3) "123"
-object(stdClass)#1 (0) {} != string(3) "2.5"
-object(stdClass)#1 (0) {} != NULL
-object(stdClass)#1 (0) {} == bool(true)
-object(stdClass)#1 (0) {} != bool(false)
-object(stdClass)#1 (0) {} == object(stdClass)#1 (0) {}
-object(stdClass)#1 (0) {} == object(stdClass)#2 (0) {}
-object(stdClass)#1 (0) {} != object(test)#3 (0) {}
-object(stdClass)#1 (0) {} != array(0) {}
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != int(-2147483648)
-object(stdClass)#1 (0) {} != string(11) "-2147483648"
-object(stdClass)#2 (0) {} != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#2 (0) {} != string(0) ""
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- == int(1)
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- != float(2.5)
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != int(0)
-object(stdClass)#2 (0) {} != string(6) "string"
-object(stdClass)#2 (0) {} != string(3) "123"
-object(stdClass)#2 (0) {} != string(3) "2.5"
-object(stdClass)#2 (0) {} != NULL
-object(stdClass)#2 (0) {} == bool(true)
-object(stdClass)#2 (0) {} != bool(false)
-object(stdClass)#2 (0) {} == object(stdClass)#1 (0) {}
-object(stdClass)#2 (0) {} == object(stdClass)#2 (0) {}
-object(stdClass)#2 (0) {} != object(test)#3 (0) {}
-object(stdClass)#2 (0) {} != array(0) {}
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != int(-2147483648)
-object(stdClass)#2 (0) {} != string(11) "-2147483648"
-object(test)#3 (0) {} != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#3 (0) {} != string(0) ""
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- == int(1)
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
- != float(2.5)
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- != int(0)
-object(test)#3 (0) {} != string(6) "string"
-object(test)#3 (0) {} != string(3) "123"
-object(test)#3 (0) {} != string(3) "2.5"
-object(test)#3 (0) {} != NULL
-object(test)#3 (0) {} == bool(true)
-object(test)#3 (0) {} != bool(false)
-object(test)#3 (0) {} != object(stdClass)#1 (0) {}
-object(test)#3 (0) {} != object(stdClass)#2 (0) {}
-object(test)#3 (0) {} == object(test)#3 (0) {}
-object(test)#3 (0) {} != array(0) {}
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- != int(-2147483648)
-object(test)#3 (0) {} != string(11) "-2147483648"
-array(0) {} != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} != string(0) ""
-array(0) {} != int(1)
-array(0) {} != float(2.5)
-array(0) {} != int(0)
-array(0) {} != string(6) "string"
-array(0) {} != string(3) "123"
-array(0) {} != string(3) "2.5"
-array(0) {} == NULL
-array(0) {} != bool(true)
-array(0) {} == bool(false)
-array(0) {} != object(stdClass)#1 (0) {}
-array(0) {} != object(stdClass)#2 (0) {}
-array(0) {} != object(test)#3 (0) {}
-array(0) {} == array(0) {}
-array(0) {} != int(-2147483648)
-array(0) {} != string(11) "-2147483648"
-int(-2147483648) != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-2147483648) != string(0) ""
-int(-2147483648) != int(1)
-int(-2147483648) != float(2.5)
-int(-2147483648) != int(0)
-int(-2147483648) != string(6) "string"
-int(-2147483648) != string(3) "123"
-int(-2147483648) != string(3) "2.5"
-int(-2147483648) != NULL
-int(-2147483648) == bool(true)
-int(-2147483648) != bool(false)
-int(-2147483648)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != object(stdClass)#1 (0) {}
-int(-2147483648)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != object(stdClass)#2 (0) {}
-int(-2147483648)
-Notice: Object of class test could not be converted to int in %s on line %d
- != object(test)#3 (0) {}
-int(-2147483648) != array(0) {}
-int(-2147483648) == int(-2147483648)
-int(-2147483648) == string(11) "-2147483648"
-string(11) "-2147483648" != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(11) "-2147483648" != string(0) ""
-string(11) "-2147483648" != int(1)
-string(11) "-2147483648" != float(2.5)
-string(11) "-2147483648" != int(0)
-string(11) "-2147483648" != string(6) "string"
-string(11) "-2147483648" != string(3) "123"
-string(11) "-2147483648" != string(3) "2.5"
-string(11) "-2147483648" != NULL
-string(11) "-2147483648" == bool(true)
-string(11) "-2147483648" != bool(false)
-string(11) "-2147483648" != object(stdClass)#1 (0) {}
-string(11) "-2147483648" != object(stdClass)#2 (0) {}
-string(11) "-2147483648" != object(test)#3 (0) {}
-string(11) "-2147483648" != array(0) {}
-string(11) "-2147483648" == int(-2147483648)
-string(11) "-2147483648" == string(11) "-2147483648"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} == array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != int(1)
diff --git a/Zend/tests/compare_001_64bit.phpt b/Zend/tests/compare_001_64bit.phpt
index 98de1be5a3..e09802a5eb 100644
--- a/Zend/tests/compare_001_64bit.phpt
+++ b/Zend/tests/compare_001_64bit.phpt
@@ -48,346 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} == array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} == bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != object(test)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != int(-9223372036854775808)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(20) "-9223372036854775808"
-string(0) "" != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" == string(0) ""
-string(0) "" != int(1)
-string(0) "" != float(2.5)
-string(0) "" == int(0)
-string(0) "" != string(6) "string"
-string(0) "" != string(3) "123"
-string(0) "" != string(3) "2.5"
-string(0) "" == NULL
-string(0) "" != bool(true)
-string(0) "" == bool(false)
-string(0) "" != object(stdClass)#%d (0) {}
-string(0) "" != object(stdClass)#%d (0) {}
-string(0) "" != object(test)#%d (0) {}
-string(0) "" != array(0) {}
-string(0) "" != int(-9223372036854775808)
-string(0) "" != string(20) "-9223372036854775808"
-int(1) != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) != string(0) ""
-int(1) == int(1)
-int(1) != float(2.5)
-int(1) != int(0)
-int(1) != string(6) "string"
-int(1) != string(3) "123"
-int(1) != string(3) "2.5"
-int(1) != NULL
-int(1) == bool(true)
-int(1) != bool(false)
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- == object(stdClass)#%d (0) {}
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- == object(stdClass)#%d (0) {}
-int(1)
-Notice: Object of class test could not be converted to int in %s on line %d
- == object(test)#%d (0) {}
-int(1) != array(0) {}
-int(1) != int(-9223372036854775808)
-int(1) != string(20) "-9223372036854775808"
-float(2.5) != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) != string(0) ""
-float(2.5) != int(1)
-float(2.5) == float(2.5)
-float(2.5) != int(0)
-float(2.5) != string(6) "string"
-float(2.5) != string(3) "123"
-float(2.5) == string(3) "2.5"
-float(2.5) != NULL
-float(2.5) == bool(true)
-float(2.5) != bool(false)
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- != object(stdClass)#%d (0) {}
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- != object(stdClass)#%d (0) {}
-float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
- != object(test)#%d (0) {}
-float(2.5) != array(0) {}
-float(2.5) != int(-9223372036854775808)
-float(2.5) != string(20) "-9223372036854775808"
-int(0) != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) == string(0) ""
-int(0) != int(1)
-int(0) != float(2.5)
-int(0) == int(0)
-int(0) == string(6) "string"
-int(0) != string(3) "123"
-int(0) != string(3) "2.5"
-int(0) == NULL
-int(0) != bool(true)
-int(0) == bool(false)
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != object(stdClass)#%d (0) {}
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != object(stdClass)#%d (0) {}
-int(0)
-Notice: Object of class test could not be converted to int in %s on line %d
- != object(test)#%d (0) {}
-int(0) != array(0) {}
-int(0) != int(-9223372036854775808)
-int(0) != string(20) "-9223372036854775808"
-string(6) "string" != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" != string(0) ""
-string(6) "string" != int(1)
-string(6) "string" != float(2.5)
-string(6) "string" == int(0)
-string(6) "string" == string(6) "string"
-string(6) "string" != string(3) "123"
-string(6) "string" != string(3) "2.5"
-string(6) "string" != NULL
-string(6) "string" == bool(true)
-string(6) "string" != bool(false)
-string(6) "string" != object(stdClass)#%d (0) {}
-string(6) "string" != object(stdClass)#%d (0) {}
-string(6) "string" != object(test)#%d (0) {}
-string(6) "string" != array(0) {}
-string(6) "string" != int(-9223372036854775808)
-string(6) "string" != string(20) "-9223372036854775808"
-string(3) "123" != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" != string(0) ""
-string(3) "123" != int(1)
-string(3) "123" != float(2.5)
-string(3) "123" != int(0)
-string(3) "123" != string(6) "string"
-string(3) "123" == string(3) "123"
-string(3) "123" != string(3) "2.5"
-string(3) "123" != NULL
-string(3) "123" == bool(true)
-string(3) "123" != bool(false)
-string(3) "123" != object(stdClass)#%d (0) {}
-string(3) "123" != object(stdClass)#%d (0) {}
-string(3) "123" != object(test)#%d (0) {}
-string(3) "123" != array(0) {}
-string(3) "123" != int(-9223372036854775808)
-string(3) "123" != string(20) "-9223372036854775808"
-string(3) "2.5" != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" != string(0) ""
-string(3) "2.5" != int(1)
-string(3) "2.5" == float(2.5)
-string(3) "2.5" != int(0)
-string(3) "2.5" != string(6) "string"
-string(3) "2.5" != string(3) "123"
-string(3) "2.5" == string(3) "2.5"
-string(3) "2.5" != NULL
-string(3) "2.5" == bool(true)
-string(3) "2.5" != bool(false)
-string(3) "2.5" != object(stdClass)#%d (0) {}
-string(3) "2.5" != object(stdClass)#%d (0) {}
-string(3) "2.5" != object(test)#%d (0) {}
-string(3) "2.5" != array(0) {}
-string(3) "2.5" != int(-9223372036854775808)
-string(3) "2.5" != string(20) "-9223372036854775808"
-NULL != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL == string(0) ""
-NULL != int(1)
-NULL != float(2.5)
-NULL == int(0)
-NULL != string(6) "string"
-NULL != string(3) "123"
-NULL != string(3) "2.5"
-NULL == NULL
-NULL != bool(true)
-NULL == bool(false)
-NULL != object(stdClass)#%d (0) {}
-NULL != object(stdClass)#%d (0) {}
-NULL != object(test)#%d (0) {}
-NULL == array(0) {}
-NULL != int(-9223372036854775808)
-NULL != string(20) "-9223372036854775808"
-bool(true) == array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) != string(0) ""
-bool(true) == int(1)
-bool(true) == float(2.5)
-bool(true) != int(0)
-bool(true) == string(6) "string"
-bool(true) == string(3) "123"
-bool(true) == string(3) "2.5"
-bool(true) != NULL
-bool(true) == bool(true)
-bool(true) != bool(false)
-bool(true) == object(stdClass)#%d (0) {}
-bool(true) == object(stdClass)#%d (0) {}
-bool(true) == object(test)#%d (0) {}
-bool(true) != array(0) {}
-bool(true) == int(-9223372036854775808)
-bool(true) == string(20) "-9223372036854775808"
-bool(false) != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) == string(0) ""
-bool(false) != int(1)
-bool(false) != float(2.5)
-bool(false) == int(0)
-bool(false) != string(6) "string"
-bool(false) != string(3) "123"
-bool(false) != string(3) "2.5"
-bool(false) == NULL
-bool(false) != bool(true)
-bool(false) == bool(false)
-bool(false) != object(stdClass)#%d (0) {}
-bool(false) != object(stdClass)#%d (0) {}
-bool(false) != object(test)#%d (0) {}
-bool(false) == array(0) {}
-bool(false) != int(-9223372036854775808)
-bool(false) != string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} != string(0) ""
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- == int(1)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- != float(2.5)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != int(0)
-object(stdClass)#%d (0) {} != string(6) "string"
-object(stdClass)#%d (0) {} != string(3) "123"
-object(stdClass)#%d (0) {} != string(3) "2.5"
-object(stdClass)#%d (0) {} != NULL
-object(stdClass)#%d (0) {} == bool(true)
-object(stdClass)#%d (0) {} != bool(false)
-object(stdClass)#%d (0) {} == object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} == object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} != object(test)#%d (0) {}
-object(stdClass)#%d (0) {} != array(0) {}
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != int(-9223372036854775808)
-object(stdClass)#%d (0) {} != string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} != string(0) ""
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- == int(1)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- != float(2.5)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != int(0)
-object(stdClass)#%d (0) {} != string(6) "string"
-object(stdClass)#%d (0) {} != string(3) "123"
-object(stdClass)#%d (0) {} != string(3) "2.5"
-object(stdClass)#%d (0) {} != NULL
-object(stdClass)#%d (0) {} == bool(true)
-object(stdClass)#%d (0) {} != bool(false)
-object(stdClass)#%d (0) {} == object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} == object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} != object(test)#%d (0) {}
-object(stdClass)#%d (0) {} != array(0) {}
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != int(-9223372036854775808)
-object(stdClass)#%d (0) {} != string(20) "-9223372036854775808"
-object(test)#%d (0) {} != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#%d (0) {} != string(0) ""
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- == int(1)
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
- != float(2.5)
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- != int(0)
-object(test)#%d (0) {} != string(6) "string"
-object(test)#%d (0) {} != string(3) "123"
-object(test)#%d (0) {} != string(3) "2.5"
-object(test)#%d (0) {} != NULL
-object(test)#%d (0) {} == bool(true)
-object(test)#%d (0) {} != bool(false)
-object(test)#%d (0) {} != object(stdClass)#%d (0) {}
-object(test)#%d (0) {} != object(stdClass)#%d (0) {}
-object(test)#%d (0) {} == object(test)#%d (0) {}
-object(test)#%d (0) {} != array(0) {}
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- != int(-9223372036854775808)
-object(test)#%d (0) {} != string(20) "-9223372036854775808"
-array(0) {} != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} != string(0) ""
-array(0) {} != int(1)
-array(0) {} != float(2.5)
-array(0) {} != int(0)
-array(0) {} != string(6) "string"
-array(0) {} != string(3) "123"
-array(0) {} != string(3) "2.5"
-array(0) {} == NULL
-array(0) {} != bool(true)
-array(0) {} == bool(false)
-array(0) {} != object(stdClass)#%d (0) {}
-array(0) {} != object(stdClass)#%d (0) {}
-array(0) {} != object(test)#%d (0) {}
-array(0) {} == array(0) {}
-array(0) {} != int(-9223372036854775808)
-array(0) {} != string(20) "-9223372036854775808"
-int(-9223372036854775808) != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-9223372036854775808) != string(0) ""
-int(-9223372036854775808) != int(1)
-int(-9223372036854775808) != float(2.5)
-int(-9223372036854775808) != int(0)
-int(-9223372036854775808) != string(6) "string"
-int(-9223372036854775808) != string(3) "123"
-int(-9223372036854775808) != string(3) "2.5"
-int(-9223372036854775808) != NULL
-int(-9223372036854775808) == bool(true)
-int(-9223372036854775808) != bool(false)
-int(-9223372036854775808)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != object(stdClass)#%d (0) {}
-int(-9223372036854775808)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- != object(stdClass)#%d (0) {}
-int(-9223372036854775808)
-Notice: Object of class test could not be converted to int in %s on line %d
- != object(test)#%d (0) {}
-int(-9223372036854775808) != array(0) {}
-int(-9223372036854775808) == int(-9223372036854775808)
-int(-9223372036854775808) == string(20) "-9223372036854775808"
-string(20) "-9223372036854775808" != array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(20) "-9223372036854775808" != string(0) ""
-string(20) "-9223372036854775808" != int(1)
-string(20) "-9223372036854775808" != float(2.5)
-string(20) "-9223372036854775808" != int(0)
-string(20) "-9223372036854775808" != string(6) "string"
-string(20) "-9223372036854775808" != string(3) "123"
-string(20) "-9223372036854775808" != string(3) "2.5"
-string(20) "-9223372036854775808" != NULL
-string(20) "-9223372036854775808" == bool(true)
-string(20) "-9223372036854775808" != bool(false)
-string(20) "-9223372036854775808" != object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" != object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" != object(test)#%d (0) {}
-string(20) "-9223372036854775808" != array(0) {}
-string(20) "-9223372036854775808" == int(-9223372036854775808)
-string(20) "-9223372036854775808" == string(20) "-9223372036854775808"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} == array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != int(1)
diff --git a/Zend/tests/compare_002.phpt b/Zend/tests/compare_002.phpt
index 889f700c49..3969671342 100644
--- a/Zend/tests/compare_002.phpt
+++ b/Zend/tests/compare_002.phpt
@@ -48,298 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} === array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== object(stdClass)#1 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== object(stdClass)#2 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== object(test)#3 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(-2147483648)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(11) "-2147483648"
-string(0) "" !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" === string(0) ""
-string(0) "" !== int(1)
-string(0) "" !== float(2.5)
-string(0) "" !== int(0)
-string(0) "" !== string(6) "string"
-string(0) "" !== string(3) "123"
-string(0) "" !== string(3) "2.5"
-string(0) "" !== NULL
-string(0) "" !== bool(true)
-string(0) "" !== bool(false)
-string(0) "" !== object(stdClass)#1 (0) {}
-string(0) "" !== object(stdClass)#2 (0) {}
-string(0) "" !== object(test)#3 (0) {}
-string(0) "" !== array(0) {}
-string(0) "" !== int(-2147483648)
-string(0) "" !== string(11) "-2147483648"
-int(1) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) !== string(0) ""
-int(1) === int(1)
-int(1) !== float(2.5)
-int(1) !== int(0)
-int(1) !== string(6) "string"
-int(1) !== string(3) "123"
-int(1) !== string(3) "2.5"
-int(1) !== NULL
-int(1) !== bool(true)
-int(1) !== bool(false)
-int(1) !== object(stdClass)#1 (0) {}
-int(1) !== object(stdClass)#2 (0) {}
-int(1) !== object(test)#3 (0) {}
-int(1) !== array(0) {}
-int(1) !== int(-2147483648)
-int(1) !== string(11) "-2147483648"
-float(2.5) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) !== string(0) ""
-float(2.5) !== int(1)
-float(2.5) === float(2.5)
-float(2.5) !== int(0)
-float(2.5) !== string(6) "string"
-float(2.5) !== string(3) "123"
-float(2.5) !== string(3) "2.5"
-float(2.5) !== NULL
-float(2.5) !== bool(true)
-float(2.5) !== bool(false)
-float(2.5) !== object(stdClass)#1 (0) {}
-float(2.5) !== object(stdClass)#2 (0) {}
-float(2.5) !== object(test)#3 (0) {}
-float(2.5) !== array(0) {}
-float(2.5) !== int(-2147483648)
-float(2.5) !== string(11) "-2147483648"
-int(0) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) !== string(0) ""
-int(0) !== int(1)
-int(0) !== float(2.5)
-int(0) === int(0)
-int(0) !== string(6) "string"
-int(0) !== string(3) "123"
-int(0) !== string(3) "2.5"
-int(0) !== NULL
-int(0) !== bool(true)
-int(0) !== bool(false)
-int(0) !== object(stdClass)#1 (0) {}
-int(0) !== object(stdClass)#2 (0) {}
-int(0) !== object(test)#3 (0) {}
-int(0) !== array(0) {}
-int(0) !== int(-2147483648)
-int(0) !== string(11) "-2147483648"
-string(6) "string" !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" !== string(0) ""
-string(6) "string" !== int(1)
-string(6) "string" !== float(2.5)
-string(6) "string" !== int(0)
-string(6) "string" === string(6) "string"
-string(6) "string" !== string(3) "123"
-string(6) "string" !== string(3) "2.5"
-string(6) "string" !== NULL
-string(6) "string" !== bool(true)
-string(6) "string" !== bool(false)
-string(6) "string" !== object(stdClass)#1 (0) {}
-string(6) "string" !== object(stdClass)#2 (0) {}
-string(6) "string" !== object(test)#3 (0) {}
-string(6) "string" !== array(0) {}
-string(6) "string" !== int(-2147483648)
-string(6) "string" !== string(11) "-2147483648"
-string(3) "123" !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" !== string(0) ""
-string(3) "123" !== int(1)
-string(3) "123" !== float(2.5)
-string(3) "123" !== int(0)
-string(3) "123" !== string(6) "string"
-string(3) "123" === string(3) "123"
-string(3) "123" !== string(3) "2.5"
-string(3) "123" !== NULL
-string(3) "123" !== bool(true)
-string(3) "123" !== bool(false)
-string(3) "123" !== object(stdClass)#1 (0) {}
-string(3) "123" !== object(stdClass)#2 (0) {}
-string(3) "123" !== object(test)#3 (0) {}
-string(3) "123" !== array(0) {}
-string(3) "123" !== int(-2147483648)
-string(3) "123" !== string(11) "-2147483648"
-string(3) "2.5" !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" !== string(0) ""
-string(3) "2.5" !== int(1)
-string(3) "2.5" !== float(2.5)
-string(3) "2.5" !== int(0)
-string(3) "2.5" !== string(6) "string"
-string(3) "2.5" !== string(3) "123"
-string(3) "2.5" === string(3) "2.5"
-string(3) "2.5" !== NULL
-string(3) "2.5" !== bool(true)
-string(3) "2.5" !== bool(false)
-string(3) "2.5" !== object(stdClass)#1 (0) {}
-string(3) "2.5" !== object(stdClass)#2 (0) {}
-string(3) "2.5" !== object(test)#3 (0) {}
-string(3) "2.5" !== array(0) {}
-string(3) "2.5" !== int(-2147483648)
-string(3) "2.5" !== string(11) "-2147483648"
-NULL !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL !== string(0) ""
-NULL !== int(1)
-NULL !== float(2.5)
-NULL !== int(0)
-NULL !== string(6) "string"
-NULL !== string(3) "123"
-NULL !== string(3) "2.5"
-NULL === NULL
-NULL !== bool(true)
-NULL !== bool(false)
-NULL !== object(stdClass)#1 (0) {}
-NULL !== object(stdClass)#2 (0) {}
-NULL !== object(test)#3 (0) {}
-NULL !== array(0) {}
-NULL !== int(-2147483648)
-NULL !== string(11) "-2147483648"
-bool(true) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) !== string(0) ""
-bool(true) !== int(1)
-bool(true) !== float(2.5)
-bool(true) !== int(0)
-bool(true) !== string(6) "string"
-bool(true) !== string(3) "123"
-bool(true) !== string(3) "2.5"
-bool(true) !== NULL
-bool(true) === bool(true)
-bool(true) !== bool(false)
-bool(true) !== object(stdClass)#1 (0) {}
-bool(true) !== object(stdClass)#2 (0) {}
-bool(true) !== object(test)#3 (0) {}
-bool(true) !== array(0) {}
-bool(true) !== int(-2147483648)
-bool(true) !== string(11) "-2147483648"
-bool(false) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) !== string(0) ""
-bool(false) !== int(1)
-bool(false) !== float(2.5)
-bool(false) !== int(0)
-bool(false) !== string(6) "string"
-bool(false) !== string(3) "123"
-bool(false) !== string(3) "2.5"
-bool(false) !== NULL
-bool(false) !== bool(true)
-bool(false) === bool(false)
-bool(false) !== object(stdClass)#1 (0) {}
-bool(false) !== object(stdClass)#2 (0) {}
-bool(false) !== object(test)#3 (0) {}
-bool(false) !== array(0) {}
-bool(false) !== int(-2147483648)
-bool(false) !== string(11) "-2147483648"
-object(stdClass)#1 (0) {} !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#1 (0) {} !== string(0) ""
-object(stdClass)#1 (0) {} !== int(1)
-object(stdClass)#1 (0) {} !== float(2.5)
-object(stdClass)#1 (0) {} !== int(0)
-object(stdClass)#1 (0) {} !== string(6) "string"
-object(stdClass)#1 (0) {} !== string(3) "123"
-object(stdClass)#1 (0) {} !== string(3) "2.5"
-object(stdClass)#1 (0) {} !== NULL
-object(stdClass)#1 (0) {} !== bool(true)
-object(stdClass)#1 (0) {} !== bool(false)
-object(stdClass)#1 (0) {} === object(stdClass)#1 (0) {}
-object(stdClass)#1 (0) {} !== object(stdClass)#2 (0) {}
-object(stdClass)#1 (0) {} !== object(test)#3 (0) {}
-object(stdClass)#1 (0) {} !== array(0) {}
-object(stdClass)#1 (0) {} !== int(-2147483648)
-object(stdClass)#1 (0) {} !== string(11) "-2147483648"
-object(stdClass)#2 (0) {} !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#2 (0) {} !== string(0) ""
-object(stdClass)#2 (0) {} !== int(1)
-object(stdClass)#2 (0) {} !== float(2.5)
-object(stdClass)#2 (0) {} !== int(0)
-object(stdClass)#2 (0) {} !== string(6) "string"
-object(stdClass)#2 (0) {} !== string(3) "123"
-object(stdClass)#2 (0) {} !== string(3) "2.5"
-object(stdClass)#2 (0) {} !== NULL
-object(stdClass)#2 (0) {} !== bool(true)
-object(stdClass)#2 (0) {} !== bool(false)
-object(stdClass)#2 (0) {} !== object(stdClass)#1 (0) {}
-object(stdClass)#2 (0) {} === object(stdClass)#2 (0) {}
-object(stdClass)#2 (0) {} !== object(test)#3 (0) {}
-object(stdClass)#2 (0) {} !== array(0) {}
-object(stdClass)#2 (0) {} !== int(-2147483648)
-object(stdClass)#2 (0) {} !== string(11) "-2147483648"
-object(test)#3 (0) {} !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#3 (0) {} !== string(0) ""
-object(test)#3 (0) {} !== int(1)
-object(test)#3 (0) {} !== float(2.5)
-object(test)#3 (0) {} !== int(0)
-object(test)#3 (0) {} !== string(6) "string"
-object(test)#3 (0) {} !== string(3) "123"
-object(test)#3 (0) {} !== string(3) "2.5"
-object(test)#3 (0) {} !== NULL
-object(test)#3 (0) {} !== bool(true)
-object(test)#3 (0) {} !== bool(false)
-object(test)#3 (0) {} !== object(stdClass)#1 (0) {}
-object(test)#3 (0) {} !== object(stdClass)#2 (0) {}
-object(test)#3 (0) {} === object(test)#3 (0) {}
-object(test)#3 (0) {} !== array(0) {}
-object(test)#3 (0) {} !== int(-2147483648)
-object(test)#3 (0) {} !== string(11) "-2147483648"
-array(0) {} !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} !== string(0) ""
-array(0) {} !== int(1)
-array(0) {} !== float(2.5)
-array(0) {} !== int(0)
-array(0) {} !== string(6) "string"
-array(0) {} !== string(3) "123"
-array(0) {} !== string(3) "2.5"
-array(0) {} !== NULL
-array(0) {} !== bool(true)
-array(0) {} !== bool(false)
-array(0) {} !== object(stdClass)#1 (0) {}
-array(0) {} !== object(stdClass)#2 (0) {}
-array(0) {} !== object(test)#3 (0) {}
-array(0) {} === array(0) {}
-array(0) {} !== int(-2147483648)
-array(0) {} !== string(11) "-2147483648"
-int(-2147483648) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-2147483648) !== string(0) ""
-int(-2147483648) !== int(1)
-int(-2147483648) !== float(2.5)
-int(-2147483648) !== int(0)
-int(-2147483648) !== string(6) "string"
-int(-2147483648) !== string(3) "123"
-int(-2147483648) !== string(3) "2.5"
-int(-2147483648) !== NULL
-int(-2147483648) !== bool(true)
-int(-2147483648) !== bool(false)
-int(-2147483648) !== object(stdClass)#1 (0) {}
-int(-2147483648) !== object(stdClass)#2 (0) {}
-int(-2147483648) !== object(test)#3 (0) {}
-int(-2147483648) !== array(0) {}
-int(-2147483648) === int(-2147483648)
-int(-2147483648) !== string(11) "-2147483648"
-string(11) "-2147483648" !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(11) "-2147483648" !== string(0) ""
-string(11) "-2147483648" !== int(1)
-string(11) "-2147483648" !== float(2.5)
-string(11) "-2147483648" !== int(0)
-string(11) "-2147483648" !== string(6) "string"
-string(11) "-2147483648" !== string(3) "123"
-string(11) "-2147483648" !== string(3) "2.5"
-string(11) "-2147483648" !== NULL
-string(11) "-2147483648" !== bool(true)
-string(11) "-2147483648" !== bool(false)
-string(11) "-2147483648" !== object(stdClass)#1 (0) {}
-string(11) "-2147483648" !== object(stdClass)#2 (0) {}
-string(11) "-2147483648" !== object(test)#3 (0) {}
-string(11) "-2147483648" !== array(0) {}
-string(11) "-2147483648" !== int(-2147483648)
-string(11) "-2147483648" === string(11) "-2147483648"
-Done
---UEXPECTF--
+--EXPECT--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} === array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(1)
diff --git a/Zend/tests/compare_002_64bit.phpt b/Zend/tests/compare_002_64bit.phpt
index e6fda1a6ee..6ed8afba52 100644
--- a/Zend/tests/compare_002_64bit.phpt
+++ b/Zend/tests/compare_002_64bit.phpt
@@ -48,298 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} === array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== object(test)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(-9223372036854775808)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(20) "-9223372036854775808"
-string(0) "" !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" === string(0) ""
-string(0) "" !== int(1)
-string(0) "" !== float(2.5)
-string(0) "" !== int(0)
-string(0) "" !== string(6) "string"
-string(0) "" !== string(3) "123"
-string(0) "" !== string(3) "2.5"
-string(0) "" !== NULL
-string(0) "" !== bool(true)
-string(0) "" !== bool(false)
-string(0) "" !== object(stdClass)#%d (0) {}
-string(0) "" !== object(stdClass)#%d (0) {}
-string(0) "" !== object(test)#%d (0) {}
-string(0) "" !== array(0) {}
-string(0) "" !== int(-9223372036854775808)
-string(0) "" !== string(20) "-9223372036854775808"
-int(1) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) !== string(0) ""
-int(1) === int(1)
-int(1) !== float(2.5)
-int(1) !== int(0)
-int(1) !== string(6) "string"
-int(1) !== string(3) "123"
-int(1) !== string(3) "2.5"
-int(1) !== NULL
-int(1) !== bool(true)
-int(1) !== bool(false)
-int(1) !== object(stdClass)#%d (0) {}
-int(1) !== object(stdClass)#%d (0) {}
-int(1) !== object(test)#%d (0) {}
-int(1) !== array(0) {}
-int(1) !== int(-9223372036854775808)
-int(1) !== string(20) "-9223372036854775808"
-float(2.5) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) !== string(0) ""
-float(2.5) !== int(1)
-float(2.5) === float(2.5)
-float(2.5) !== int(0)
-float(2.5) !== string(6) "string"
-float(2.5) !== string(3) "123"
-float(2.5) !== string(3) "2.5"
-float(2.5) !== NULL
-float(2.5) !== bool(true)
-float(2.5) !== bool(false)
-float(2.5) !== object(stdClass)#%d (0) {}
-float(2.5) !== object(stdClass)#%d (0) {}
-float(2.5) !== object(test)#%d (0) {}
-float(2.5) !== array(0) {}
-float(2.5) !== int(-9223372036854775808)
-float(2.5) !== string(20) "-9223372036854775808"
-int(0) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) !== string(0) ""
-int(0) !== int(1)
-int(0) !== float(2.5)
-int(0) === int(0)
-int(0) !== string(6) "string"
-int(0) !== string(3) "123"
-int(0) !== string(3) "2.5"
-int(0) !== NULL
-int(0) !== bool(true)
-int(0) !== bool(false)
-int(0) !== object(stdClass)#%d (0) {}
-int(0) !== object(stdClass)#%d (0) {}
-int(0) !== object(test)#%d (0) {}
-int(0) !== array(0) {}
-int(0) !== int(-9223372036854775808)
-int(0) !== string(20) "-9223372036854775808"
-string(6) "string" !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" !== string(0) ""
-string(6) "string" !== int(1)
-string(6) "string" !== float(2.5)
-string(6) "string" !== int(0)
-string(6) "string" === string(6) "string"
-string(6) "string" !== string(3) "123"
-string(6) "string" !== string(3) "2.5"
-string(6) "string" !== NULL
-string(6) "string" !== bool(true)
-string(6) "string" !== bool(false)
-string(6) "string" !== object(stdClass)#%d (0) {}
-string(6) "string" !== object(stdClass)#%d (0) {}
-string(6) "string" !== object(test)#%d (0) {}
-string(6) "string" !== array(0) {}
-string(6) "string" !== int(-9223372036854775808)
-string(6) "string" !== string(20) "-9223372036854775808"
-string(3) "123" !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" !== string(0) ""
-string(3) "123" !== int(1)
-string(3) "123" !== float(2.5)
-string(3) "123" !== int(0)
-string(3) "123" !== string(6) "string"
-string(3) "123" === string(3) "123"
-string(3) "123" !== string(3) "2.5"
-string(3) "123" !== NULL
-string(3) "123" !== bool(true)
-string(3) "123" !== bool(false)
-string(3) "123" !== object(stdClass)#%d (0) {}
-string(3) "123" !== object(stdClass)#%d (0) {}
-string(3) "123" !== object(test)#%d (0) {}
-string(3) "123" !== array(0) {}
-string(3) "123" !== int(-9223372036854775808)
-string(3) "123" !== string(20) "-9223372036854775808"
-string(3) "2.5" !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" !== string(0) ""
-string(3) "2.5" !== int(1)
-string(3) "2.5" !== float(2.5)
-string(3) "2.5" !== int(0)
-string(3) "2.5" !== string(6) "string"
-string(3) "2.5" !== string(3) "123"
-string(3) "2.5" === string(3) "2.5"
-string(3) "2.5" !== NULL
-string(3) "2.5" !== bool(true)
-string(3) "2.5" !== bool(false)
-string(3) "2.5" !== object(stdClass)#%d (0) {}
-string(3) "2.5" !== object(stdClass)#%d (0) {}
-string(3) "2.5" !== object(test)#%d (0) {}
-string(3) "2.5" !== array(0) {}
-string(3) "2.5" !== int(-9223372036854775808)
-string(3) "2.5" !== string(20) "-9223372036854775808"
-NULL !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL !== string(0) ""
-NULL !== int(1)
-NULL !== float(2.5)
-NULL !== int(0)
-NULL !== string(6) "string"
-NULL !== string(3) "123"
-NULL !== string(3) "2.5"
-NULL === NULL
-NULL !== bool(true)
-NULL !== bool(false)
-NULL !== object(stdClass)#%d (0) {}
-NULL !== object(stdClass)#%d (0) {}
-NULL !== object(test)#%d (0) {}
-NULL !== array(0) {}
-NULL !== int(-9223372036854775808)
-NULL !== string(20) "-9223372036854775808"
-bool(true) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) !== string(0) ""
-bool(true) !== int(1)
-bool(true) !== float(2.5)
-bool(true) !== int(0)
-bool(true) !== string(6) "string"
-bool(true) !== string(3) "123"
-bool(true) !== string(3) "2.5"
-bool(true) !== NULL
-bool(true) === bool(true)
-bool(true) !== bool(false)
-bool(true) !== object(stdClass)#%d (0) {}
-bool(true) !== object(stdClass)#%d (0) {}
-bool(true) !== object(test)#%d (0) {}
-bool(true) !== array(0) {}
-bool(true) !== int(-9223372036854775808)
-bool(true) !== string(20) "-9223372036854775808"
-bool(false) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) !== string(0) ""
-bool(false) !== int(1)
-bool(false) !== float(2.5)
-bool(false) !== int(0)
-bool(false) !== string(6) "string"
-bool(false) !== string(3) "123"
-bool(false) !== string(3) "2.5"
-bool(false) !== NULL
-bool(false) !== bool(true)
-bool(false) === bool(false)
-bool(false) !== object(stdClass)#%d (0) {}
-bool(false) !== object(stdClass)#%d (0) {}
-bool(false) !== object(test)#%d (0) {}
-bool(false) !== array(0) {}
-bool(false) !== int(-9223372036854775808)
-bool(false) !== string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} !== string(0) ""
-object(stdClass)#%d (0) {} !== int(1)
-object(stdClass)#%d (0) {} !== float(2.5)
-object(stdClass)#%d (0) {} !== int(0)
-object(stdClass)#%d (0) {} !== string(6) "string"
-object(stdClass)#%d (0) {} !== string(3) "123"
-object(stdClass)#%d (0) {} !== string(3) "2.5"
-object(stdClass)#%d (0) {} !== NULL
-object(stdClass)#%d (0) {} !== bool(true)
-object(stdClass)#%d (0) {} !== bool(false)
-object(stdClass)#%d (0) {} === object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} !== object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} !== object(test)#%d (0) {}
-object(stdClass)#%d (0) {} !== array(0) {}
-object(stdClass)#%d (0) {} !== int(-9223372036854775808)
-object(stdClass)#%d (0) {} !== string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} !== string(0) ""
-object(stdClass)#%d (0) {} !== int(1)
-object(stdClass)#%d (0) {} !== float(2.5)
-object(stdClass)#%d (0) {} !== int(0)
-object(stdClass)#%d (0) {} !== string(6) "string"
-object(stdClass)#%d (0) {} !== string(3) "123"
-object(stdClass)#%d (0) {} !== string(3) "2.5"
-object(stdClass)#%d (0) {} !== NULL
-object(stdClass)#%d (0) {} !== bool(true)
-object(stdClass)#%d (0) {} !== bool(false)
-object(stdClass)#%d (0) {} !== object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} === object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} !== object(test)#%d (0) {}
-object(stdClass)#%d (0) {} !== array(0) {}
-object(stdClass)#%d (0) {} !== int(-9223372036854775808)
-object(stdClass)#%d (0) {} !== string(20) "-9223372036854775808"
-object(test)#%d (0) {} !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#%d (0) {} !== string(0) ""
-object(test)#%d (0) {} !== int(1)
-object(test)#%d (0) {} !== float(2.5)
-object(test)#%d (0) {} !== int(0)
-object(test)#%d (0) {} !== string(6) "string"
-object(test)#%d (0) {} !== string(3) "123"
-object(test)#%d (0) {} !== string(3) "2.5"
-object(test)#%d (0) {} !== NULL
-object(test)#%d (0) {} !== bool(true)
-object(test)#%d (0) {} !== bool(false)
-object(test)#%d (0) {} !== object(stdClass)#%d (0) {}
-object(test)#%d (0) {} !== object(stdClass)#%d (0) {}
-object(test)#%d (0) {} === object(test)#%d (0) {}
-object(test)#%d (0) {} !== array(0) {}
-object(test)#%d (0) {} !== int(-9223372036854775808)
-object(test)#%d (0) {} !== string(20) "-9223372036854775808"
-array(0) {} !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} !== string(0) ""
-array(0) {} !== int(1)
-array(0) {} !== float(2.5)
-array(0) {} !== int(0)
-array(0) {} !== string(6) "string"
-array(0) {} !== string(3) "123"
-array(0) {} !== string(3) "2.5"
-array(0) {} !== NULL
-array(0) {} !== bool(true)
-array(0) {} !== bool(false)
-array(0) {} !== object(stdClass)#%d (0) {}
-array(0) {} !== object(stdClass)#%d (0) {}
-array(0) {} !== object(test)#%d (0) {}
-array(0) {} === array(0) {}
-array(0) {} !== int(-9223372036854775808)
-array(0) {} !== string(20) "-9223372036854775808"
-int(-9223372036854775808) !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-9223372036854775808) !== string(0) ""
-int(-9223372036854775808) !== int(1)
-int(-9223372036854775808) !== float(2.5)
-int(-9223372036854775808) !== int(0)
-int(-9223372036854775808) !== string(6) "string"
-int(-9223372036854775808) !== string(3) "123"
-int(-9223372036854775808) !== string(3) "2.5"
-int(-9223372036854775808) !== NULL
-int(-9223372036854775808) !== bool(true)
-int(-9223372036854775808) !== bool(false)
-int(-9223372036854775808) !== object(stdClass)#%d (0) {}
-int(-9223372036854775808) !== object(stdClass)#%d (0) {}
-int(-9223372036854775808) !== object(test)#%d (0) {}
-int(-9223372036854775808) !== array(0) {}
-int(-9223372036854775808) === int(-9223372036854775808)
-int(-9223372036854775808) !== string(20) "-9223372036854775808"
-string(20) "-9223372036854775808" !== array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(20) "-9223372036854775808" !== string(0) ""
-string(20) "-9223372036854775808" !== int(1)
-string(20) "-9223372036854775808" !== float(2.5)
-string(20) "-9223372036854775808" !== int(0)
-string(20) "-9223372036854775808" !== string(6) "string"
-string(20) "-9223372036854775808" !== string(3) "123"
-string(20) "-9223372036854775808" !== string(3) "2.5"
-string(20) "-9223372036854775808" !== NULL
-string(20) "-9223372036854775808" !== bool(true)
-string(20) "-9223372036854775808" !== bool(false)
-string(20) "-9223372036854775808" !== object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" !== object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" !== object(test)#%d (0) {}
-string(20) "-9223372036854775808" !== array(0) {}
-string(20) "-9223372036854775808" !== int(-9223372036854775808)
-string(20) "-9223372036854775808" === string(20) "-9223372036854775808"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} === array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(1)
diff --git a/Zend/tests/compare_003.phpt b/Zend/tests/compare_003.phpt
index 6bd4f5d8bd..885ec145df 100644
--- a/Zend/tests/compare_003.phpt
+++ b/Zend/tests/compare_003.phpt
@@ -48,346 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(stdClass)#1 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(stdClass)#2 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(test)#3 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(-2147483648)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(11) "-2147483648"
-string(0) "" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" <= string(0) ""
-string(0) "" <= int(1)
-string(0) "" <= float(2.5)
-string(0) "" <= int(0)
-string(0) "" <= string(6) "string"
-string(0) "" <= string(3) "123"
-string(0) "" <= string(3) "2.5"
-string(0) "" <= NULL
-string(0) "" <= bool(true)
-string(0) "" <= bool(false)
-string(0) "" <= object(stdClass)#1 (0) {}
-string(0) "" <= object(stdClass)#2 (0) {}
-string(0) "" <= object(test)#3 (0) {}
-string(0) "" <= array(0) {}
-string(0) "" > int(-2147483648)
-string(0) "" <= string(11) "-2147483648"
-int(1) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) > string(0) ""
-int(1) <= int(1)
-int(1) <= float(2.5)
-int(1) > int(0)
-int(1) > string(6) "string"
-int(1) <= string(3) "123"
-int(1) <= string(3) "2.5"
-int(1) > NULL
-int(1) <= bool(true)
-int(1) > bool(false)
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#1 (0) {}
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#2 (0) {}
-int(1)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#3 (0) {}
-int(1) <= array(0) {}
-int(1) > int(-2147483648)
-int(1) > string(11) "-2147483648"
-float(2.5) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) > string(0) ""
-float(2.5) > int(1)
-float(2.5) <= float(2.5)
-float(2.5) > int(0)
-float(2.5) > string(6) "string"
-float(2.5) <= string(3) "123"
-float(2.5) <= string(3) "2.5"
-float(2.5) > NULL
-float(2.5) <= bool(true)
-float(2.5) > bool(false)
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- > object(stdClass)#1 (0) {}
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- > object(stdClass)#2 (0) {}
-float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
- > object(test)#3 (0) {}
-float(2.5) <= array(0) {}
-float(2.5) > int(-2147483648)
-float(2.5) > string(11) "-2147483648"
-int(0) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) <= string(0) ""
-int(0) <= int(1)
-int(0) <= float(2.5)
-int(0) <= int(0)
-int(0) <= string(6) "string"
-int(0) <= string(3) "123"
-int(0) <= string(3) "2.5"
-int(0) <= NULL
-int(0) <= bool(true)
-int(0) <= bool(false)
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#1 (0) {}
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#2 (0) {}
-int(0)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#3 (0) {}
-int(0) <= array(0) {}
-int(0) > int(-2147483648)
-int(0) > string(11) "-2147483648"
-string(6) "string" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" > string(0) ""
-string(6) "string" <= int(1)
-string(6) "string" <= float(2.5)
-string(6) "string" <= int(0)
-string(6) "string" <= string(6) "string"
-string(6) "string" > string(3) "123"
-string(6) "string" > string(3) "2.5"
-string(6) "string" > NULL
-string(6) "string" <= bool(true)
-string(6) "string" > bool(false)
-string(6) "string" <= object(stdClass)#1 (0) {}
-string(6) "string" <= object(stdClass)#2 (0) {}
-string(6) "string" <= object(test)#3 (0) {}
-string(6) "string" <= array(0) {}
-string(6) "string" > int(-2147483648)
-string(6) "string" > string(11) "-2147483648"
-string(3) "123" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" > string(0) ""
-string(3) "123" > int(1)
-string(3) "123" > float(2.5)
-string(3) "123" > int(0)
-string(3) "123" <= string(6) "string"
-string(3) "123" <= string(3) "123"
-string(3) "123" > string(3) "2.5"
-string(3) "123" > NULL
-string(3) "123" <= bool(true)
-string(3) "123" > bool(false)
-string(3) "123" <= object(stdClass)#1 (0) {}
-string(3) "123" <= object(stdClass)#2 (0) {}
-string(3) "123" <= object(test)#3 (0) {}
-string(3) "123" <= array(0) {}
-string(3) "123" > int(-2147483648)
-string(3) "123" > string(11) "-2147483648"
-string(3) "2.5" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" > string(0) ""
-string(3) "2.5" > int(1)
-string(3) "2.5" <= float(2.5)
-string(3) "2.5" > int(0)
-string(3) "2.5" <= string(6) "string"
-string(3) "2.5" <= string(3) "123"
-string(3) "2.5" <= string(3) "2.5"
-string(3) "2.5" > NULL
-string(3) "2.5" <= bool(true)
-string(3) "2.5" > bool(false)
-string(3) "2.5" <= object(stdClass)#1 (0) {}
-string(3) "2.5" <= object(stdClass)#2 (0) {}
-string(3) "2.5" <= object(test)#3 (0) {}
-string(3) "2.5" <= array(0) {}
-string(3) "2.5" > int(-2147483648)
-string(3) "2.5" > string(11) "-2147483648"
-NULL <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL <= string(0) ""
-NULL <= int(1)
-NULL <= float(2.5)
-NULL <= int(0)
-NULL <= string(6) "string"
-NULL <= string(3) "123"
-NULL <= string(3) "2.5"
-NULL <= NULL
-NULL <= bool(true)
-NULL <= bool(false)
-NULL <= object(stdClass)#1 (0) {}
-NULL <= object(stdClass)#2 (0) {}
-NULL <= object(test)#3 (0) {}
-NULL <= array(0) {}
-NULL <= int(-2147483648)
-NULL <= string(11) "-2147483648"
-bool(true) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) > string(0) ""
-bool(true) <= int(1)
-bool(true) <= float(2.5)
-bool(true) > int(0)
-bool(true) <= string(6) "string"
-bool(true) <= string(3) "123"
-bool(true) <= string(3) "2.5"
-bool(true) > NULL
-bool(true) <= bool(true)
-bool(true) > bool(false)
-bool(true) <= object(stdClass)#1 (0) {}
-bool(true) <= object(stdClass)#2 (0) {}
-bool(true) <= object(test)#3 (0) {}
-bool(true) > array(0) {}
-bool(true) <= int(-2147483648)
-bool(true) <= string(11) "-2147483648"
-bool(false) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) <= string(0) ""
-bool(false) <= int(1)
-bool(false) <= float(2.5)
-bool(false) <= int(0)
-bool(false) <= string(6) "string"
-bool(false) <= string(3) "123"
-bool(false) <= string(3) "2.5"
-bool(false) <= NULL
-bool(false) <= bool(true)
-bool(false) <= bool(false)
-bool(false) <= object(stdClass)#1 (0) {}
-bool(false) <= object(stdClass)#2 (0) {}
-bool(false) <= object(test)#3 (0) {}
-bool(false) <= array(0) {}
-bool(false) <= int(-2147483648)
-bool(false) <= string(11) "-2147483648"
-object(stdClass)#1 (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#1 (0) {} > string(0) ""
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= int(1)
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- <= float(2.5)
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(0)
-object(stdClass)#1 (0) {} > string(6) "string"
-object(stdClass)#1 (0) {} > string(3) "123"
-object(stdClass)#1 (0) {} > string(3) "2.5"
-object(stdClass)#1 (0) {} > NULL
-object(stdClass)#1 (0) {} <= bool(true)
-object(stdClass)#1 (0) {} > bool(false)
-object(stdClass)#1 (0) {} <= object(stdClass)#1 (0) {}
-object(stdClass)#1 (0) {} <= object(stdClass)#2 (0) {}
-object(stdClass)#1 (0) {} <= object(test)#3 (0) {}
-object(stdClass)#1 (0) {} > array(0) {}
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(-2147483648)
-object(stdClass)#1 (0) {} > string(11) "-2147483648"
-object(stdClass)#2 (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#2 (0) {} > string(0) ""
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= int(1)
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- <= float(2.5)
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(0)
-object(stdClass)#2 (0) {} > string(6) "string"
-object(stdClass)#2 (0) {} > string(3) "123"
-object(stdClass)#2 (0) {} > string(3) "2.5"
-object(stdClass)#2 (0) {} > NULL
-object(stdClass)#2 (0) {} <= bool(true)
-object(stdClass)#2 (0) {} > bool(false)
-object(stdClass)#2 (0) {} <= object(stdClass)#1 (0) {}
-object(stdClass)#2 (0) {} <= object(stdClass)#2 (0) {}
-object(stdClass)#2 (0) {} <= object(test)#3 (0) {}
-object(stdClass)#2 (0) {} > array(0) {}
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(-2147483648)
-object(stdClass)#2 (0) {} > string(11) "-2147483648"
-object(test)#3 (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#3 (0) {} > string(0) ""
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- <= int(1)
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
- <= float(2.5)
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- > int(0)
-object(test)#3 (0) {} > string(6) "string"
-object(test)#3 (0) {} > string(3) "123"
-object(test)#3 (0) {} > string(3) "2.5"
-object(test)#3 (0) {} > NULL
-object(test)#3 (0) {} <= bool(true)
-object(test)#3 (0) {} > bool(false)
-object(test)#3 (0) {} <= object(stdClass)#1 (0) {}
-object(test)#3 (0) {} <= object(stdClass)#2 (0) {}
-object(test)#3 (0) {} <= object(test)#3 (0) {}
-object(test)#3 (0) {} > array(0) {}
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- > int(-2147483648)
-object(test)#3 (0) {} > string(11) "-2147483648"
-array(0) {} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} > string(0) ""
-array(0) {} > int(1)
-array(0) {} > float(2.5)
-array(0) {} > int(0)
-array(0) {} > string(6) "string"
-array(0) {} > string(3) "123"
-array(0) {} > string(3) "2.5"
-array(0) {} <= NULL
-array(0) {} <= bool(true)
-array(0) {} <= bool(false)
-array(0) {} <= object(stdClass)#1 (0) {}
-array(0) {} <= object(stdClass)#2 (0) {}
-array(0) {} <= object(test)#3 (0) {}
-array(0) {} <= array(0) {}
-array(0) {} > int(-2147483648)
-array(0) {} > string(11) "-2147483648"
-int(-2147483648) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-2147483648) <= string(0) ""
-int(-2147483648) <= int(1)
-int(-2147483648) <= float(2.5)
-int(-2147483648) <= int(0)
-int(-2147483648) <= string(6) "string"
-int(-2147483648) <= string(3) "123"
-int(-2147483648) <= string(3) "2.5"
-int(-2147483648) > NULL
-int(-2147483648) <= bool(true)
-int(-2147483648) > bool(false)
-int(-2147483648)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#1 (0) {}
-int(-2147483648)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#2 (0) {}
-int(-2147483648)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#3 (0) {}
-int(-2147483648) <= array(0) {}
-int(-2147483648) <= int(-2147483648)
-int(-2147483648) <= string(11) "-2147483648"
-string(11) "-2147483648" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(11) "-2147483648" > string(0) ""
-string(11) "-2147483648" <= int(1)
-string(11) "-2147483648" <= float(2.5)
-string(11) "-2147483648" <= int(0)
-string(11) "-2147483648" <= string(6) "string"
-string(11) "-2147483648" <= string(3) "123"
-string(11) "-2147483648" <= string(3) "2.5"
-string(11) "-2147483648" > NULL
-string(11) "-2147483648" <= bool(true)
-string(11) "-2147483648" > bool(false)
-string(11) "-2147483648" <= object(stdClass)#1 (0) {}
-string(11) "-2147483648" <= object(stdClass)#2 (0) {}
-string(11) "-2147483648" <= object(test)#3 (0) {}
-string(11) "-2147483648" <= array(0) {}
-string(11) "-2147483648" <= int(-2147483648)
-string(11) "-2147483648" <= string(11) "-2147483648"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
diff --git a/Zend/tests/compare_003_64bit.phpt b/Zend/tests/compare_003_64bit.phpt
index 5a8b831cd5..517d1ec604 100644
--- a/Zend/tests/compare_003_64bit.phpt
+++ b/Zend/tests/compare_003_64bit.phpt
@@ -48,346 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(test)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(-9223372036854775808)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(20) "-9223372036854775808"
-string(0) "" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" <= string(0) ""
-string(0) "" <= int(1)
-string(0) "" <= float(2.5)
-string(0) "" <= int(0)
-string(0) "" <= string(6) "string"
-string(0) "" <= string(3) "123"
-string(0) "" <= string(3) "2.5"
-string(0) "" <= NULL
-string(0) "" <= bool(true)
-string(0) "" <= bool(false)
-string(0) "" <= object(stdClass)#%d (0) {}
-string(0) "" <= object(stdClass)#%d (0) {}
-string(0) "" <= object(test)#%d (0) {}
-string(0) "" <= array(0) {}
-string(0) "" > int(-9223372036854775808)
-string(0) "" <= string(20) "-9223372036854775808"
-int(1) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) > string(0) ""
-int(1) <= int(1)
-int(1) <= float(2.5)
-int(1) > int(0)
-int(1) > string(6) "string"
-int(1) <= string(3) "123"
-int(1) <= string(3) "2.5"
-int(1) > NULL
-int(1) <= bool(true)
-int(1) > bool(false)
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(1)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#%d (0) {}
-int(1) <= array(0) {}
-int(1) > int(-9223372036854775808)
-int(1) > string(20) "-9223372036854775808"
-float(2.5) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) > string(0) ""
-float(2.5) > int(1)
-float(2.5) <= float(2.5)
-float(2.5) > int(0)
-float(2.5) > string(6) "string"
-float(2.5) <= string(3) "123"
-float(2.5) <= string(3) "2.5"
-float(2.5) > NULL
-float(2.5) <= bool(true)
-float(2.5) > bool(false)
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- > object(stdClass)#%d (0) {}
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- > object(stdClass)#%d (0) {}
-float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
- > object(test)#%d (0) {}
-float(2.5) <= array(0) {}
-float(2.5) > int(-9223372036854775808)
-float(2.5) > string(20) "-9223372036854775808"
-int(0) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) <= string(0) ""
-int(0) <= int(1)
-int(0) <= float(2.5)
-int(0) <= int(0)
-int(0) <= string(6) "string"
-int(0) <= string(3) "123"
-int(0) <= string(3) "2.5"
-int(0) <= NULL
-int(0) <= bool(true)
-int(0) <= bool(false)
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(0)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#%d (0) {}
-int(0) <= array(0) {}
-int(0) > int(-9223372036854775808)
-int(0) > string(20) "-9223372036854775808"
-string(6) "string" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" > string(0) ""
-string(6) "string" <= int(1)
-string(6) "string" <= float(2.5)
-string(6) "string" <= int(0)
-string(6) "string" <= string(6) "string"
-string(6) "string" > string(3) "123"
-string(6) "string" > string(3) "2.5"
-string(6) "string" > NULL
-string(6) "string" <= bool(true)
-string(6) "string" > bool(false)
-string(6) "string" <= object(stdClass)#%d (0) {}
-string(6) "string" <= object(stdClass)#%d (0) {}
-string(6) "string" <= object(test)#%d (0) {}
-string(6) "string" <= array(0) {}
-string(6) "string" > int(-9223372036854775808)
-string(6) "string" > string(20) "-9223372036854775808"
-string(3) "123" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" > string(0) ""
-string(3) "123" > int(1)
-string(3) "123" > float(2.5)
-string(3) "123" > int(0)
-string(3) "123" <= string(6) "string"
-string(3) "123" <= string(3) "123"
-string(3) "123" > string(3) "2.5"
-string(3) "123" > NULL
-string(3) "123" <= bool(true)
-string(3) "123" > bool(false)
-string(3) "123" <= object(stdClass)#%d (0) {}
-string(3) "123" <= object(stdClass)#%d (0) {}
-string(3) "123" <= object(test)#%d (0) {}
-string(3) "123" <= array(0) {}
-string(3) "123" > int(-9223372036854775808)
-string(3) "123" > string(20) "-9223372036854775808"
-string(3) "2.5" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" > string(0) ""
-string(3) "2.5" > int(1)
-string(3) "2.5" <= float(2.5)
-string(3) "2.5" > int(0)
-string(3) "2.5" <= string(6) "string"
-string(3) "2.5" <= string(3) "123"
-string(3) "2.5" <= string(3) "2.5"
-string(3) "2.5" > NULL
-string(3) "2.5" <= bool(true)
-string(3) "2.5" > bool(false)
-string(3) "2.5" <= object(stdClass)#%d (0) {}
-string(3) "2.5" <= object(stdClass)#%d (0) {}
-string(3) "2.5" <= object(test)#%d (0) {}
-string(3) "2.5" <= array(0) {}
-string(3) "2.5" > int(-9223372036854775808)
-string(3) "2.5" > string(20) "-9223372036854775808"
-NULL <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL <= string(0) ""
-NULL <= int(1)
-NULL <= float(2.5)
-NULL <= int(0)
-NULL <= string(6) "string"
-NULL <= string(3) "123"
-NULL <= string(3) "2.5"
-NULL <= NULL
-NULL <= bool(true)
-NULL <= bool(false)
-NULL <= object(stdClass)#%d (0) {}
-NULL <= object(stdClass)#%d (0) {}
-NULL <= object(test)#%d (0) {}
-NULL <= array(0) {}
-NULL <= int(-9223372036854775808)
-NULL <= string(20) "-9223372036854775808"
-bool(true) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) > string(0) ""
-bool(true) <= int(1)
-bool(true) <= float(2.5)
-bool(true) > int(0)
-bool(true) <= string(6) "string"
-bool(true) <= string(3) "123"
-bool(true) <= string(3) "2.5"
-bool(true) > NULL
-bool(true) <= bool(true)
-bool(true) > bool(false)
-bool(true) <= object(stdClass)#%d (0) {}
-bool(true) <= object(stdClass)#%d (0) {}
-bool(true) <= object(test)#%d (0) {}
-bool(true) > array(0) {}
-bool(true) <= int(-9223372036854775808)
-bool(true) <= string(20) "-9223372036854775808"
-bool(false) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) <= string(0) ""
-bool(false) <= int(1)
-bool(false) <= float(2.5)
-bool(false) <= int(0)
-bool(false) <= string(6) "string"
-bool(false) <= string(3) "123"
-bool(false) <= string(3) "2.5"
-bool(false) <= NULL
-bool(false) <= bool(true)
-bool(false) <= bool(false)
-bool(false) <= object(stdClass)#%d (0) {}
-bool(false) <= object(stdClass)#%d (0) {}
-bool(false) <= object(test)#%d (0) {}
-bool(false) <= array(0) {}
-bool(false) <= int(-9223372036854775808)
-bool(false) <= string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} > string(0) ""
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= int(1)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- <= float(2.5)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(0)
-object(stdClass)#%d (0) {} > string(6) "string"
-object(stdClass)#%d (0) {} > string(3) "123"
-object(stdClass)#%d (0) {} > string(3) "2.5"
-object(stdClass)#%d (0) {} > NULL
-object(stdClass)#%d (0) {} <= bool(true)
-object(stdClass)#%d (0) {} > bool(false)
-object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} <= object(test)#%d (0) {}
-object(stdClass)#%d (0) {} > array(0) {}
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(-9223372036854775808)
-object(stdClass)#%d (0) {} > string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} > string(0) ""
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= int(1)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- <= float(2.5)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(0)
-object(stdClass)#%d (0) {} > string(6) "string"
-object(stdClass)#%d (0) {} > string(3) "123"
-object(stdClass)#%d (0) {} > string(3) "2.5"
-object(stdClass)#%d (0) {} > NULL
-object(stdClass)#%d (0) {} <= bool(true)
-object(stdClass)#%d (0) {} > bool(false)
-object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} <= object(test)#%d (0) {}
-object(stdClass)#%d (0) {} > array(0) {}
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(-9223372036854775808)
-object(stdClass)#%d (0) {} > string(20) "-9223372036854775808"
-object(test)#%d (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#%d (0) {} > string(0) ""
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- <= int(1)
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
- <= float(2.5)
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- > int(0)
-object(test)#%d (0) {} > string(6) "string"
-object(test)#%d (0) {} > string(3) "123"
-object(test)#%d (0) {} > string(3) "2.5"
-object(test)#%d (0) {} > NULL
-object(test)#%d (0) {} <= bool(true)
-object(test)#%d (0) {} > bool(false)
-object(test)#%d (0) {} <= object(stdClass)#%d (0) {}
-object(test)#%d (0) {} <= object(stdClass)#%d (0) {}
-object(test)#%d (0) {} <= object(test)#%d (0) {}
-object(test)#%d (0) {} > array(0) {}
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- > int(-9223372036854775808)
-object(test)#%d (0) {} > string(20) "-9223372036854775808"
-array(0) {} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} > string(0) ""
-array(0) {} > int(1)
-array(0) {} > float(2.5)
-array(0) {} > int(0)
-array(0) {} > string(6) "string"
-array(0) {} > string(3) "123"
-array(0) {} > string(3) "2.5"
-array(0) {} <= NULL
-array(0) {} <= bool(true)
-array(0) {} <= bool(false)
-array(0) {} <= object(stdClass)#%d (0) {}
-array(0) {} <= object(stdClass)#%d (0) {}
-array(0) {} <= object(test)#%d (0) {}
-array(0) {} <= array(0) {}
-array(0) {} > int(-9223372036854775808)
-array(0) {} > string(20) "-9223372036854775808"
-int(-9223372036854775808) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-9223372036854775808) <= string(0) ""
-int(-9223372036854775808) <= int(1)
-int(-9223372036854775808) <= float(2.5)
-int(-9223372036854775808) <= int(0)
-int(-9223372036854775808) <= string(6) "string"
-int(-9223372036854775808) <= string(3) "123"
-int(-9223372036854775808) <= string(3) "2.5"
-int(-9223372036854775808) > NULL
-int(-9223372036854775808) <= bool(true)
-int(-9223372036854775808) > bool(false)
-int(-9223372036854775808)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(-9223372036854775808)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(-9223372036854775808)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#%d (0) {}
-int(-9223372036854775808) <= array(0) {}
-int(-9223372036854775808) <= int(-9223372036854775808)
-int(-9223372036854775808) <= string(20) "-9223372036854775808"
-string(20) "-9223372036854775808" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(20) "-9223372036854775808" > string(0) ""
-string(20) "-9223372036854775808" <= int(1)
-string(20) "-9223372036854775808" <= float(2.5)
-string(20) "-9223372036854775808" <= int(0)
-string(20) "-9223372036854775808" <= string(6) "string"
-string(20) "-9223372036854775808" <= string(3) "123"
-string(20) "-9223372036854775808" <= string(3) "2.5"
-string(20) "-9223372036854775808" > NULL
-string(20) "-9223372036854775808" <= bool(true)
-string(20) "-9223372036854775808" > bool(false)
-string(20) "-9223372036854775808" <= object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" <= object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" <= object(test)#%d (0) {}
-string(20) "-9223372036854775808" <= array(0) {}
-string(20) "-9223372036854775808" <= int(-9223372036854775808)
-string(20) "-9223372036854775808" <= string(20) "-9223372036854775808"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
diff --git a/Zend/tests/compare_004.phpt b/Zend/tests/compare_004.phpt
index bcf80653bb..98054cf13d 100644
--- a/Zend/tests/compare_004.phpt
+++ b/Zend/tests/compare_004.phpt
@@ -48,346 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(stdClass)#1 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(stdClass)#2 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(test)#3 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(-2147483648)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(11) "-2147483648"
-string(0) "" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" >= string(0) ""
-string(0) "" < int(1)
-string(0) "" < float(2.5)
-string(0) "" >= int(0)
-string(0) "" < string(6) "string"
-string(0) "" < string(3) "123"
-string(0) "" < string(3) "2.5"
-string(0) "" >= NULL
-string(0) "" < bool(true)
-string(0) "" >= bool(false)
-string(0) "" < object(stdClass)#1 (0) {}
-string(0) "" < object(stdClass)#2 (0) {}
-string(0) "" < object(test)#3 (0) {}
-string(0) "" < array(0) {}
-string(0) "" >= int(-2147483648)
-string(0) "" < string(11) "-2147483648"
-int(1) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) >= string(0) ""
-int(1) >= int(1)
-int(1) < float(2.5)
-int(1) >= int(0)
-int(1) >= string(6) "string"
-int(1) < string(3) "123"
-int(1) < string(3) "2.5"
-int(1) >= NULL
-int(1) >= bool(true)
-int(1) >= bool(false)
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= object(stdClass)#1 (0) {}
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= object(stdClass)#2 (0) {}
-int(1)
-Notice: Object of class test could not be converted to int in %s on line %d
- >= object(test)#3 (0) {}
-int(1) < array(0) {}
-int(1) >= int(-2147483648)
-int(1) >= string(11) "-2147483648"
-float(2.5) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) >= string(0) ""
-float(2.5) >= int(1)
-float(2.5) >= float(2.5)
-float(2.5) >= int(0)
-float(2.5) >= string(6) "string"
-float(2.5) < string(3) "123"
-float(2.5) >= string(3) "2.5"
-float(2.5) >= NULL
-float(2.5) >= bool(true)
-float(2.5) >= bool(false)
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- >= object(stdClass)#1 (0) {}
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- >= object(stdClass)#2 (0) {}
-float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
- >= object(test)#3 (0) {}
-float(2.5) < array(0) {}
-float(2.5) >= int(-2147483648)
-float(2.5) >= string(11) "-2147483648"
-int(0) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) >= string(0) ""
-int(0) < int(1)
-int(0) < float(2.5)
-int(0) >= int(0)
-int(0) >= string(6) "string"
-int(0) < string(3) "123"
-int(0) < string(3) "2.5"
-int(0) >= NULL
-int(0) < bool(true)
-int(0) >= bool(false)
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#1 (0) {}
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#2 (0) {}
-int(0)
-Notice: Object of class test could not be converted to int in %s on line %d
- < object(test)#3 (0) {}
-int(0) < array(0) {}
-int(0) >= int(-2147483648)
-int(0) >= string(11) "-2147483648"
-string(6) "string" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" >= string(0) ""
-string(6) "string" < int(1)
-string(6) "string" < float(2.5)
-string(6) "string" >= int(0)
-string(6) "string" >= string(6) "string"
-string(6) "string" >= string(3) "123"
-string(6) "string" >= string(3) "2.5"
-string(6) "string" >= NULL
-string(6) "string" >= bool(true)
-string(6) "string" >= bool(false)
-string(6) "string" < object(stdClass)#1 (0) {}
-string(6) "string" < object(stdClass)#2 (0) {}
-string(6) "string" < object(test)#3 (0) {}
-string(6) "string" < array(0) {}
-string(6) "string" >= int(-2147483648)
-string(6) "string" >= string(11) "-2147483648"
-string(3) "123" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" >= string(0) ""
-string(3) "123" >= int(1)
-string(3) "123" >= float(2.5)
-string(3) "123" >= int(0)
-string(3) "123" < string(6) "string"
-string(3) "123" >= string(3) "123"
-string(3) "123" >= string(3) "2.5"
-string(3) "123" >= NULL
-string(3) "123" >= bool(true)
-string(3) "123" >= bool(false)
-string(3) "123" < object(stdClass)#1 (0) {}
-string(3) "123" < object(stdClass)#2 (0) {}
-string(3) "123" < object(test)#3 (0) {}
-string(3) "123" < array(0) {}
-string(3) "123" >= int(-2147483648)
-string(3) "123" >= string(11) "-2147483648"
-string(3) "2.5" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" >= string(0) ""
-string(3) "2.5" >= int(1)
-string(3) "2.5" >= float(2.5)
-string(3) "2.5" >= int(0)
-string(3) "2.5" < string(6) "string"
-string(3) "2.5" < string(3) "123"
-string(3) "2.5" >= string(3) "2.5"
-string(3) "2.5" >= NULL
-string(3) "2.5" >= bool(true)
-string(3) "2.5" >= bool(false)
-string(3) "2.5" < object(stdClass)#1 (0) {}
-string(3) "2.5" < object(stdClass)#2 (0) {}
-string(3) "2.5" < object(test)#3 (0) {}
-string(3) "2.5" < array(0) {}
-string(3) "2.5" >= int(-2147483648)
-string(3) "2.5" >= string(11) "-2147483648"
-NULL < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL >= string(0) ""
-NULL < int(1)
-NULL < float(2.5)
-NULL >= int(0)
-NULL < string(6) "string"
-NULL < string(3) "123"
-NULL < string(3) "2.5"
-NULL >= NULL
-NULL < bool(true)
-NULL >= bool(false)
-NULL < object(stdClass)#1 (0) {}
-NULL < object(stdClass)#2 (0) {}
-NULL < object(test)#3 (0) {}
-NULL >= array(0) {}
-NULL < int(-2147483648)
-NULL < string(11) "-2147483648"
-bool(true) >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) >= string(0) ""
-bool(true) >= int(1)
-bool(true) >= float(2.5)
-bool(true) >= int(0)
-bool(true) >= string(6) "string"
-bool(true) >= string(3) "123"
-bool(true) >= string(3) "2.5"
-bool(true) >= NULL
-bool(true) >= bool(true)
-bool(true) >= bool(false)
-bool(true) >= object(stdClass)#1 (0) {}
-bool(true) >= object(stdClass)#2 (0) {}
-bool(true) >= object(test)#3 (0) {}
-bool(true) >= array(0) {}
-bool(true) >= int(-2147483648)
-bool(true) >= string(11) "-2147483648"
-bool(false) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) >= string(0) ""
-bool(false) < int(1)
-bool(false) < float(2.5)
-bool(false) >= int(0)
-bool(false) < string(6) "string"
-bool(false) < string(3) "123"
-bool(false) < string(3) "2.5"
-bool(false) >= NULL
-bool(false) < bool(true)
-bool(false) >= bool(false)
-bool(false) < object(stdClass)#1 (0) {}
-bool(false) < object(stdClass)#2 (0) {}
-bool(false) < object(test)#3 (0) {}
-bool(false) >= array(0) {}
-bool(false) < int(-2147483648)
-bool(false) < string(11) "-2147483648"
-object(stdClass)#1 (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#1 (0) {} >= string(0) ""
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(1)
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- < float(2.5)
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(0)
-object(stdClass)#1 (0) {} >= string(6) "string"
-object(stdClass)#1 (0) {} >= string(3) "123"
-object(stdClass)#1 (0) {} >= string(3) "2.5"
-object(stdClass)#1 (0) {} >= NULL
-object(stdClass)#1 (0) {} >= bool(true)
-object(stdClass)#1 (0) {} >= bool(false)
-object(stdClass)#1 (0) {} >= object(stdClass)#1 (0) {}
-object(stdClass)#1 (0) {} >= object(stdClass)#2 (0) {}
-object(stdClass)#1 (0) {} >= object(test)#3 (0) {}
-object(stdClass)#1 (0) {} >= array(0) {}
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(-2147483648)
-object(stdClass)#1 (0) {} >= string(11) "-2147483648"
-object(stdClass)#2 (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#2 (0) {} >= string(0) ""
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(1)
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- < float(2.5)
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(0)
-object(stdClass)#2 (0) {} >= string(6) "string"
-object(stdClass)#2 (0) {} >= string(3) "123"
-object(stdClass)#2 (0) {} >= string(3) "2.5"
-object(stdClass)#2 (0) {} >= NULL
-object(stdClass)#2 (0) {} >= bool(true)
-object(stdClass)#2 (0) {} >= bool(false)
-object(stdClass)#2 (0) {} >= object(stdClass)#1 (0) {}
-object(stdClass)#2 (0) {} >= object(stdClass)#2 (0) {}
-object(stdClass)#2 (0) {} >= object(test)#3 (0) {}
-object(stdClass)#2 (0) {} >= array(0) {}
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(-2147483648)
-object(stdClass)#2 (0) {} >= string(11) "-2147483648"
-object(test)#3 (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#3 (0) {} >= string(0) ""
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(1)
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
- < float(2.5)
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(0)
-object(test)#3 (0) {} >= string(6) "string"
-object(test)#3 (0) {} >= string(3) "123"
-object(test)#3 (0) {} >= string(3) "2.5"
-object(test)#3 (0) {} >= NULL
-object(test)#3 (0) {} >= bool(true)
-object(test)#3 (0) {} >= bool(false)
-object(test)#3 (0) {} >= object(stdClass)#1 (0) {}
-object(test)#3 (0) {} >= object(stdClass)#2 (0) {}
-object(test)#3 (0) {} >= object(test)#3 (0) {}
-object(test)#3 (0) {} >= array(0) {}
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(-2147483648)
-object(test)#3 (0) {} >= string(11) "-2147483648"
-array(0) {} < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} >= string(0) ""
-array(0) {} >= int(1)
-array(0) {} >= float(2.5)
-array(0) {} >= int(0)
-array(0) {} >= string(6) "string"
-array(0) {} >= string(3) "123"
-array(0) {} >= string(3) "2.5"
-array(0) {} >= NULL
-array(0) {} < bool(true)
-array(0) {} >= bool(false)
-array(0) {} < object(stdClass)#1 (0) {}
-array(0) {} < object(stdClass)#2 (0) {}
-array(0) {} < object(test)#3 (0) {}
-array(0) {} >= array(0) {}
-array(0) {} >= int(-2147483648)
-array(0) {} >= string(11) "-2147483648"
-int(-2147483648) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-2147483648) < string(0) ""
-int(-2147483648) < int(1)
-int(-2147483648) < float(2.5)
-int(-2147483648) < int(0)
-int(-2147483648) < string(6) "string"
-int(-2147483648) < string(3) "123"
-int(-2147483648) < string(3) "2.5"
-int(-2147483648) >= NULL
-int(-2147483648) >= bool(true)
-int(-2147483648) >= bool(false)
-int(-2147483648)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#1 (0) {}
-int(-2147483648)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#2 (0) {}
-int(-2147483648)
-Notice: Object of class test could not be converted to int in %s on line %d
- < object(test)#3 (0) {}
-int(-2147483648) < array(0) {}
-int(-2147483648) >= int(-2147483648)
-int(-2147483648) >= string(11) "-2147483648"
-string(11) "-2147483648" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(11) "-2147483648" >= string(0) ""
-string(11) "-2147483648" < int(1)
-string(11) "-2147483648" < float(2.5)
-string(11) "-2147483648" < int(0)
-string(11) "-2147483648" < string(6) "string"
-string(11) "-2147483648" < string(3) "123"
-string(11) "-2147483648" < string(3) "2.5"
-string(11) "-2147483648" >= NULL
-string(11) "-2147483648" >= bool(true)
-string(11) "-2147483648" >= bool(false)
-string(11) "-2147483648" < object(stdClass)#1 (0) {}
-string(11) "-2147483648" < object(stdClass)#2 (0) {}
-string(11) "-2147483648" < object(test)#3 (0) {}
-string(11) "-2147483648" < array(0) {}
-string(11) "-2147483648" >= int(-2147483648)
-string(11) "-2147483648" >= string(11) "-2147483648"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
diff --git a/Zend/tests/compare_004_64bit.phpt b/Zend/tests/compare_004_64bit.phpt
index 57f9d0025b..87a1f2129d 100644
--- a/Zend/tests/compare_004_64bit.phpt
+++ b/Zend/tests/compare_004_64bit.phpt
@@ -48,346 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(test)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(-9223372036854775808)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(20) "-9223372036854775808"
-string(0) "" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" >= string(0) ""
-string(0) "" < int(1)
-string(0) "" < float(2.5)
-string(0) "" >= int(0)
-string(0) "" < string(6) "string"
-string(0) "" < string(3) "123"
-string(0) "" < string(3) "2.5"
-string(0) "" >= NULL
-string(0) "" < bool(true)
-string(0) "" >= bool(false)
-string(0) "" < object(stdClass)#%d (0) {}
-string(0) "" < object(stdClass)#%d (0) {}
-string(0) "" < object(test)#%d (0) {}
-string(0) "" < array(0) {}
-string(0) "" >= int(-9223372036854775808)
-string(0) "" < string(20) "-9223372036854775808"
-int(1) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) >= string(0) ""
-int(1) >= int(1)
-int(1) < float(2.5)
-int(1) >= int(0)
-int(1) >= string(6) "string"
-int(1) < string(3) "123"
-int(1) < string(3) "2.5"
-int(1) >= NULL
-int(1) >= bool(true)
-int(1) >= bool(false)
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= object(stdClass)#%d (0) {}
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= object(stdClass)#%d (0) {}
-int(1)
-Notice: Object of class test could not be converted to int in %s on line %d
- >= object(test)#%d (0) {}
-int(1) < array(0) {}
-int(1) >= int(-9223372036854775808)
-int(1) >= string(20) "-9223372036854775808"
-float(2.5) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) >= string(0) ""
-float(2.5) >= int(1)
-float(2.5) >= float(2.5)
-float(2.5) >= int(0)
-float(2.5) >= string(6) "string"
-float(2.5) < string(3) "123"
-float(2.5) >= string(3) "2.5"
-float(2.5) >= NULL
-float(2.5) >= bool(true)
-float(2.5) >= bool(false)
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- >= object(stdClass)#%d (0) {}
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- >= object(stdClass)#%d (0) {}
-float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
- >= object(test)#%d (0) {}
-float(2.5) < array(0) {}
-float(2.5) >= int(-9223372036854775808)
-float(2.5) >= string(20) "-9223372036854775808"
-int(0) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) >= string(0) ""
-int(0) < int(1)
-int(0) < float(2.5)
-int(0) >= int(0)
-int(0) >= string(6) "string"
-int(0) < string(3) "123"
-int(0) < string(3) "2.5"
-int(0) >= NULL
-int(0) < bool(true)
-int(0) >= bool(false)
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#%d (0) {}
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#%d (0) {}
-int(0)
-Notice: Object of class test could not be converted to int in %s on line %d
- < object(test)#%d (0) {}
-int(0) < array(0) {}
-int(0) >= int(-9223372036854775808)
-int(0) >= string(20) "-9223372036854775808"
-string(6) "string" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" >= string(0) ""
-string(6) "string" < int(1)
-string(6) "string" < float(2.5)
-string(6) "string" >= int(0)
-string(6) "string" >= string(6) "string"
-string(6) "string" >= string(3) "123"
-string(6) "string" >= string(3) "2.5"
-string(6) "string" >= NULL
-string(6) "string" >= bool(true)
-string(6) "string" >= bool(false)
-string(6) "string" < object(stdClass)#%d (0) {}
-string(6) "string" < object(stdClass)#%d (0) {}
-string(6) "string" < object(test)#%d (0) {}
-string(6) "string" < array(0) {}
-string(6) "string" >= int(-9223372036854775808)
-string(6) "string" >= string(20) "-9223372036854775808"
-string(3) "123" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" >= string(0) ""
-string(3) "123" >= int(1)
-string(3) "123" >= float(2.5)
-string(3) "123" >= int(0)
-string(3) "123" < string(6) "string"
-string(3) "123" >= string(3) "123"
-string(3) "123" >= string(3) "2.5"
-string(3) "123" >= NULL
-string(3) "123" >= bool(true)
-string(3) "123" >= bool(false)
-string(3) "123" < object(stdClass)#%d (0) {}
-string(3) "123" < object(stdClass)#%d (0) {}
-string(3) "123" < object(test)#%d (0) {}
-string(3) "123" < array(0) {}
-string(3) "123" >= int(-9223372036854775808)
-string(3) "123" >= string(20) "-9223372036854775808"
-string(3) "2.5" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" >= string(0) ""
-string(3) "2.5" >= int(1)
-string(3) "2.5" >= float(2.5)
-string(3) "2.5" >= int(0)
-string(3) "2.5" < string(6) "string"
-string(3) "2.5" < string(3) "123"
-string(3) "2.5" >= string(3) "2.5"
-string(3) "2.5" >= NULL
-string(3) "2.5" >= bool(true)
-string(3) "2.5" >= bool(false)
-string(3) "2.5" < object(stdClass)#%d (0) {}
-string(3) "2.5" < object(stdClass)#%d (0) {}
-string(3) "2.5" < object(test)#%d (0) {}
-string(3) "2.5" < array(0) {}
-string(3) "2.5" >= int(-9223372036854775808)
-string(3) "2.5" >= string(20) "-9223372036854775808"
-NULL < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL >= string(0) ""
-NULL < int(1)
-NULL < float(2.5)
-NULL >= int(0)
-NULL < string(6) "string"
-NULL < string(3) "123"
-NULL < string(3) "2.5"
-NULL >= NULL
-NULL < bool(true)
-NULL >= bool(false)
-NULL < object(stdClass)#%d (0) {}
-NULL < object(stdClass)#%d (0) {}
-NULL < object(test)#%d (0) {}
-NULL >= array(0) {}
-NULL < int(-9223372036854775808)
-NULL < string(20) "-9223372036854775808"
-bool(true) >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) >= string(0) ""
-bool(true) >= int(1)
-bool(true) >= float(2.5)
-bool(true) >= int(0)
-bool(true) >= string(6) "string"
-bool(true) >= string(3) "123"
-bool(true) >= string(3) "2.5"
-bool(true) >= NULL
-bool(true) >= bool(true)
-bool(true) >= bool(false)
-bool(true) >= object(stdClass)#%d (0) {}
-bool(true) >= object(stdClass)#%d (0) {}
-bool(true) >= object(test)#%d (0) {}
-bool(true) >= array(0) {}
-bool(true) >= int(-9223372036854775808)
-bool(true) >= string(20) "-9223372036854775808"
-bool(false) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) >= string(0) ""
-bool(false) < int(1)
-bool(false) < float(2.5)
-bool(false) >= int(0)
-bool(false) < string(6) "string"
-bool(false) < string(3) "123"
-bool(false) < string(3) "2.5"
-bool(false) >= NULL
-bool(false) < bool(true)
-bool(false) >= bool(false)
-bool(false) < object(stdClass)#%d (0) {}
-bool(false) < object(stdClass)#%d (0) {}
-bool(false) < object(test)#%d (0) {}
-bool(false) >= array(0) {}
-bool(false) < int(-9223372036854775808)
-bool(false) < string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} >= string(0) ""
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(1)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- < float(2.5)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(0)
-object(stdClass)#%d (0) {} >= string(6) "string"
-object(stdClass)#%d (0) {} >= string(3) "123"
-object(stdClass)#%d (0) {} >= string(3) "2.5"
-object(stdClass)#%d (0) {} >= NULL
-object(stdClass)#%d (0) {} >= bool(true)
-object(stdClass)#%d (0) {} >= bool(false)
-object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} >= object(test)#%d (0) {}
-object(stdClass)#%d (0) {} >= array(0) {}
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(-9223372036854775808)
-object(stdClass)#%d (0) {} >= string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} >= string(0) ""
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(1)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- < float(2.5)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(0)
-object(stdClass)#%d (0) {} >= string(6) "string"
-object(stdClass)#%d (0) {} >= string(3) "123"
-object(stdClass)#%d (0) {} >= string(3) "2.5"
-object(stdClass)#%d (0) {} >= NULL
-object(stdClass)#%d (0) {} >= bool(true)
-object(stdClass)#%d (0) {} >= bool(false)
-object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} >= object(test)#%d (0) {}
-object(stdClass)#%d (0) {} >= array(0) {}
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(-9223372036854775808)
-object(stdClass)#%d (0) {} >= string(20) "-9223372036854775808"
-object(test)#%d (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#%d (0) {} >= string(0) ""
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(1)
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
- < float(2.5)
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(0)
-object(test)#%d (0) {} >= string(6) "string"
-object(test)#%d (0) {} >= string(3) "123"
-object(test)#%d (0) {} >= string(3) "2.5"
-object(test)#%d (0) {} >= NULL
-object(test)#%d (0) {} >= bool(true)
-object(test)#%d (0) {} >= bool(false)
-object(test)#%d (0) {} >= object(stdClass)#%d (0) {}
-object(test)#%d (0) {} >= object(stdClass)#%d (0) {}
-object(test)#%d (0) {} >= object(test)#%d (0) {}
-object(test)#%d (0) {} >= array(0) {}
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(-9223372036854775808)
-object(test)#%d (0) {} >= string(20) "-9223372036854775808"
-array(0) {} < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} >= string(0) ""
-array(0) {} >= int(1)
-array(0) {} >= float(2.5)
-array(0) {} >= int(0)
-array(0) {} >= string(6) "string"
-array(0) {} >= string(3) "123"
-array(0) {} >= string(3) "2.5"
-array(0) {} >= NULL
-array(0) {} < bool(true)
-array(0) {} >= bool(false)
-array(0) {} < object(stdClass)#%d (0) {}
-array(0) {} < object(stdClass)#%d (0) {}
-array(0) {} < object(test)#%d (0) {}
-array(0) {} >= array(0) {}
-array(0) {} >= int(-9223372036854775808)
-array(0) {} >= string(20) "-9223372036854775808"
-int(-9223372036854775808) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-9223372036854775808) < string(0) ""
-int(-9223372036854775808) < int(1)
-int(-9223372036854775808) < float(2.5)
-int(-9223372036854775808) < int(0)
-int(-9223372036854775808) < string(6) "string"
-int(-9223372036854775808) < string(3) "123"
-int(-9223372036854775808) < string(3) "2.5"
-int(-9223372036854775808) >= NULL
-int(-9223372036854775808) >= bool(true)
-int(-9223372036854775808) >= bool(false)
-int(-9223372036854775808)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#%d (0) {}
-int(-9223372036854775808)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#%d (0) {}
-int(-9223372036854775808)
-Notice: Object of class test could not be converted to int in %s on line %d
- < object(test)#%d (0) {}
-int(-9223372036854775808) < array(0) {}
-int(-9223372036854775808) >= int(-9223372036854775808)
-int(-9223372036854775808) >= string(20) "-9223372036854775808"
-string(20) "-9223372036854775808" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(20) "-9223372036854775808" >= string(0) ""
-string(20) "-9223372036854775808" < int(1)
-string(20) "-9223372036854775808" < float(2.5)
-string(20) "-9223372036854775808" < int(0)
-string(20) "-9223372036854775808" < string(6) "string"
-string(20) "-9223372036854775808" < string(3) "123"
-string(20) "-9223372036854775808" < string(3) "2.5"
-string(20) "-9223372036854775808" >= NULL
-string(20) "-9223372036854775808" >= bool(true)
-string(20) "-9223372036854775808" >= bool(false)
-string(20) "-9223372036854775808" < object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" < object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" < object(test)#%d (0) {}
-string(20) "-9223372036854775808" < array(0) {}
-string(20) "-9223372036854775808" >= int(-9223372036854775808)
-string(20) "-9223372036854775808" >= string(20) "-9223372036854775808"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
diff --git a/Zend/tests/compare_005.phpt b/Zend/tests/compare_005.phpt
index 1fa6749e47..0cb6f645c9 100644
--- a/Zend/tests/compare_005.phpt
+++ b/Zend/tests/compare_005.phpt
@@ -48,346 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(stdClass)#1 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(stdClass)#2 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(test)#3 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(-2147483648)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(11) "-2147483648"
-string(0) "" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" >= string(0) ""
-string(0) "" < int(1)
-string(0) "" < float(2.5)
-string(0) "" >= int(0)
-string(0) "" < string(6) "string"
-string(0) "" < string(3) "123"
-string(0) "" < string(3) "2.5"
-string(0) "" >= NULL
-string(0) "" < bool(true)
-string(0) "" >= bool(false)
-string(0) "" < object(stdClass)#1 (0) {}
-string(0) "" < object(stdClass)#2 (0) {}
-string(0) "" < object(test)#3 (0) {}
-string(0) "" < array(0) {}
-string(0) "" >= int(-2147483648)
-string(0) "" < string(11) "-2147483648"
-int(1) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) >= string(0) ""
-int(1) >= int(1)
-int(1) < float(2.5)
-int(1) >= int(0)
-int(1) >= string(6) "string"
-int(1) < string(3) "123"
-int(1) < string(3) "2.5"
-int(1) >= NULL
-int(1) >= bool(true)
-int(1) >= bool(false)
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= object(stdClass)#1 (0) {}
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= object(stdClass)#2 (0) {}
-int(1)
-Notice: Object of class test could not be converted to int in %s on line %d
- >= object(test)#3 (0) {}
-int(1) < array(0) {}
-int(1) >= int(-2147483648)
-int(1) >= string(11) "-2147483648"
-float(2.5) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) >= string(0) ""
-float(2.5) >= int(1)
-float(2.5) >= float(2.5)
-float(2.5) >= int(0)
-float(2.5) >= string(6) "string"
-float(2.5) < string(3) "123"
-float(2.5) >= string(3) "2.5"
-float(2.5) >= NULL
-float(2.5) >= bool(true)
-float(2.5) >= bool(false)
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- >= object(stdClass)#1 (0) {}
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- >= object(stdClass)#2 (0) {}
-float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
- >= object(test)#3 (0) {}
-float(2.5) < array(0) {}
-float(2.5) >= int(-2147483648)
-float(2.5) >= string(11) "-2147483648"
-int(0) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) >= string(0) ""
-int(0) < int(1)
-int(0) < float(2.5)
-int(0) >= int(0)
-int(0) >= string(6) "string"
-int(0) < string(3) "123"
-int(0) < string(3) "2.5"
-int(0) >= NULL
-int(0) < bool(true)
-int(0) >= bool(false)
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#1 (0) {}
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#2 (0) {}
-int(0)
-Notice: Object of class test could not be converted to int in %s on line %d
- < object(test)#3 (0) {}
-int(0) < array(0) {}
-int(0) >= int(-2147483648)
-int(0) >= string(11) "-2147483648"
-string(6) "string" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" >= string(0) ""
-string(6) "string" < int(1)
-string(6) "string" < float(2.5)
-string(6) "string" >= int(0)
-string(6) "string" >= string(6) "string"
-string(6) "string" >= string(3) "123"
-string(6) "string" >= string(3) "2.5"
-string(6) "string" >= NULL
-string(6) "string" >= bool(true)
-string(6) "string" >= bool(false)
-string(6) "string" < object(stdClass)#1 (0) {}
-string(6) "string" < object(stdClass)#2 (0) {}
-string(6) "string" < object(test)#3 (0) {}
-string(6) "string" < array(0) {}
-string(6) "string" >= int(-2147483648)
-string(6) "string" >= string(11) "-2147483648"
-string(3) "123" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" >= string(0) ""
-string(3) "123" >= int(1)
-string(3) "123" >= float(2.5)
-string(3) "123" >= int(0)
-string(3) "123" < string(6) "string"
-string(3) "123" >= string(3) "123"
-string(3) "123" >= string(3) "2.5"
-string(3) "123" >= NULL
-string(3) "123" >= bool(true)
-string(3) "123" >= bool(false)
-string(3) "123" < object(stdClass)#1 (0) {}
-string(3) "123" < object(stdClass)#2 (0) {}
-string(3) "123" < object(test)#3 (0) {}
-string(3) "123" < array(0) {}
-string(3) "123" >= int(-2147483648)
-string(3) "123" >= string(11) "-2147483648"
-string(3) "2.5" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" >= string(0) ""
-string(3) "2.5" >= int(1)
-string(3) "2.5" >= float(2.5)
-string(3) "2.5" >= int(0)
-string(3) "2.5" < string(6) "string"
-string(3) "2.5" < string(3) "123"
-string(3) "2.5" >= string(3) "2.5"
-string(3) "2.5" >= NULL
-string(3) "2.5" >= bool(true)
-string(3) "2.5" >= bool(false)
-string(3) "2.5" < object(stdClass)#1 (0) {}
-string(3) "2.5" < object(stdClass)#2 (0) {}
-string(3) "2.5" < object(test)#3 (0) {}
-string(3) "2.5" < array(0) {}
-string(3) "2.5" >= int(-2147483648)
-string(3) "2.5" >= string(11) "-2147483648"
-NULL < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL >= string(0) ""
-NULL < int(1)
-NULL < float(2.5)
-NULL >= int(0)
-NULL < string(6) "string"
-NULL < string(3) "123"
-NULL < string(3) "2.5"
-NULL >= NULL
-NULL < bool(true)
-NULL >= bool(false)
-NULL < object(stdClass)#1 (0) {}
-NULL < object(stdClass)#2 (0) {}
-NULL < object(test)#3 (0) {}
-NULL >= array(0) {}
-NULL < int(-2147483648)
-NULL < string(11) "-2147483648"
-bool(true) >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) >= string(0) ""
-bool(true) >= int(1)
-bool(true) >= float(2.5)
-bool(true) >= int(0)
-bool(true) >= string(6) "string"
-bool(true) >= string(3) "123"
-bool(true) >= string(3) "2.5"
-bool(true) >= NULL
-bool(true) >= bool(true)
-bool(true) >= bool(false)
-bool(true) >= object(stdClass)#1 (0) {}
-bool(true) >= object(stdClass)#2 (0) {}
-bool(true) >= object(test)#3 (0) {}
-bool(true) >= array(0) {}
-bool(true) >= int(-2147483648)
-bool(true) >= string(11) "-2147483648"
-bool(false) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) >= string(0) ""
-bool(false) < int(1)
-bool(false) < float(2.5)
-bool(false) >= int(0)
-bool(false) < string(6) "string"
-bool(false) < string(3) "123"
-bool(false) < string(3) "2.5"
-bool(false) >= NULL
-bool(false) < bool(true)
-bool(false) >= bool(false)
-bool(false) < object(stdClass)#1 (0) {}
-bool(false) < object(stdClass)#2 (0) {}
-bool(false) < object(test)#3 (0) {}
-bool(false) >= array(0) {}
-bool(false) < int(-2147483648)
-bool(false) < string(11) "-2147483648"
-object(stdClass)#1 (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#1 (0) {} >= string(0) ""
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(1)
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- < float(2.5)
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(0)
-object(stdClass)#1 (0) {} >= string(6) "string"
-object(stdClass)#1 (0) {} >= string(3) "123"
-object(stdClass)#1 (0) {} >= string(3) "2.5"
-object(stdClass)#1 (0) {} >= NULL
-object(stdClass)#1 (0) {} >= bool(true)
-object(stdClass)#1 (0) {} >= bool(false)
-object(stdClass)#1 (0) {} >= object(stdClass)#1 (0) {}
-object(stdClass)#1 (0) {} >= object(stdClass)#2 (0) {}
-object(stdClass)#1 (0) {} < object(test)#3 (0) {}
-object(stdClass)#1 (0) {} >= array(0) {}
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(-2147483648)
-object(stdClass)#1 (0) {} >= string(11) "-2147483648"
-object(stdClass)#2 (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#2 (0) {} >= string(0) ""
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(1)
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- < float(2.5)
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(0)
-object(stdClass)#2 (0) {} >= string(6) "string"
-object(stdClass)#2 (0) {} >= string(3) "123"
-object(stdClass)#2 (0) {} >= string(3) "2.5"
-object(stdClass)#2 (0) {} >= NULL
-object(stdClass)#2 (0) {} >= bool(true)
-object(stdClass)#2 (0) {} >= bool(false)
-object(stdClass)#2 (0) {} >= object(stdClass)#1 (0) {}
-object(stdClass)#2 (0) {} >= object(stdClass)#2 (0) {}
-object(stdClass)#2 (0) {} < object(test)#3 (0) {}
-object(stdClass)#2 (0) {} >= array(0) {}
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(-2147483648)
-object(stdClass)#2 (0) {} >= string(11) "-2147483648"
-object(test)#3 (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#3 (0) {} >= string(0) ""
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(1)
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
- < float(2.5)
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(0)
-object(test)#3 (0) {} >= string(6) "string"
-object(test)#3 (0) {} >= string(3) "123"
-object(test)#3 (0) {} >= string(3) "2.5"
-object(test)#3 (0) {} >= NULL
-object(test)#3 (0) {} >= bool(true)
-object(test)#3 (0) {} >= bool(false)
-object(test)#3 (0) {} < object(stdClass)#1 (0) {}
-object(test)#3 (0) {} < object(stdClass)#2 (0) {}
-object(test)#3 (0) {} >= object(test)#3 (0) {}
-object(test)#3 (0) {} >= array(0) {}
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(-2147483648)
-object(test)#3 (0) {} >= string(11) "-2147483648"
-array(0) {} < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} >= string(0) ""
-array(0) {} >= int(1)
-array(0) {} >= float(2.5)
-array(0) {} >= int(0)
-array(0) {} >= string(6) "string"
-array(0) {} >= string(3) "123"
-array(0) {} >= string(3) "2.5"
-array(0) {} >= NULL
-array(0) {} < bool(true)
-array(0) {} >= bool(false)
-array(0) {} < object(stdClass)#1 (0) {}
-array(0) {} < object(stdClass)#2 (0) {}
-array(0) {} < object(test)#3 (0) {}
-array(0) {} >= array(0) {}
-array(0) {} >= int(-2147483648)
-array(0) {} >= string(11) "-2147483648"
-int(-2147483648) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-2147483648) < string(0) ""
-int(-2147483648) < int(1)
-int(-2147483648) < float(2.5)
-int(-2147483648) < int(0)
-int(-2147483648) < string(6) "string"
-int(-2147483648) < string(3) "123"
-int(-2147483648) < string(3) "2.5"
-int(-2147483648) >= NULL
-int(-2147483648) >= bool(true)
-int(-2147483648) >= bool(false)
-int(-2147483648)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#1 (0) {}
-int(-2147483648)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#2 (0) {}
-int(-2147483648)
-Notice: Object of class test could not be converted to int in %s on line %d
- < object(test)#3 (0) {}
-int(-2147483648) < array(0) {}
-int(-2147483648) >= int(-2147483648)
-int(-2147483648) >= string(11) "-2147483648"
-string(11) "-2147483648" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(11) "-2147483648" >= string(0) ""
-string(11) "-2147483648" < int(1)
-string(11) "-2147483648" < float(2.5)
-string(11) "-2147483648" < int(0)
-string(11) "-2147483648" < string(6) "string"
-string(11) "-2147483648" < string(3) "123"
-string(11) "-2147483648" < string(3) "2.5"
-string(11) "-2147483648" >= NULL
-string(11) "-2147483648" >= bool(true)
-string(11) "-2147483648" >= bool(false)
-string(11) "-2147483648" < object(stdClass)#1 (0) {}
-string(11) "-2147483648" < object(stdClass)#2 (0) {}
-string(11) "-2147483648" < object(test)#3 (0) {}
-string(11) "-2147483648" < array(0) {}
-string(11) "-2147483648" >= int(-2147483648)
-string(11) "-2147483648" >= string(11) "-2147483648"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
diff --git a/Zend/tests/compare_005_64bit.phpt b/Zend/tests/compare_005_64bit.phpt
index 523d14bf94..05b25a641b 100644
--- a/Zend/tests/compare_005_64bit.phpt
+++ b/Zend/tests/compare_005_64bit.phpt
@@ -48,346 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} < object(test)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(-9223372036854775808)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(20) "-9223372036854775808"
-string(0) "" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" >= string(0) ""
-string(0) "" < int(1)
-string(0) "" < float(2.5)
-string(0) "" >= int(0)
-string(0) "" < string(6) "string"
-string(0) "" < string(3) "123"
-string(0) "" < string(3) "2.5"
-string(0) "" >= NULL
-string(0) "" < bool(true)
-string(0) "" >= bool(false)
-string(0) "" < object(stdClass)#%d (0) {}
-string(0) "" < object(stdClass)#%d (0) {}
-string(0) "" < object(test)#%d (0) {}
-string(0) "" < array(0) {}
-string(0) "" >= int(-9223372036854775808)
-string(0) "" < string(20) "-9223372036854775808"
-int(1) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) >= string(0) ""
-int(1) >= int(1)
-int(1) < float(2.5)
-int(1) >= int(0)
-int(1) >= string(6) "string"
-int(1) < string(3) "123"
-int(1) < string(3) "2.5"
-int(1) >= NULL
-int(1) >= bool(true)
-int(1) >= bool(false)
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= object(stdClass)#%d (0) {}
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= object(stdClass)#%d (0) {}
-int(1)
-Notice: Object of class test could not be converted to int in %s on line %d
- >= object(test)#%d (0) {}
-int(1) < array(0) {}
-int(1) >= int(-9223372036854775808)
-int(1) >= string(20) "-9223372036854775808"
-float(2.5) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) >= string(0) ""
-float(2.5) >= int(1)
-float(2.5) >= float(2.5)
-float(2.5) >= int(0)
-float(2.5) >= string(6) "string"
-float(2.5) < string(3) "123"
-float(2.5) >= string(3) "2.5"
-float(2.5) >= NULL
-float(2.5) >= bool(true)
-float(2.5) >= bool(false)
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- >= object(stdClass)#%d (0) {}
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- >= object(stdClass)#%d (0) {}
-float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
- >= object(test)#%d (0) {}
-float(2.5) < array(0) {}
-float(2.5) >= int(-9223372036854775808)
-float(2.5) >= string(20) "-9223372036854775808"
-int(0) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) >= string(0) ""
-int(0) < int(1)
-int(0) < float(2.5)
-int(0) >= int(0)
-int(0) >= string(6) "string"
-int(0) < string(3) "123"
-int(0) < string(3) "2.5"
-int(0) >= NULL
-int(0) < bool(true)
-int(0) >= bool(false)
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#%d (0) {}
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#%d (0) {}
-int(0)
-Notice: Object of class test could not be converted to int in %s on line %d
- < object(test)#%d (0) {}
-int(0) < array(0) {}
-int(0) >= int(-9223372036854775808)
-int(0) >= string(20) "-9223372036854775808"
-string(6) "string" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" >= string(0) ""
-string(6) "string" < int(1)
-string(6) "string" < float(2.5)
-string(6) "string" >= int(0)
-string(6) "string" >= string(6) "string"
-string(6) "string" >= string(3) "123"
-string(6) "string" >= string(3) "2.5"
-string(6) "string" >= NULL
-string(6) "string" >= bool(true)
-string(6) "string" >= bool(false)
-string(6) "string" < object(stdClass)#%d (0) {}
-string(6) "string" < object(stdClass)#%d (0) {}
-string(6) "string" < object(test)#%d (0) {}
-string(6) "string" < array(0) {}
-string(6) "string" >= int(-9223372036854775808)
-string(6) "string" >= string(20) "-9223372036854775808"
-string(3) "123" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" >= string(0) ""
-string(3) "123" >= int(1)
-string(3) "123" >= float(2.5)
-string(3) "123" >= int(0)
-string(3) "123" < string(6) "string"
-string(3) "123" >= string(3) "123"
-string(3) "123" >= string(3) "2.5"
-string(3) "123" >= NULL
-string(3) "123" >= bool(true)
-string(3) "123" >= bool(false)
-string(3) "123" < object(stdClass)#%d (0) {}
-string(3) "123" < object(stdClass)#%d (0) {}
-string(3) "123" < object(test)#%d (0) {}
-string(3) "123" < array(0) {}
-string(3) "123" >= int(-9223372036854775808)
-string(3) "123" >= string(20) "-9223372036854775808"
-string(3) "2.5" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" >= string(0) ""
-string(3) "2.5" >= int(1)
-string(3) "2.5" >= float(2.5)
-string(3) "2.5" >= int(0)
-string(3) "2.5" < string(6) "string"
-string(3) "2.5" < string(3) "123"
-string(3) "2.5" >= string(3) "2.5"
-string(3) "2.5" >= NULL
-string(3) "2.5" >= bool(true)
-string(3) "2.5" >= bool(false)
-string(3) "2.5" < object(stdClass)#%d (0) {}
-string(3) "2.5" < object(stdClass)#%d (0) {}
-string(3) "2.5" < object(test)#%d (0) {}
-string(3) "2.5" < array(0) {}
-string(3) "2.5" >= int(-9223372036854775808)
-string(3) "2.5" >= string(20) "-9223372036854775808"
-NULL < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL >= string(0) ""
-NULL < int(1)
-NULL < float(2.5)
-NULL >= int(0)
-NULL < string(6) "string"
-NULL < string(3) "123"
-NULL < string(3) "2.5"
-NULL >= NULL
-NULL < bool(true)
-NULL >= bool(false)
-NULL < object(stdClass)#%d (0) {}
-NULL < object(stdClass)#%d (0) {}
-NULL < object(test)#%d (0) {}
-NULL >= array(0) {}
-NULL < int(-9223372036854775808)
-NULL < string(20) "-9223372036854775808"
-bool(true) >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) >= string(0) ""
-bool(true) >= int(1)
-bool(true) >= float(2.5)
-bool(true) >= int(0)
-bool(true) >= string(6) "string"
-bool(true) >= string(3) "123"
-bool(true) >= string(3) "2.5"
-bool(true) >= NULL
-bool(true) >= bool(true)
-bool(true) >= bool(false)
-bool(true) >= object(stdClass)#%d (0) {}
-bool(true) >= object(stdClass)#%d (0) {}
-bool(true) >= object(test)#%d (0) {}
-bool(true) >= array(0) {}
-bool(true) >= int(-9223372036854775808)
-bool(true) >= string(20) "-9223372036854775808"
-bool(false) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) >= string(0) ""
-bool(false) < int(1)
-bool(false) < float(2.5)
-bool(false) >= int(0)
-bool(false) < string(6) "string"
-bool(false) < string(3) "123"
-bool(false) < string(3) "2.5"
-bool(false) >= NULL
-bool(false) < bool(true)
-bool(false) >= bool(false)
-bool(false) < object(stdClass)#%d (0) {}
-bool(false) < object(stdClass)#%d (0) {}
-bool(false) < object(test)#%d (0) {}
-bool(false) >= array(0) {}
-bool(false) < int(-9223372036854775808)
-bool(false) < string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} >= string(0) ""
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(1)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- < float(2.5)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(0)
-object(stdClass)#%d (0) {} >= string(6) "string"
-object(stdClass)#%d (0) {} >= string(3) "123"
-object(stdClass)#%d (0) {} >= string(3) "2.5"
-object(stdClass)#%d (0) {} >= NULL
-object(stdClass)#%d (0) {} >= bool(true)
-object(stdClass)#%d (0) {} >= bool(false)
-object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} < object(test)#%d (0) {}
-object(stdClass)#%d (0) {} >= array(0) {}
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(-9223372036854775808)
-object(stdClass)#%d (0) {} >= string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} >= string(0) ""
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(1)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- < float(2.5)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(0)
-object(stdClass)#%d (0) {} >= string(6) "string"
-object(stdClass)#%d (0) {} >= string(3) "123"
-object(stdClass)#%d (0) {} >= string(3) "2.5"
-object(stdClass)#%d (0) {} >= NULL
-object(stdClass)#%d (0) {} >= bool(true)
-object(stdClass)#%d (0) {} >= bool(false)
-object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} < object(test)#%d (0) {}
-object(stdClass)#%d (0) {} >= array(0) {}
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- >= int(-9223372036854775808)
-object(stdClass)#%d (0) {} >= string(20) "-9223372036854775808"
-object(test)#%d (0) {} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#%d (0) {} >= string(0) ""
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(1)
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
- < float(2.5)
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(0)
-object(test)#%d (0) {} >= string(6) "string"
-object(test)#%d (0) {} >= string(3) "123"
-object(test)#%d (0) {} >= string(3) "2.5"
-object(test)#%d (0) {} >= NULL
-object(test)#%d (0) {} >= bool(true)
-object(test)#%d (0) {} >= bool(false)
-object(test)#%d (0) {} < object(stdClass)#%d (0) {}
-object(test)#%d (0) {} < object(stdClass)#%d (0) {}
-object(test)#%d (0) {} >= object(test)#%d (0) {}
-object(test)#%d (0) {} >= array(0) {}
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- >= int(-9223372036854775808)
-object(test)#%d (0) {} >= string(20) "-9223372036854775808"
-array(0) {} < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} >= string(0) ""
-array(0) {} >= int(1)
-array(0) {} >= float(2.5)
-array(0) {} >= int(0)
-array(0) {} >= string(6) "string"
-array(0) {} >= string(3) "123"
-array(0) {} >= string(3) "2.5"
-array(0) {} >= NULL
-array(0) {} < bool(true)
-array(0) {} >= bool(false)
-array(0) {} < object(stdClass)#%d (0) {}
-array(0) {} < object(stdClass)#%d (0) {}
-array(0) {} < object(test)#%d (0) {}
-array(0) {} >= array(0) {}
-array(0) {} >= int(-9223372036854775808)
-array(0) {} >= string(20) "-9223372036854775808"
-int(-9223372036854775808) < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-9223372036854775808) < string(0) ""
-int(-9223372036854775808) < int(1)
-int(-9223372036854775808) < float(2.5)
-int(-9223372036854775808) < int(0)
-int(-9223372036854775808) < string(6) "string"
-int(-9223372036854775808) < string(3) "123"
-int(-9223372036854775808) < string(3) "2.5"
-int(-9223372036854775808) >= NULL
-int(-9223372036854775808) >= bool(true)
-int(-9223372036854775808) >= bool(false)
-int(-9223372036854775808)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#%d (0) {}
-int(-9223372036854775808)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- < object(stdClass)#%d (0) {}
-int(-9223372036854775808)
-Notice: Object of class test could not be converted to int in %s on line %d
- < object(test)#%d (0) {}
-int(-9223372036854775808) < array(0) {}
-int(-9223372036854775808) >= int(-9223372036854775808)
-int(-9223372036854775808) >= string(20) "-9223372036854775808"
-string(20) "-9223372036854775808" < array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(20) "-9223372036854775808" >= string(0) ""
-string(20) "-9223372036854775808" < int(1)
-string(20) "-9223372036854775808" < float(2.5)
-string(20) "-9223372036854775808" < int(0)
-string(20) "-9223372036854775808" < string(6) "string"
-string(20) "-9223372036854775808" < string(3) "123"
-string(20) "-9223372036854775808" < string(3) "2.5"
-string(20) "-9223372036854775808" >= NULL
-string(20) "-9223372036854775808" >= bool(true)
-string(20) "-9223372036854775808" >= bool(false)
-string(20) "-9223372036854775808" < object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" < object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" < object(test)#%d (0) {}
-string(20) "-9223372036854775808" < array(0) {}
-string(20) "-9223372036854775808" >= int(-9223372036854775808)
-string(20) "-9223372036854775808" >= string(20) "-9223372036854775808"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
diff --git a/Zend/tests/compare_006.phpt b/Zend/tests/compare_006.phpt
index 7107fd8bc0..e569fdc460 100644
--- a/Zend/tests/compare_006.phpt
+++ b/Zend/tests/compare_006.phpt
@@ -48,346 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(stdClass)#1 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(stdClass)#2 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(test)#3 (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(-2147483648)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(11) "-2147483648"
-string(0) "" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" <= string(0) ""
-string(0) "" <= int(1)
-string(0) "" <= float(2.5)
-string(0) "" <= int(0)
-string(0) "" <= string(6) "string"
-string(0) "" <= string(3) "123"
-string(0) "" <= string(3) "2.5"
-string(0) "" <= NULL
-string(0) "" <= bool(true)
-string(0) "" <= bool(false)
-string(0) "" <= object(stdClass)#1 (0) {}
-string(0) "" <= object(stdClass)#2 (0) {}
-string(0) "" <= object(test)#3 (0) {}
-string(0) "" <= array(0) {}
-string(0) "" > int(-2147483648)
-string(0) "" <= string(11) "-2147483648"
-int(1) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) > string(0) ""
-int(1) <= int(1)
-int(1) <= float(2.5)
-int(1) > int(0)
-int(1) > string(6) "string"
-int(1) <= string(3) "123"
-int(1) <= string(3) "2.5"
-int(1) > NULL
-int(1) <= bool(true)
-int(1) > bool(false)
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#1 (0) {}
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#2 (0) {}
-int(1)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#3 (0) {}
-int(1) <= array(0) {}
-int(1) > int(-2147483648)
-int(1) > string(11) "-2147483648"
-float(2.5) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) > string(0) ""
-float(2.5) > int(1)
-float(2.5) <= float(2.5)
-float(2.5) > int(0)
-float(2.5) > string(6) "string"
-float(2.5) <= string(3) "123"
-float(2.5) <= string(3) "2.5"
-float(2.5) > NULL
-float(2.5) <= bool(true)
-float(2.5) > bool(false)
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- > object(stdClass)#1 (0) {}
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- > object(stdClass)#2 (0) {}
-float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
- > object(test)#3 (0) {}
-float(2.5) <= array(0) {}
-float(2.5) > int(-2147483648)
-float(2.5) > string(11) "-2147483648"
-int(0) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) <= string(0) ""
-int(0) <= int(1)
-int(0) <= float(2.5)
-int(0) <= int(0)
-int(0) <= string(6) "string"
-int(0) <= string(3) "123"
-int(0) <= string(3) "2.5"
-int(0) <= NULL
-int(0) <= bool(true)
-int(0) <= bool(false)
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#1 (0) {}
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#2 (0) {}
-int(0)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#3 (0) {}
-int(0) <= array(0) {}
-int(0) > int(-2147483648)
-int(0) > string(11) "-2147483648"
-string(6) "string" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" > string(0) ""
-string(6) "string" <= int(1)
-string(6) "string" <= float(2.5)
-string(6) "string" <= int(0)
-string(6) "string" <= string(6) "string"
-string(6) "string" > string(3) "123"
-string(6) "string" > string(3) "2.5"
-string(6) "string" > NULL
-string(6) "string" <= bool(true)
-string(6) "string" > bool(false)
-string(6) "string" <= object(stdClass)#1 (0) {}
-string(6) "string" <= object(stdClass)#2 (0) {}
-string(6) "string" <= object(test)#3 (0) {}
-string(6) "string" <= array(0) {}
-string(6) "string" > int(-2147483648)
-string(6) "string" > string(11) "-2147483648"
-string(3) "123" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" > string(0) ""
-string(3) "123" > int(1)
-string(3) "123" > float(2.5)
-string(3) "123" > int(0)
-string(3) "123" <= string(6) "string"
-string(3) "123" <= string(3) "123"
-string(3) "123" > string(3) "2.5"
-string(3) "123" > NULL
-string(3) "123" <= bool(true)
-string(3) "123" > bool(false)
-string(3) "123" <= object(stdClass)#1 (0) {}
-string(3) "123" <= object(stdClass)#2 (0) {}
-string(3) "123" <= object(test)#3 (0) {}
-string(3) "123" <= array(0) {}
-string(3) "123" > int(-2147483648)
-string(3) "123" > string(11) "-2147483648"
-string(3) "2.5" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" > string(0) ""
-string(3) "2.5" > int(1)
-string(3) "2.5" <= float(2.5)
-string(3) "2.5" > int(0)
-string(3) "2.5" <= string(6) "string"
-string(3) "2.5" <= string(3) "123"
-string(3) "2.5" <= string(3) "2.5"
-string(3) "2.5" > NULL
-string(3) "2.5" <= bool(true)
-string(3) "2.5" > bool(false)
-string(3) "2.5" <= object(stdClass)#1 (0) {}
-string(3) "2.5" <= object(stdClass)#2 (0) {}
-string(3) "2.5" <= object(test)#3 (0) {}
-string(3) "2.5" <= array(0) {}
-string(3) "2.5" > int(-2147483648)
-string(3) "2.5" > string(11) "-2147483648"
-NULL <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL <= string(0) ""
-NULL <= int(1)
-NULL <= float(2.5)
-NULL <= int(0)
-NULL <= string(6) "string"
-NULL <= string(3) "123"
-NULL <= string(3) "2.5"
-NULL <= NULL
-NULL <= bool(true)
-NULL <= bool(false)
-NULL <= object(stdClass)#1 (0) {}
-NULL <= object(stdClass)#2 (0) {}
-NULL <= object(test)#3 (0) {}
-NULL <= array(0) {}
-NULL <= int(-2147483648)
-NULL <= string(11) "-2147483648"
-bool(true) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) > string(0) ""
-bool(true) <= int(1)
-bool(true) <= float(2.5)
-bool(true) > int(0)
-bool(true) <= string(6) "string"
-bool(true) <= string(3) "123"
-bool(true) <= string(3) "2.5"
-bool(true) > NULL
-bool(true) <= bool(true)
-bool(true) > bool(false)
-bool(true) <= object(stdClass)#1 (0) {}
-bool(true) <= object(stdClass)#2 (0) {}
-bool(true) <= object(test)#3 (0) {}
-bool(true) > array(0) {}
-bool(true) <= int(-2147483648)
-bool(true) <= string(11) "-2147483648"
-bool(false) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) <= string(0) ""
-bool(false) <= int(1)
-bool(false) <= float(2.5)
-bool(false) <= int(0)
-bool(false) <= string(6) "string"
-bool(false) <= string(3) "123"
-bool(false) <= string(3) "2.5"
-bool(false) <= NULL
-bool(false) <= bool(true)
-bool(false) <= bool(false)
-bool(false) <= object(stdClass)#1 (0) {}
-bool(false) <= object(stdClass)#2 (0) {}
-bool(false) <= object(test)#3 (0) {}
-bool(false) <= array(0) {}
-bool(false) <= int(-2147483648)
-bool(false) <= string(11) "-2147483648"
-object(stdClass)#1 (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#1 (0) {} > string(0) ""
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= int(1)
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- <= float(2.5)
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(0)
-object(stdClass)#1 (0) {} > string(6) "string"
-object(stdClass)#1 (0) {} > string(3) "123"
-object(stdClass)#1 (0) {} > string(3) "2.5"
-object(stdClass)#1 (0) {} > NULL
-object(stdClass)#1 (0) {} <= bool(true)
-object(stdClass)#1 (0) {} > bool(false)
-object(stdClass)#1 (0) {} <= object(stdClass)#1 (0) {}
-object(stdClass)#1 (0) {} <= object(stdClass)#2 (0) {}
-object(stdClass)#1 (0) {} > object(test)#3 (0) {}
-object(stdClass)#1 (0) {} > array(0) {}
-object(stdClass)#1 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(-2147483648)
-object(stdClass)#1 (0) {} > string(11) "-2147483648"
-object(stdClass)#2 (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#2 (0) {} > string(0) ""
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= int(1)
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- <= float(2.5)
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(0)
-object(stdClass)#2 (0) {} > string(6) "string"
-object(stdClass)#2 (0) {} > string(3) "123"
-object(stdClass)#2 (0) {} > string(3) "2.5"
-object(stdClass)#2 (0) {} > NULL
-object(stdClass)#2 (0) {} <= bool(true)
-object(stdClass)#2 (0) {} > bool(false)
-object(stdClass)#2 (0) {} <= object(stdClass)#1 (0) {}
-object(stdClass)#2 (0) {} <= object(stdClass)#2 (0) {}
-object(stdClass)#2 (0) {} > object(test)#3 (0) {}
-object(stdClass)#2 (0) {} > array(0) {}
-object(stdClass)#2 (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(-2147483648)
-object(stdClass)#2 (0) {} > string(11) "-2147483648"
-object(test)#3 (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#3 (0) {} > string(0) ""
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- <= int(1)
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
- <= float(2.5)
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- > int(0)
-object(test)#3 (0) {} > string(6) "string"
-object(test)#3 (0) {} > string(3) "123"
-object(test)#3 (0) {} > string(3) "2.5"
-object(test)#3 (0) {} > NULL
-object(test)#3 (0) {} <= bool(true)
-object(test)#3 (0) {} > bool(false)
-object(test)#3 (0) {} > object(stdClass)#1 (0) {}
-object(test)#3 (0) {} > object(stdClass)#2 (0) {}
-object(test)#3 (0) {} <= object(test)#3 (0) {}
-object(test)#3 (0) {} > array(0) {}
-object(test)#3 (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- > int(-2147483648)
-object(test)#3 (0) {} > string(11) "-2147483648"
-array(0) {} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} > string(0) ""
-array(0) {} > int(1)
-array(0) {} > float(2.5)
-array(0) {} > int(0)
-array(0) {} > string(6) "string"
-array(0) {} > string(3) "123"
-array(0) {} > string(3) "2.5"
-array(0) {} <= NULL
-array(0) {} <= bool(true)
-array(0) {} <= bool(false)
-array(0) {} <= object(stdClass)#1 (0) {}
-array(0) {} <= object(stdClass)#2 (0) {}
-array(0) {} <= object(test)#3 (0) {}
-array(0) {} <= array(0) {}
-array(0) {} > int(-2147483648)
-array(0) {} > string(11) "-2147483648"
-int(-2147483648) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-2147483648) <= string(0) ""
-int(-2147483648) <= int(1)
-int(-2147483648) <= float(2.5)
-int(-2147483648) <= int(0)
-int(-2147483648) <= string(6) "string"
-int(-2147483648) <= string(3) "123"
-int(-2147483648) <= string(3) "2.5"
-int(-2147483648) > NULL
-int(-2147483648) <= bool(true)
-int(-2147483648) > bool(false)
-int(-2147483648)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#1 (0) {}
-int(-2147483648)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#2 (0) {}
-int(-2147483648)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#3 (0) {}
-int(-2147483648) <= array(0) {}
-int(-2147483648) <= int(-2147483648)
-int(-2147483648) <= string(11) "-2147483648"
-string(11) "-2147483648" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(11) "-2147483648" > string(0) ""
-string(11) "-2147483648" <= int(1)
-string(11) "-2147483648" <= float(2.5)
-string(11) "-2147483648" <= int(0)
-string(11) "-2147483648" <= string(6) "string"
-string(11) "-2147483648" <= string(3) "123"
-string(11) "-2147483648" <= string(3) "2.5"
-string(11) "-2147483648" > NULL
-string(11) "-2147483648" <= bool(true)
-string(11) "-2147483648" > bool(false)
-string(11) "-2147483648" <= object(stdClass)#1 (0) {}
-string(11) "-2147483648" <= object(stdClass)#2 (0) {}
-string(11) "-2147483648" <= object(test)#3 (0) {}
-string(11) "-2147483648" <= array(0) {}
-string(11) "-2147483648" <= int(-2147483648)
-string(11) "-2147483648" <= string(11) "-2147483648"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
diff --git a/Zend/tests/compare_006_64bit.phpt b/Zend/tests/compare_006_64bit.phpt
index e72f20495c..87e8d30628 100644
--- a/Zend/tests/compare_006_64bit.phpt
+++ b/Zend/tests/compare_006_64bit.phpt
@@ -48,346 +48,7 @@ foreach($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(0) ""
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > float(2.5)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(0)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(6) "string"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(3) "123"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(3) "2.5"
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > NULL
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= bool(true)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > bool(false)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(stdClass)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= object(test)#%d (0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > array(0) {}
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(-9223372036854775808)
-array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(20) "-9223372036854775808"
-string(0) "" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(0) "" <= string(0) ""
-string(0) "" <= int(1)
-string(0) "" <= float(2.5)
-string(0) "" <= int(0)
-string(0) "" <= string(6) "string"
-string(0) "" <= string(3) "123"
-string(0) "" <= string(3) "2.5"
-string(0) "" <= NULL
-string(0) "" <= bool(true)
-string(0) "" <= bool(false)
-string(0) "" <= object(stdClass)#%d (0) {}
-string(0) "" <= object(stdClass)#%d (0) {}
-string(0) "" <= object(test)#%d (0) {}
-string(0) "" <= array(0) {}
-string(0) "" > int(-9223372036854775808)
-string(0) "" <= string(20) "-9223372036854775808"
-int(1) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(1) > string(0) ""
-int(1) <= int(1)
-int(1) <= float(2.5)
-int(1) > int(0)
-int(1) > string(6) "string"
-int(1) <= string(3) "123"
-int(1) <= string(3) "2.5"
-int(1) > NULL
-int(1) <= bool(true)
-int(1) > bool(false)
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(1)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(1)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#%d (0) {}
-int(1) <= array(0) {}
-int(1) > int(-9223372036854775808)
-int(1) > string(20) "-9223372036854775808"
-float(2.5) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-float(2.5) > string(0) ""
-float(2.5) > int(1)
-float(2.5) <= float(2.5)
-float(2.5) > int(0)
-float(2.5) > string(6) "string"
-float(2.5) <= string(3) "123"
-float(2.5) <= string(3) "2.5"
-float(2.5) > NULL
-float(2.5) <= bool(true)
-float(2.5) > bool(false)
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- > object(stdClass)#%d (0) {}
-float(2.5)
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- > object(stdClass)#%d (0) {}
-float(2.5)
-Notice: Object of class test could not be converted to double in %s on line %d
- > object(test)#%d (0) {}
-float(2.5) <= array(0) {}
-float(2.5) > int(-9223372036854775808)
-float(2.5) > string(20) "-9223372036854775808"
-int(0) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(0) <= string(0) ""
-int(0) <= int(1)
-int(0) <= float(2.5)
-int(0) <= int(0)
-int(0) <= string(6) "string"
-int(0) <= string(3) "123"
-int(0) <= string(3) "2.5"
-int(0) <= NULL
-int(0) <= bool(true)
-int(0) <= bool(false)
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(0)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(0)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#%d (0) {}
-int(0) <= array(0) {}
-int(0) > int(-9223372036854775808)
-int(0) > string(20) "-9223372036854775808"
-string(6) "string" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(6) "string" > string(0) ""
-string(6) "string" <= int(1)
-string(6) "string" <= float(2.5)
-string(6) "string" <= int(0)
-string(6) "string" <= string(6) "string"
-string(6) "string" > string(3) "123"
-string(6) "string" > string(3) "2.5"
-string(6) "string" > NULL
-string(6) "string" <= bool(true)
-string(6) "string" > bool(false)
-string(6) "string" <= object(stdClass)#%d (0) {}
-string(6) "string" <= object(stdClass)#%d (0) {}
-string(6) "string" <= object(test)#%d (0) {}
-string(6) "string" <= array(0) {}
-string(6) "string" > int(-9223372036854775808)
-string(6) "string" > string(20) "-9223372036854775808"
-string(3) "123" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "123" > string(0) ""
-string(3) "123" > int(1)
-string(3) "123" > float(2.5)
-string(3) "123" > int(0)
-string(3) "123" <= string(6) "string"
-string(3) "123" <= string(3) "123"
-string(3) "123" > string(3) "2.5"
-string(3) "123" > NULL
-string(3) "123" <= bool(true)
-string(3) "123" > bool(false)
-string(3) "123" <= object(stdClass)#%d (0) {}
-string(3) "123" <= object(stdClass)#%d (0) {}
-string(3) "123" <= object(test)#%d (0) {}
-string(3) "123" <= array(0) {}
-string(3) "123" > int(-9223372036854775808)
-string(3) "123" > string(20) "-9223372036854775808"
-string(3) "2.5" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(3) "2.5" > string(0) ""
-string(3) "2.5" > int(1)
-string(3) "2.5" <= float(2.5)
-string(3) "2.5" > int(0)
-string(3) "2.5" <= string(6) "string"
-string(3) "2.5" <= string(3) "123"
-string(3) "2.5" <= string(3) "2.5"
-string(3) "2.5" > NULL
-string(3) "2.5" <= bool(true)
-string(3) "2.5" > bool(false)
-string(3) "2.5" <= object(stdClass)#%d (0) {}
-string(3) "2.5" <= object(stdClass)#%d (0) {}
-string(3) "2.5" <= object(test)#%d (0) {}
-string(3) "2.5" <= array(0) {}
-string(3) "2.5" > int(-9223372036854775808)
-string(3) "2.5" > string(20) "-9223372036854775808"
-NULL <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-NULL <= string(0) ""
-NULL <= int(1)
-NULL <= float(2.5)
-NULL <= int(0)
-NULL <= string(6) "string"
-NULL <= string(3) "123"
-NULL <= string(3) "2.5"
-NULL <= NULL
-NULL <= bool(true)
-NULL <= bool(false)
-NULL <= object(stdClass)#%d (0) {}
-NULL <= object(stdClass)#%d (0) {}
-NULL <= object(test)#%d (0) {}
-NULL <= array(0) {}
-NULL <= int(-9223372036854775808)
-NULL <= string(20) "-9223372036854775808"
-bool(true) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(true) > string(0) ""
-bool(true) <= int(1)
-bool(true) <= float(2.5)
-bool(true) > int(0)
-bool(true) <= string(6) "string"
-bool(true) <= string(3) "123"
-bool(true) <= string(3) "2.5"
-bool(true) > NULL
-bool(true) <= bool(true)
-bool(true) > bool(false)
-bool(true) <= object(stdClass)#%d (0) {}
-bool(true) <= object(stdClass)#%d (0) {}
-bool(true) <= object(test)#%d (0) {}
-bool(true) > array(0) {}
-bool(true) <= int(-9223372036854775808)
-bool(true) <= string(20) "-9223372036854775808"
-bool(false) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-bool(false) <= string(0) ""
-bool(false) <= int(1)
-bool(false) <= float(2.5)
-bool(false) <= int(0)
-bool(false) <= string(6) "string"
-bool(false) <= string(3) "123"
-bool(false) <= string(3) "2.5"
-bool(false) <= NULL
-bool(false) <= bool(true)
-bool(false) <= bool(false)
-bool(false) <= object(stdClass)#%d (0) {}
-bool(false) <= object(stdClass)#%d (0) {}
-bool(false) <= object(test)#%d (0) {}
-bool(false) <= array(0) {}
-bool(false) <= int(-9223372036854775808)
-bool(false) <= string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} > string(0) ""
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= int(1)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- <= float(2.5)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(0)
-object(stdClass)#%d (0) {} > string(6) "string"
-object(stdClass)#%d (0) {} > string(3) "123"
-object(stdClass)#%d (0) {} > string(3) "2.5"
-object(stdClass)#%d (0) {} > NULL
-object(stdClass)#%d (0) {} <= bool(true)
-object(stdClass)#%d (0) {} > bool(false)
-object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} > object(test)#%d (0) {}
-object(stdClass)#%d (0) {} > array(0) {}
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(-9223372036854775808)
-object(stdClass)#%d (0) {} > string(20) "-9223372036854775808"
-object(stdClass)#%d (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(stdClass)#%d (0) {} > string(0) ""
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= int(1)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to double in %s on line %d
- <= float(2.5)
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(0)
-object(stdClass)#%d (0) {} > string(6) "string"
-object(stdClass)#%d (0) {} > string(3) "123"
-object(stdClass)#%d (0) {} > string(3) "2.5"
-object(stdClass)#%d (0) {} > NULL
-object(stdClass)#%d (0) {} <= bool(true)
-object(stdClass)#%d (0) {} > bool(false)
-object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {}
-object(stdClass)#%d (0) {} > object(test)#%d (0) {}
-object(stdClass)#%d (0) {} > array(0) {}
-object(stdClass)#%d (0) {}
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- > int(-9223372036854775808)
-object(stdClass)#%d (0) {} > string(20) "-9223372036854775808"
-object(test)#%d (0) {} > array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-object(test)#%d (0) {} > string(0) ""
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- <= int(1)
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to double in %s on line %d
- <= float(2.5)
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- > int(0)
-object(test)#%d (0) {} > string(6) "string"
-object(test)#%d (0) {} > string(3) "123"
-object(test)#%d (0) {} > string(3) "2.5"
-object(test)#%d (0) {} > NULL
-object(test)#%d (0) {} <= bool(true)
-object(test)#%d (0) {} > bool(false)
-object(test)#%d (0) {} > object(stdClass)#%d (0) {}
-object(test)#%d (0) {} > object(stdClass)#%d (0) {}
-object(test)#%d (0) {} <= object(test)#%d (0) {}
-object(test)#%d (0) {} > array(0) {}
-object(test)#%d (0) {}
-Notice: Object of class test could not be converted to int in %s on line %d
- > int(-9223372036854775808)
-object(test)#%d (0) {} > string(20) "-9223372036854775808"
-array(0) {} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-array(0) {} > string(0) ""
-array(0) {} > int(1)
-array(0) {} > float(2.5)
-array(0) {} > int(0)
-array(0) {} > string(6) "string"
-array(0) {} > string(3) "123"
-array(0) {} > string(3) "2.5"
-array(0) {} <= NULL
-array(0) {} <= bool(true)
-array(0) {} <= bool(false)
-array(0) {} <= object(stdClass)#%d (0) {}
-array(0) {} <= object(stdClass)#%d (0) {}
-array(0) {} <= object(test)#%d (0) {}
-array(0) {} <= array(0) {}
-array(0) {} > int(-9223372036854775808)
-array(0) {} > string(20) "-9223372036854775808"
-int(-9223372036854775808) <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-int(-9223372036854775808) <= string(0) ""
-int(-9223372036854775808) <= int(1)
-int(-9223372036854775808) <= float(2.5)
-int(-9223372036854775808) <= int(0)
-int(-9223372036854775808) <= string(6) "string"
-int(-9223372036854775808) <= string(3) "123"
-int(-9223372036854775808) <= string(3) "2.5"
-int(-9223372036854775808) > NULL
-int(-9223372036854775808) <= bool(true)
-int(-9223372036854775808) > bool(false)
-int(-9223372036854775808)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(-9223372036854775808)
-Notice: Object of class stdClass could not be converted to int in %s on line %d
- <= object(stdClass)#%d (0) {}
-int(-9223372036854775808)
-Notice: Object of class test could not be converted to int in %s on line %d
- <= object(test)#%d (0) {}
-int(-9223372036854775808) <= array(0) {}
-int(-9223372036854775808) <= int(-9223372036854775808)
-int(-9223372036854775808) <= string(20) "-9223372036854775808"
-string(20) "-9223372036854775808" <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
-string(20) "-9223372036854775808" > string(0) ""
-string(20) "-9223372036854775808" <= int(1)
-string(20) "-9223372036854775808" <= float(2.5)
-string(20) "-9223372036854775808" <= int(0)
-string(20) "-9223372036854775808" <= string(6) "string"
-string(20) "-9223372036854775808" <= string(3) "123"
-string(20) "-9223372036854775808" <= string(3) "2.5"
-string(20) "-9223372036854775808" > NULL
-string(20) "-9223372036854775808" <= bool(true)
-string(20) "-9223372036854775808" > bool(false)
-string(20) "-9223372036854775808" <= object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" <= object(stdClass)#%d (0) {}
-string(20) "-9223372036854775808" <= object(test)#%d (0) {}
-string(20) "-9223372036854775808" <= array(0) {}
-string(20) "-9223372036854775808" <= int(-9223372036854775808)
-string(20) "-9223372036854775808" <= string(20) "-9223372036854775808"
-Done
---UEXPECTF--
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > unicode(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
diff --git a/Zend/tests/concat_001.phpt b/Zend/tests/concat_001.phpt
index 543dbb013e..e1f4396695 100644
--- a/Zend/tests/concat_001.phpt
+++ b/Zend/tests/concat_001.phpt
@@ -49,53 +49,7 @@ var_dump($d.$d);
 
 echo "Done\n";
 ?>
---EXPECTF--	
-Notice: Array to string conversion in %s on line %d
-string(24) "Arraythis is test object"
-
-Notice: Array to string conversion in %s on line %d
-string(16) "Arraysome string"
-
-Notice: Array to string conversion in %s on line %d
-string(8) "Array222"
-
-Notice: Array to string conversion in %s on line %d
-string(13) "Array2323.444"
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-string(10) "ArrayArray"
-
-Notice: Array to string conversion in %s on line %d
-string(24) "this is test objectArray"
-string(30) "this is test objectsome string"
-string(22) "this is test object222"
-string(27) "this is test object2323.444"
-string(38) "this is test objectthis is test object"
-string(30) "some stringthis is test object"
-
-Notice: Array to string conversion in %s on line %d
-string(16) "some stringArray"
-string(14) "some string222"
-string(19) "some string2323.444"
-string(22) "some stringsome string"
-
-Notice: Array to string conversion in %s on line %d
-string(8) "222Array"
-string(22) "222this is test object"
-string(14) "222some string"
-string(11) "2222323.444"
-string(6) "222222"
-
-Notice: Array to string conversion in %s on line %d
-string(13) "2323.444Array"
-string(27) "2323.444this is test object"
-string(19) "2323.444some string"
-string(11) "2323.444222"
-string(16) "2323.4442323.444"
-Done
---UEXPECTF--
+--EXPECTF--
 Notice: Array to string conversion in %s on line %d
 unicode(24) "Arraythis is test object"
 
diff --git a/Zend/tests/concat_002.phpt b/Zend/tests/concat_002.phpt
index fd28dfb46a..e1a9919d85 100644
--- a/Zend/tests/concat_002.phpt
+++ b/Zend/tests/concat_002.phpt
@@ -23,13 +23,7 @@ var_dump($tmp);
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(32) "binary stringone more bin string"
-string(24) "binary stringtest string"
-string(24) "test stringone more test"
-string(30) "test stringone more bin string"
-Done
---UEXPECTF--
+--EXPECT--
 string(32) "binary stringone more bin string"
 unicode(24) "binary stringtest string"
 unicode(24) "test stringone more test"
diff --git a/Zend/tests/constants_002.phpt b/Zend/tests/constants_002.phpt
index 2e769f5dbf..6f66c3d5c9 100644
--- a/Zend/tests/constants_002.phpt
+++ b/Zend/tests/constants_002.phpt
@@ -13,12 +13,6 @@ var_dump(foo);
 --EXPECTF--
 Warning: Constants may only evaluate to scalar values in %s on line %d
 
-Notice: Use of undefined constant foo - assumed 'foo' in %s on line %d
-string(%d) "foo"
-resource(%d) of type (stream)
---UEXPECTF--
-Warning: Constants may only evaluate to scalar values in %s on line %d
-
 Notice: Use of undefined constant foo - assumed 'foo' in %s on line %d
 unicode(%d) "foo"
 resource(%d) of type (stream)
diff --git a/Zend/tests/decrement_001.phpt b/Zend/tests/decrement_001.phpt
index 6449187a34..e886746473 100644
--- a/Zend/tests/decrement_001.phpt
+++ b/Zend/tests/decrement_001.phpt
@@ -32,33 +32,7 @@ foreach ($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-int(-1)
-int(0)
-float(1.5)
-int(-1)
-string(6) "string"
-int(122)
-float(1.5)
-NULL
-bool(true)
-bool(false)
-object(stdClass)#%d (0) {
-}
-array(0) {
-}
-float(-2147483649)
-float(-2147483649)
-Done
---UEXPECTF--	
+--EXPECTF--
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/decrement_001_64bit.phpt b/Zend/tests/decrement_001_64bit.phpt
index 2e79d76c85..d8ecb6d3cb 100644
--- a/Zend/tests/decrement_001_64bit.phpt
+++ b/Zend/tests/decrement_001_64bit.phpt
@@ -32,33 +32,7 @@ foreach ($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-int(-1)
-int(0)
-float(1.5)
-int(-1)
-string(6) "string"
-int(122)
-float(1.5)
-NULL
-bool(true)
-bool(false)
-object(stdClass)#%d (0) {
-}
-array(0) {
-}
-float(-9.2233720368548E+18)
-float(-9.2233720368548E+18)
-Done
---UEXPECTF--	
+--EXPECTF--
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/div_001.phpt b/Zend/tests/div_001.phpt
index 5fa264a11e..051ed3f733 100644
--- a/Zend/tests/div_001.phpt
+++ b/Zend/tests/div_001.phpt
@@ -25,7 +25,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 float(394758.39454545)
 float(394758.39454545)
 float(394758.39454545)
diff --git a/Zend/tests/div_002.phpt b/Zend/tests/div_002.phpt
index 6ade1d9f51..5dabbede00 100644
--- a/Zend/tests/div_002.phpt
+++ b/Zend/tests/div_002.phpt
@@ -11,5 +11,5 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Unsupported operand types in %s on line %d
diff --git a/Zend/tests/double_to_string.phpt b/Zend/tests/double_to_string.phpt
index a7e253afc3..d6150e6f40 100644
--- a/Zend/tests/double_to_string.phpt
+++ b/Zend/tests/double_to_string.phpt
@@ -32,25 +32,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(7) "2.9E+17"
-string(7) "2.9E+14"
-string(%d) "2%s"
-string(%d) "29%d"
-string(%d) "29%d"
-string(13) "29000.7123123"
-string(15) "239234242.71231"
-string(16) "0.12345678901235"
-string(14) "10000000000000"
-string(7) "1.0E+14"
-string(7) "1.0E+18"
-string(7) "1.0E+14"
-string(11) "10000000000"
-string(7) "1.0E+15"
-string(7) "1.0E+16"
-string(1) "0"
-Done
---UEXPECTF--
+--EXPECTF--
 unicode(7) "2.9E+17"
 unicode(7) "2.9E+14"
 unicode(%d) "2%s"
diff --git a/Zend/tests/double_to_string_64bit.phpt b/Zend/tests/double_to_string_64bit.phpt
index da16eb6c12..941aea8eca 100644
--- a/Zend/tests/double_to_string_64bit.phpt
+++ b/Zend/tests/double_to_string_64bit.phpt
@@ -35,28 +35,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-string(7) "2.9E+37"
-string(18) "290000000000000000"
-string(15) "290000000000000"
-string(14) "29000000000000"
-string(14) "29000000000000"
-string(14) "29000000000001"
-string(13) "29000.7123123"
-string(15) "239234242.71231"
-string(16) "0.12345678901235"
-string(7) "1.0E+46"
-string(7) "1.0E+33"
-string(18) "100000000000000001"
-string(19) "1000006000000000011"
-string(15) "100000000000001"
-string(11) "10000000000"
-string(18) "999999999999999999"
-string(7) "1.0E+19"
-string(7) "1.0E+37"
-string(1) "0"
-Done
---UEXPECTF--
+--EXPECT--
 unicode(7) "2.9E+37"
 unicode(18) "290000000000000000"
 unicode(15) "290000000000000"
diff --git a/Zend/tests/each_002.phpt b/Zend/tests/each_002.phpt
index 59ff7a75dd..526e2df27b 100644
--- a/Zend/tests/each_002.phpt
+++ b/Zend/tests/each_002.phpt
@@ -13,22 +13,7 @@ var_dump(each($a));
 
 
 ?>
---EXPECTF--
-bool(false)
-bool(false)
-array(4) {
-  [1]=>
-  object(stdClass)#1 (0) {
-  }
-  ["value"]=>
-  object(stdClass)#1 (0) {
-  }
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
---UEXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 array(4) {
diff --git a/Zend/tests/each_003.phpt b/Zend/tests/each_003.phpt
index 8c0c32a7f7..f9ca30ebeb 100644
--- a/Zend/tests/each_003.phpt
+++ b/Zend/tests/each_003.phpt
@@ -9,20 +9,7 @@ $a[] =& $a;
 var_dump(each($a[1]));
 
 ?>
---EXPECTF--
-array(4) {
-  [1]=>
-  array(0) {
-  }
-  ["value"]=>
-  array(0) {
-  }
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
---UEXPECTF--
+--EXPECT--
 array(4) {
   [1]=>
   array(0) {
diff --git a/Zend/tests/errmsg_001.phpt b/Zend/tests/errmsg_001.phpt
index b85e032b90..33f9561378 100644
--- a/Zend/tests/errmsg_001.phpt
+++ b/Zend/tests/errmsg_001.phpt
@@ -12,5 +12,5 @@ class Impl extends Test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Non-abstract method Impl::Foo() must contain body in %s on line %d
diff --git a/Zend/tests/errmsg_002.phpt b/Zend/tests/errmsg_002.phpt
index b7330c9f1f..d1c4cb893f 100644
--- a/Zend/tests/errmsg_002.phpt
+++ b/Zend/tests/errmsg_002.phpt
@@ -10,5 +10,5 @@ abstract class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Abstract function test::foo() cannot be declared private in %s on line %d
diff --git a/Zend/tests/errmsg_003.phpt b/Zend/tests/errmsg_003.phpt
index 64e458781d..8daa66ae10 100644
--- a/Zend/tests/errmsg_003.phpt
+++ b/Zend/tests/errmsg_003.phpt
@@ -15,5 +15,5 @@ $t->foo();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot re-assign $this in %s on line %d
diff --git a/Zend/tests/errmsg_004.phpt b/Zend/tests/errmsg_004.phpt
index e6d22d6aba..e322b66429 100644
--- a/Zend/tests/errmsg_004.phpt
+++ b/Zend/tests/errmsg_004.phpt
@@ -11,5 +11,5 @@ foo() = 1;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Can't use function return value in write context in %s on line %d
diff --git a/Zend/tests/errmsg_005.phpt b/Zend/tests/errmsg_005.phpt
index 31c924cbb3..a7a2dc803c 100644
--- a/Zend/tests/errmsg_005.phpt
+++ b/Zend/tests/errmsg_005.phpt
@@ -14,5 +14,5 @@ $t->foo() = 1;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Can't use method return value in write context in %s on line %d
diff --git a/Zend/tests/errmsg_006.phpt b/Zend/tests/errmsg_006.phpt
index 976093d854..1165770d4b 100644
--- a/Zend/tests/errmsg_006.phpt
+++ b/Zend/tests/errmsg_006.phpt
@@ -8,5 +8,5 @@ $b = $a[];
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for reading in %s on line %d
diff --git a/Zend/tests/errmsg_007.phpt b/Zend/tests/errmsg_007.phpt
index 1ac296695d..de0e9d1f10 100644
--- a/Zend/tests/errmsg_007.phpt
+++ b/Zend/tests/errmsg_007.phpt
@@ -8,5 +8,5 @@ isset($a[]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for reading in %s on line %d
diff --git a/Zend/tests/errmsg_008.phpt b/Zend/tests/errmsg_008.phpt
index e900603a89..f399afe414 100644
--- a/Zend/tests/errmsg_008.phpt
+++ b/Zend/tests/errmsg_008.phpt
@@ -8,5 +8,5 @@ unset($a[]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for unsetting in %s on line %d
diff --git a/Zend/tests/errmsg_009.phpt b/Zend/tests/errmsg_009.phpt
index 4834fa3e7a..c65b40e0d5 100644
--- a/Zend/tests/errmsg_009.phpt
+++ b/Zend/tests/errmsg_009.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple access type modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/errmsg_010.phpt b/Zend/tests/errmsg_010.phpt
index ae2572f7bc..76faf13ee2 100644
--- a/Zend/tests/errmsg_010.phpt
+++ b/Zend/tests/errmsg_010.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple access type modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/errmsg_011.phpt b/Zend/tests/errmsg_011.phpt
index 9cfde0f8bb..5333f3b23c 100644
--- a/Zend/tests/errmsg_011.phpt
+++ b/Zend/tests/errmsg_011.phpt
@@ -12,5 +12,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot redeclare test::foo() in %s on line %d
diff --git a/Zend/tests/errmsg_012.phpt b/Zend/tests/errmsg_012.phpt
index 183785be04..c914125af5 100644
--- a/Zend/tests/errmsg_012.phpt
+++ b/Zend/tests/errmsg_012.phpt
@@ -7,5 +7,5 @@ function __autoload($a, $b) {}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: __autoload() must take exactly 1 argument in %s on line %d
diff --git a/Zend/tests/errmsg_013.phpt b/Zend/tests/errmsg_013.phpt
index d1f248ec28..27a3d8f326 100644
--- a/Zend/tests/errmsg_013.phpt
+++ b/Zend/tests/errmsg_013.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Default value for parameters with array type hint can only be an array or NULL in %s on line %d
diff --git a/Zend/tests/errmsg_014.phpt b/Zend/tests/errmsg_014.phpt
index 77e12b05e9..6dc03844ee 100644
--- a/Zend/tests/errmsg_014.phpt
+++ b/Zend/tests/errmsg_014.phpt
@@ -13,5 +13,5 @@ $t->__clone();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot call __clone() method on objects - use 'clone $obj' instead in %s on line %d
diff --git a/Zend/tests/errmsg_015.phpt b/Zend/tests/errmsg_015.phpt
index 8e626e5092..948dee2f76 100644
--- a/Zend/tests/errmsg_015.phpt
+++ b/Zend/tests/errmsg_015.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__clone() cannot accept any arguments in %s on line %d
diff --git a/Zend/tests/errmsg_016.phpt b/Zend/tests/errmsg_016.phpt
index ccda07b9a3..05e10b41ab 100644
--- a/Zend/tests/errmsg_016.phpt
+++ b/Zend/tests/errmsg_016.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__isset() must take exactly 1 argument in %s on line %d
diff --git a/Zend/tests/errmsg_017.phpt b/Zend/tests/errmsg_017.phpt
index df2b665687..3ee18a5c40 100644
--- a/Zend/tests/errmsg_017.phpt
+++ b/Zend/tests/errmsg_017.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__unset() must take exactly 1 argument in %s on line %d
diff --git a/Zend/tests/errmsg_018.phpt b/Zend/tests/errmsg_018.phpt
index 9776753c60..cd52bc70df 100644
--- a/Zend/tests/errmsg_018.phpt
+++ b/Zend/tests/errmsg_018.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Static function test::foo() cannot be abstract in %s on line %d
diff --git a/Zend/tests/errmsg_019.phpt b/Zend/tests/errmsg_019.phpt
index 2b45650cf2..1204379587 100644
--- a/Zend/tests/errmsg_019.phpt
+++ b/Zend/tests/errmsg_019.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Destructor test::__destruct() cannot take arguments in %s on line %d
diff --git a/Zend/tests/errmsg_020.phpt b/Zend/tests/errmsg_020.phpt
index 8199d5d06e..636e29d01f 100644
--- a/Zend/tests/errmsg_020.phpt
+++ b/Zend/tests/errmsg_020.phpt
@@ -9,6 +9,6 @@ phpinfo();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: phpinfo() has been disabled for security reasons in %s on line %d
 Done
diff --git a/Zend/tests/errmsg_021.phpt b/Zend/tests/errmsg_021.phpt
index 4e62f85111..7514e68359 100644
--- a/Zend/tests/errmsg_021.phpt
+++ b/Zend/tests/errmsg_021.phpt
@@ -12,6 +12,6 @@ $t = new test;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: test() has been disabled for security reasons in %s on line %d
 Done
diff --git a/Zend/tests/errmsg_022.phpt b/Zend/tests/errmsg_022.phpt
index ea7b082f9e..aba8d750c6 100644
--- a/Zend/tests/errmsg_022.phpt
+++ b/Zend/tests/errmsg_022.phpt
@@ -10,5 +10,5 @@ foo(1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Only variables can be passed by reference in %s on line %d
diff --git a/Zend/tests/errmsg_023.phpt b/Zend/tests/errmsg_023.phpt
index 9fd7804ea4..4752a4b4fd 100644
--- a/Zend/tests/errmsg_023.phpt
+++ b/Zend/tests/errmsg_023.phpt
@@ -13,5 +13,5 @@ class test extends test1 {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Access level to test::$var must be protected (as in class test1) or weaker in %s on line %d
diff --git a/Zend/tests/errmsg_024.phpt b/Zend/tests/errmsg_024.phpt
index 011e6fdea9..0755d2b75c 100644
--- a/Zend/tests/errmsg_024.phpt
+++ b/Zend/tests/errmsg_024.phpt
@@ -13,5 +13,5 @@ class test extends test1 {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 Done
diff --git a/Zend/tests/errmsg_025.phpt b/Zend/tests/errmsg_025.phpt
index d853f73428..5b4578ac92 100644
--- a/Zend/tests/errmsg_025.phpt
+++ b/Zend/tests/errmsg_025.phpt
@@ -16,5 +16,5 @@ class test implements test1, test2 {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot inherit previously-inherited constant FOO from interface test2 in %s on line %d
diff --git a/Zend/tests/errmsg_026.phpt b/Zend/tests/errmsg_026.phpt
index 1954122900..79336b217d 100644
--- a/Zend/tests/errmsg_026.phpt
+++ b/Zend/tests/errmsg_026.phpt
@@ -8,5 +8,5 @@ class stdclass {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot redeclare class stdclass in %s on line %d
diff --git a/Zend/tests/errmsg_027.phpt b/Zend/tests/errmsg_027.phpt
index f4fec6155c..b2cd4e1655 100644
--- a/Zend/tests/errmsg_027.phpt
+++ b/Zend/tests/errmsg_027.phpt
@@ -12,5 +12,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Class declarations may not be nested in %s on line %d
diff --git a/Zend/tests/errmsg_028.phpt b/Zend/tests/errmsg_028.phpt
index 3331cb35bf..12fd36384f 100644
--- a/Zend/tests/errmsg_028.phpt
+++ b/Zend/tests/errmsg_028.phpt
@@ -8,5 +8,5 @@ class self {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'self' as class name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_029.phpt b/Zend/tests/errmsg_029.phpt
index 73b85ce6a5..e40cb2dc68 100644
--- a/Zend/tests/errmsg_029.phpt
+++ b/Zend/tests/errmsg_029.phpt
@@ -8,5 +8,5 @@ class parent {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'parent' as class name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_030.phpt b/Zend/tests/errmsg_030.phpt
index ab6ccbd41e..c0d42263c3 100644
--- a/Zend/tests/errmsg_030.phpt
+++ b/Zend/tests/errmsg_030.phpt
@@ -8,5 +8,5 @@ class test extends self {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'self' as class name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_031.phpt b/Zend/tests/errmsg_031.phpt
index 6e35648549..c847a26e64 100644
--- a/Zend/tests/errmsg_031.phpt
+++ b/Zend/tests/errmsg_031.phpt
@@ -8,5 +8,5 @@ class test extends parent {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'parent' as class name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_032.phpt b/Zend/tests/errmsg_032.phpt
index 6e34604cd8..f21e269a89 100644
--- a/Zend/tests/errmsg_032.phpt
+++ b/Zend/tests/errmsg_032.phpt
@@ -11,5 +11,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Constructor test::__construct() cannot be static in %s on line %d
diff --git a/Zend/tests/errmsg_033.phpt b/Zend/tests/errmsg_033.phpt
index 96938900ec..e5f36912b0 100644
--- a/Zend/tests/errmsg_033.phpt
+++ b/Zend/tests/errmsg_033.phpt
@@ -11,5 +11,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Destructor test::__destruct() cannot be static in %s on line %d
diff --git a/Zend/tests/errmsg_034.phpt b/Zend/tests/errmsg_034.phpt
index 1494fe5321..a8bfc80b9a 100644
--- a/Zend/tests/errmsg_034.phpt
+++ b/Zend/tests/errmsg_034.phpt
@@ -11,5 +11,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Clone method test::__clone() cannot be static in %s on line %d
diff --git a/Zend/tests/errmsg_035.phpt b/Zend/tests/errmsg_035.phpt
index 76cbe3d48b..e8fa8da8e8 100644
--- a/Zend/tests/errmsg_035.phpt
+++ b/Zend/tests/errmsg_035.phpt
@@ -8,5 +8,5 @@ class test implements self {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'self' as interface name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_036.phpt b/Zend/tests/errmsg_036.phpt
index d1f4274bd1..4f98f384d7 100644
--- a/Zend/tests/errmsg_036.phpt
+++ b/Zend/tests/errmsg_036.phpt
@@ -8,5 +8,5 @@ class test implements parent {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'parent' as interface name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_037.phpt b/Zend/tests/errmsg_037.phpt
index 6b98bb3339..b67ce0b5d0 100644
--- a/Zend/tests/errmsg_037.phpt
+++ b/Zend/tests/errmsg_037.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Properties cannot be declared abstract in %s on line %d
diff --git a/Zend/tests/errmsg_038.phpt b/Zend/tests/errmsg_038.phpt
index 2927e945fe..6312ef64ce 100644
--- a/Zend/tests/errmsg_038.phpt
+++ b/Zend/tests/errmsg_038.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot declare property test::$var final, the final modifier is allowed only for methods and classes in %s on line %d
diff --git a/Zend/tests/errmsg_039.phpt b/Zend/tests/errmsg_039.phpt
index 0000811879..5371ba56c6 100644
--- a/Zend/tests/errmsg_039.phpt
+++ b/Zend/tests/errmsg_039.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot redeclare test::$var in %s on line %d
diff --git a/Zend/tests/errmsg_040.phpt b/Zend/tests/errmsg_040.phpt
index f3d0afcf0a..f84071c202 100644
--- a/Zend/tests/errmsg_040.phpt
+++ b/Zend/tests/errmsg_040.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Arrays are not allowed in class constants in %s on line %d
diff --git a/Zend/tests/errmsg_041.phpt b/Zend/tests/errmsg_041.phpt
index bfcafd261d..2a60652a42 100644
--- a/Zend/tests/errmsg_041.phpt
+++ b/Zend/tests/errmsg_041.phpt
@@ -7,5 +7,5 @@ var_dump("abc" instanceof stdclass);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: instanceof expects an object instance, constant given in %s on line %d
diff --git a/Zend/tests/errmsg_042.phpt b/Zend/tests/errmsg_042.phpt
index 3b4ea7c267..3ed20415c4 100644
--- a/Zend/tests/errmsg_042.phpt
+++ b/Zend/tests/errmsg_042.phpt
@@ -9,5 +9,5 @@ foreach ($a as &$k=>$v) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Key element cannot be a reference in %s on line %d
diff --git a/Zend/tests/errmsg_043.phpt b/Zend/tests/errmsg_043.phpt
index 3de8bc2062..f876953b97 100644
--- a/Zend/tests/errmsg_043.phpt
+++ b/Zend/tests/errmsg_043.phpt
@@ -8,5 +8,5 @@ foreach (array(1,2,3) as $k=>&$v) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot create references to elements of a temporary array expression in %s on line %d
diff --git a/Zend/tests/error_reporting01.phpt b/Zend/tests/error_reporting01.phpt
index da094ae759..66d8955f18 100644
--- a/Zend/tests/error_reporting01.phpt
+++ b/Zend/tests/error_reporting01.phpt
@@ -21,6 +21,6 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 int(14335)
 Done
diff --git a/Zend/tests/error_reporting02.phpt b/Zend/tests/error_reporting02.phpt
index 252700c098..ea6ec22bcb 100644
--- a/Zend/tests/error_reporting02.phpt
+++ b/Zend/tests/error_reporting02.phpt
@@ -22,6 +22,6 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 int(16383)
 Done
diff --git a/Zend/tests/error_reporting03.phpt b/Zend/tests/error_reporting03.phpt
index 44c0d2f2d5..f8947988e4 100644
--- a/Zend/tests/error_reporting03.phpt
+++ b/Zend/tests/error_reporting03.phpt
@@ -31,7 +31,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: undef2 in %s on line %d
 int(16383)
 Done
diff --git a/Zend/tests/error_reporting05.phpt b/Zend/tests/error_reporting05.phpt
index 2da496361e..e92298d3e5 100644
--- a/Zend/tests/error_reporting05.phpt
+++ b/Zend/tests/error_reporting05.phpt
@@ -26,7 +26,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: undef_value in %s on line %d
 
 Notice: Undefined variable: undef_name in %s on line %d
diff --git a/Zend/tests/error_reporting06.phpt b/Zend/tests/error_reporting06.phpt
index 0b2f5e5789..4c2f0fcb4a 100644
--- a/Zend/tests/error_reporting06.phpt
+++ b/Zend/tests/error_reporting06.phpt
@@ -25,6 +25,6 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(14335)
 Done
diff --git a/Zend/tests/error_reporting07.phpt b/Zend/tests/error_reporting07.phpt
index fb7c2115f6..d116cbfc42 100644
--- a/Zend/tests/error_reporting07.phpt
+++ b/Zend/tests/error_reporting07.phpt
@@ -25,6 +25,6 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(14335)
 Done
diff --git a/Zend/tests/error_reporting08.phpt b/Zend/tests/error_reporting08.phpt
index 9018e7ca1c..17fb44a5eb 100644
--- a/Zend/tests/error_reporting08.phpt
+++ b/Zend/tests/error_reporting08.phpt
@@ -26,7 +26,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: undef3 in %s on line %d
 int(16383)
 Done
diff --git a/Zend/tests/error_reporting09.phpt b/Zend/tests/error_reporting09.phpt
index 76cff2c1da..432eeda7ee 100644
--- a/Zend/tests/error_reporting09.phpt
+++ b/Zend/tests/error_reporting09.phpt
@@ -23,7 +23,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: blah in %s on line %d
 
 Notice: Undefined variable: undef2 in %s on line %d
diff --git a/Zend/tests/error_reporting10.phpt b/Zend/tests/error_reporting10.phpt
index 7afda000d2..0694a79824 100644
--- a/Zend/tests/error_reporting10.phpt
+++ b/Zend/tests/error_reporting10.phpt
@@ -29,7 +29,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(14335)
 int(14327)
 Done
diff --git a/Zend/tests/exception_001.phpt b/Zend/tests/exception_001.phpt
index d4e5534288..3df21435e0 100644
--- a/Zend/tests/exception_001.phpt
+++ b/Zend/tests/exception_001.phpt
@@ -27,16 +27,6 @@ try {
 
 ?>
 --EXPECTF--
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-
-Fatal error: Uncaught exception 'Exception' in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
---UEXPECTF--
 unicode(0) ""
 unicode(0) ""
 unicode(0) ""
diff --git a/Zend/tests/exception_handler_001.phpt b/Zend/tests/exception_handler_001.phpt
index 085abb001b..5d745e2ff0 100644
--- a/Zend/tests/exception_handler_001.phpt
+++ b/Zend/tests/exception_handler_001.phpt
@@ -16,7 +16,5 @@ throw new test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(12) "test thrown!"
---UEXPECTF--
+--EXPECT--
 unicode(12) "test thrown!"
diff --git a/Zend/tests/exception_handler_002.phpt b/Zend/tests/exception_handler_002.phpt
index 6003efec47..6123f39b56 100644
--- a/Zend/tests/exception_handler_002.phpt
+++ b/Zend/tests/exception_handler_002.phpt
@@ -17,11 +17,7 @@ throw new test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(12) "test thrown!"
-
-Fatal error: Exception thrown without a stack frame in Unknown on line 0
---UEXPECTF--
+--EXPECT--
 unicode(12) "test thrown!"
 
 Fatal error: Exception thrown without a stack frame in Unknown on line 0
diff --git a/Zend/tests/exception_handler_003.phpt b/Zend/tests/exception_handler_003.phpt
index b980b9c894..a6cac5a857 100644
--- a/Zend/tests/exception_handler_003.phpt
+++ b/Zend/tests/exception_handler_003.phpt
@@ -20,7 +20,5 @@ throw new Exception();
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(17) "Exception thrown!"
---UEXPECTF--
+--EXPECT--
 unicode(17) "Exception thrown!"
diff --git a/Zend/tests/exception_handler_004.phpt b/Zend/tests/exception_handler_004.phpt
index 2f367817e3..e496c1af63 100644
--- a/Zend/tests/exception_handler_004.phpt
+++ b/Zend/tests/exception_handler_004.phpt
@@ -10,7 +10,7 @@ set_exception_handler("foo", "bar");
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: set_exception_handler() expects the argument (fo) to be a valid callback in %s on line %d
 
 Warning: set_exception_handler() expects the argument (::) to be a valid callback in %s on line %d
diff --git a/Zend/tests/exception_handler_005.phpt b/Zend/tests/exception_handler_005.phpt
index 11ac0ba402..61ac03c8dd 100644
--- a/Zend/tests/exception_handler_005.phpt
+++ b/Zend/tests/exception_handler_005.phpt
@@ -19,7 +19,5 @@ throw new excEption();
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(25) "foo1(): Exception thrown!"
---UEXPECTF--
+--EXPECT--
 unicode(25) "foo1(): Exception thrown!"
diff --git a/Zend/tests/exception_handler_006.phpt b/Zend/tests/exception_handler_006.phpt
index 63b4eff451..b535ac5939 100644
--- a/Zend/tests/exception_handler_006.phpt
+++ b/Zend/tests/exception_handler_006.phpt
@@ -21,7 +21,5 @@ throw new excEption();
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(24) "foo(): Exception thrown!"
---UEXPECTF--
+--EXPECT--
 unicode(24) "foo(): Exception thrown!"
diff --git a/Zend/tests/foreach.phpt b/Zend/tests/foreach.phpt
index 041a7636ed..0835e40aaf 100644
--- a/Zend/tests/foreach.phpt
+++ b/Zend/tests/foreach.phpt
@@ -12,7 +12,7 @@ foreach($foo as $key => &$val) {
 }
 var_dump($foo);
 ?>
---EXPECT--	
+--EXPECT--
 array(4) {
   [0]=>
   int(2)
diff --git a/Zend/tests/foreach_002.phpt b/Zend/tests/foreach_002.phpt
index a451b41dbe..33381f620b 100644
--- a/Zend/tests/foreach_002.phpt
+++ b/Zend/tests/foreach_002.phpt
@@ -11,17 +11,6 @@ foreach (($a = array('a' => array('a' => &$a))) as $a) {
 
 ?>
 --EXPECT--
-array(1) {
-  ["a"]=>
-  &array(1) {
-    ["a"]=>
-    &array(1) {
-      ["a"]=>
-      *RECURSION*
-    }
-  }
-}
---UEXPECT--
 array(1) {
   [u"a"]=>
   &array(1) {
diff --git a/Zend/tests/foreach_undefined.phpt b/Zend/tests/foreach_undefined.phpt
index 101d9839e9..aa4a160e6c 100644
--- a/Zend/tests/foreach_undefined.phpt
+++ b/Zend/tests/foreach_undefined.phpt
@@ -7,7 +7,7 @@ foreach($a as $val);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: a in %s on line %d
 
 Warning: Invalid argument supplied for foreach() in %s on line %d
diff --git a/Zend/tests/gc_005.phpt b/Zend/tests/gc_005.phpt
index 4e0f02d413..74fe288c83 100644
--- a/Zend/tests/gc_005.phpt
+++ b/Zend/tests/gc_005.phpt
@@ -10,16 +10,6 @@ var_dump(gc_collect_cycles());
 echo "ok\n"
 ?>
 --EXPECT--
-object(stdClass)#1 (1) {
-  ["a"]=>
-  object(stdClass)#1 (1) {
-    ["a"]=>
-    *RECURSION*
-  }
-}
-int(1)
-ok
---UEXPECT--
 object(stdClass)#1 (1) {
   [u"a"]=>
   object(stdClass)#1 (1) {
diff --git a/Zend/tests/gc_006.phpt b/Zend/tests/gc_006.phpt
index 50c68e3909..ecd3e38050 100644
--- a/Zend/tests/gc_006.phpt
+++ b/Zend/tests/gc_006.phpt
@@ -11,22 +11,6 @@ var_dump(gc_collect_cycles());
 echo "ok\n"
 ?>
 --EXPECT--
-object(stdClass)#1 (1) {
-  ["a"]=>
-  array(1) {
-    [0]=>
-    &object(stdClass)#1 (1) {
-      ["a"]=>
-      array(1) {
-        [0]=>
-        *RECURSION*
-      }
-    }
-  }
-}
-int(2)
-ok
---UEXPECT--
 object(stdClass)#1 (1) {
   [u"a"]=>
   array(1) {
diff --git a/Zend/tests/gc_008.phpt b/Zend/tests/gc_008.phpt
index efe132aa85..e4035ca76e 100644
--- a/Zend/tests/gc_008.phpt
+++ b/Zend/tests/gc_008.phpt
@@ -12,17 +12,6 @@ var_dump(gc_collect_cycles());
 echo "ok\n"
 ?>
 --EXPECT--
-object(stdClass)#2 (1) {
-  ["a"]=>
-  object(stdClass)#2 (1) {
-    ["a"]=>
-    *RECURSION*
-  }
-}
-int(0)
-int(1)
-ok
---UEXPECT--
 object(stdClass)#2 (1) {
   [u"a"]=>
   object(stdClass)#2 (1) {
diff --git a/Zend/tests/gc_009.phpt b/Zend/tests/gc_009.phpt
index 3b7ed066fc..f39a637798 100644
--- a/Zend/tests/gc_009.phpt
+++ b/Zend/tests/gc_009.phpt
@@ -13,23 +13,6 @@ var_dump(gc_collect_cycles());
 echo "ok\n"
 ?>
 --EXPECT--
-object(stdClass)#1 (1) {
-  ["a"]=>
-  array(1) {
-    [0]=>
-    &object(stdClass)#1 (1) {
-      ["a"]=>
-      array(1) {
-        [0]=>
-        *RECURSION*
-      }
-    }
-  }
-}
-int(0)
-int(2)
-ok
---UEXPECT--
 object(stdClass)#1 (1) {
   [u"a"]=>
   array(1) {
diff --git a/Zend/tests/gc_011.phpt b/Zend/tests/gc_011.phpt
index ab6ee41fce..523b65205c 100644
--- a/Zend/tests/gc_011.phpt
+++ b/Zend/tests/gc_011.phpt
@@ -16,17 +16,6 @@ var_dump(gc_collect_cycles());
 echo "ok\n"
 ?>
 --EXPECT--
-object(Foo)#1 (1) {
-  ["a"]=>
-  object(Foo)#1 (1) {
-    ["a"]=>
-    *RECURSION*
-  }
-}
-__destruct
-int(1)
-ok
---UEXPECT--
 object(Foo)#1 (1) {
   [u"a"]=>
   object(Foo)#1 (1) {
diff --git a/Zend/tests/gc_017.phpt b/Zend/tests/gc_017.phpt
index a0af41294b..865e7305dd 100644
--- a/Zend/tests/gc_017.phpt
+++ b/Zend/tests/gc_017.phpt
@@ -34,12 +34,6 @@ var_dump(gc_collect_cycles());
 echo "ok\n"
 ?>
 --EXPECTF--
-string(1) "%s"
-string(1) "%s"
-string(1) "%s"
-int(10)
-ok
---UEXPECTF--
 unicode(1) "%s"
 unicode(1) "%s"
 unicode(1) "%s"
diff --git a/Zend/tests/get_defined_vars.phpt b/Zend/tests/get_defined_vars.phpt
index 3c4ea68f47..4333356cbe 100644
--- a/Zend/tests/get_defined_vars.phpt
+++ b/Zend/tests/get_defined_vars.phpt
@@ -64,70 +64,7 @@ func1();
 
 echo "\n--- Done ---";
 ?> 
---EXPECTF--
-*** Displaying various variables through the array captured by the get_defined_vars function call ***
-int(1)
-float(22.33)
-string(13) "sample string"
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(5)
-  [5]=>
-  int(8)
-}
-array(5) {
-  ["a"]=>
-  int(97)
-  ["c"]=>
-  int(99)
-  ["A"]=>
-  int(65)
-  ["C"]=>
-  int(67)
-  [1]=>
-  string(7) "string1"
-}
-bool(true)
-object(sample)#1 (2) {
-  ["number"]=>
-  int(233)
-  ["string"]=>
-  string(7) "string2"
-}
-
-*** Checking for output when get_defined_vars called in local function ***
-array(1) {
-  ["string33"]=>
-  int(22)
-}
-
-*** Checking for output when get_defined_vars called in function of a class ***
-array(1) {
-  ["local_var"]=>
-  int(2)
-}
-
-*** Checking for output when get_defined_vars called in nested functions ***
-array(1) {
-  ["func1_var"]=>
-  int(2)
-}
-array(1) {
-  ["func2_var"]=>
-  int(3)
-}
-
---- Done ---
-
---UEXPECTF--
+--EXPECT--
 *** Displaying various variables through the array captured by the get_defined_vars function call ***
 int(1)
 float(22.33)
diff --git a/Zend/tests/get_parent_class_001.phpt b/Zend/tests/get_parent_class_001.phpt
index 5115fe16d8..fad23326bf 100644
--- a/Zend/tests/get_parent_class_001.phpt
+++ b/Zend/tests/get_parent_class_001.phpt
@@ -24,8 +24,5 @@ $a->foo();
 
 ?>
 --EXPECT--
-string(3) "bar"
-bool(false)
---UEXPECT--
 unicode(3) "bar"
 bool(false)
diff --git a/Zend/tests/globals_001.phpt b/Zend/tests/globals_001.phpt
index 0b445c80cd..049e22779d 100644
--- a/Zend/tests/globals_001.phpt
+++ b/Zend/tests/globals_001.phpt
@@ -19,20 +19,7 @@ var_dump($_SERVER);
 
 echo "Done\n";
 ?>
---EXPECTF--	
-bool(true)
-bool(false)
-string(5) "array"
-int(%d)
-string(%d) "%s"
-
-Notice: Undefined index: PHP_SELF in %s on line %d
-NULL
-
-Notice: Undefined variable: _SERVER in %s on line %d
-NULL
-Done
---UEXPECTF--
+--EXPECTF--
 bool(true)
 bool(false)
 unicode(5) "array"
diff --git a/Zend/tests/globals_002.phpt b/Zend/tests/globals_002.phpt
index 8bbc085893..3a2a477196 100644
--- a/Zend/tests/globals_002.phpt
+++ b/Zend/tests/globals_002.phpt
@@ -22,20 +22,7 @@ test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
-bool(true)
-bool(false)
-string(5) "array"
-int(%d)
-string(%d) "%s"
-
-Notice: Undefined index: PHP_SELF in %s on line %d
-NULL
-
-Notice: Undefined variable: _SERVER in %s on line %d
-NULL
-Done
---UEXPECTF--
+--EXPECTF--
 bool(true)
 bool(false)
 unicode(5) "array"
diff --git a/Zend/tests/globals_003.phpt b/Zend/tests/globals_003.phpt
index 99d7696602..48418fcd05 100644
--- a/Zend/tests/globals_003.phpt
+++ b/Zend/tests/globals_003.phpt
@@ -28,20 +28,7 @@ test::bar();
 
 echo "Done\n";
 ?>
---EXPECTF--	
-bool(true)
-bool(false)
-string(5) "array"
-int(%d)
-string(%d) "%s"
-
-Notice: Undefined index: PHP_SELF in %s on line %d
-NULL
-
-Notice: Undefined variable: _SERVER in %s on line %d
-NULL
-Done
---UEXPECTF--
+--EXPECTF--
 bool(true)
 bool(false)
 unicode(5) "array"
diff --git a/Zend/tests/globals_004.phpt b/Zend/tests/globals_004.phpt
index 267fbb20b9..161568e402 100644
--- a/Zend/tests/globals_004.phpt
+++ b/Zend/tests/globals_004.phpt
@@ -13,20 +13,7 @@ test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
-bool(true)
-bool(false)
-string(5) "array"
-int(%d)
-string(%d) "%s"
-
-Notice: Undefined index: PHP_SELF in %s on line %d
-NULL
-
-Notice: Undefined variable: _SERVER in %s on line %d
-NULL
-Done
---UEXPECTF--
+--EXPECTF--
 bool(true)
 bool(false)
 unicode(5) "array"
diff --git a/Zend/tests/halt_compiler1.phpt b/Zend/tests/halt_compiler1.phpt
index 4987b29b2c..77b3696f22 100644
--- a/Zend/tests/halt_compiler1.phpt
+++ b/Zend/tests/halt_compiler1.phpt
@@ -5,4 +5,4 @@ __HALT_COMPILER();
 ?>
 ===DONE===
 --EXPECT--
-testint(73)
\ No newline at end of file
+testint(73)
diff --git a/Zend/tests/halt_compiler2.phpt b/Zend/tests/halt_compiler2.phpt
index 0ced2142cd..da8ac6cae9 100644
--- a/Zend/tests/halt_compiler2.phpt
+++ b/Zend/tests/halt_compiler2.phpt
@@ -20,4 +20,4 @@ unlink(dirname(__FILE__) . '/test2.php');
 --EXPECT--
 testint(73)
 test2int(74)
-==DONE==
\ No newline at end of file
+==DONE==
diff --git a/Zend/tests/halt_compiler3.phpt b/Zend/tests/halt_compiler3.phpt
index 6ee16f79b9..7bd7410c73 100644
--- a/Zend/tests/halt_compiler3.phpt
+++ b/Zend/tests/halt_compiler3.phpt
@@ -7,4 +7,4 @@ define ('__COMPILER_HALT_OFFSET__', 1);
 ==DONE==
 --EXPECTF--
 Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
-==DONE==
\ No newline at end of file
+==DONE==
diff --git a/Zend/tests/halt_compiler4.phpt b/Zend/tests/halt_compiler4.phpt
index 43e532ce7d..53a4fc76f9 100644
--- a/Zend/tests/halt_compiler4.phpt
+++ b/Zend/tests/halt_compiler4.phpt
@@ -7,4 +7,4 @@ __HALT_COMPILER();
 ?>
 ==DONE==
 --EXPECTF--
-Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
\ No newline at end of file
+Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
diff --git a/Zend/tests/heredoc_005.phpt b/Zend/tests/heredoc_005.phpt
index 8ab3a65f1b..1e380e2b4e 100644
--- a/Zend/tests/heredoc_005.phpt
+++ b/Zend/tests/heredoc_005.phpt
@@ -19,4 +19,4 @@ print "{$x}";
 
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected T_ENCAPSED_AND_WHITESPACE, expecting T_STRING or T_VARIABLE or T_NUM_STRING in %sheredoc_005.php on line 6
+Parse error: parse error, expecting `T_STRING' or `T_VARIABLE' or `T_NUM_STRING' in %sheredoc_005.php on line %d
diff --git a/Zend/tests/heredoc_011.phpt b/Zend/tests/heredoc_011.phpt
index 6a1d5a00db..44cee19eea 100644
--- a/Zend/tests/heredoc_011.phpt
+++ b/Zend/tests/heredoc_011.phpt
@@ -17,4 +17,4 @@ print e::E . "\n";
 
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected T_START_HEREDOC in %sheredoc_011.php on line 8
+Parse error: parse error in %sheredoc_011.php on line %d
diff --git a/Zend/tests/heredoc_013.phpt b/Zend/tests/heredoc_013.phpt
index b2a6673469..4d13d58271 100644
--- a/Zend/tests/heredoc_013.phpt
+++ b/Zend/tests/heredoc_013.phpt
@@ -9,4 +9,4 @@ MYLABEL;
 echo $var;
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected T_START_HEREDOC in %sheredoc_013.php on line %d
+Parse error: parse error in %sheredoc_013.php on line 4
diff --git a/Zend/tests/heredoc_014.phpt b/Zend/tests/heredoc_014.phpt
index fa404567d0..7de5107344 100644
--- a/Zend/tests/heredoc_014.phpt
+++ b/Zend/tests/heredoc_014.phpt
@@ -9,4 +9,4 @@ MYLABEL;
 echo $var;
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected T_SL in %sheredoc_014.php on line %d
+Parse error: parse error in %sheredoc_014.php on line 3
diff --git a/Zend/tests/hex_overflow_32bit.phpt b/Zend/tests/hex_overflow_32bit.phpt
index 36e9a7e9d3..eae789f267 100644
--- a/Zend/tests/hex_overflow_32bit.phpt
+++ b/Zend/tests/hex_overflow_32bit.phpt
@@ -21,7 +21,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(4083360297110%d)
 float(4.7223664828%dE+21)
 float(1.3521606402%dE+31)
diff --git a/Zend/tests/increment_001.phpt b/Zend/tests/increment_001.phpt
index fa524664f3..72682fde92 100644
--- a/Zend/tests/increment_001.phpt
+++ b/Zend/tests/increment_001.phpt
@@ -32,33 +32,7 @@ foreach ($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-string(1) "1"
-int(2)
-float(3.5)
-int(1)
-string(6) "strinh"
-int(124)
-float(3.5)
-int(1)
-bool(true)
-bool(false)
-object(stdClass)#%d (0) {
-}
-array(0) {
-}
-float(2147483648)
-float(2147483648)
-Done
---UEXPECTF--	
+--EXPECTF--
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/indexing_001.phpt b/Zend/tests/indexing_001.phpt
index ea73aa29f5..c64f13be1f 100644
--- a/Zend/tests/indexing_001.phpt
+++ b/Zend/tests/indexing_001.phpt
@@ -40,178 +40,6 @@ echo "\nDone";
 ?>
 --EXPECTF--
 *** Indexing - Testing value assignment with key ***
-array(1) {
-  ["foo"]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-int(0)
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-int(1)
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-bool(true)
-array(1) {
-  ["foo"]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  ["foo"]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-Notice: Array to string conversion in %s on line %d
-string(1) "A"
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-float(0.1)
-array(1) {
-  ["foo"]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-*** Indexing - Testing reference assignment with key ***
-array(1) {
-  ["foo"]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-int(0)
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-int(1)
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-bool(true)
-array(1) {
-  ["foo"]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  ["foo"]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-float(0.1)
-array(1) {
-  ["foo"]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-}
-*** Indexing - Testing value assignment no key ***
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-int(0)
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-int(1)
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-bool(true)
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-float(0.1)
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-*** Indexing - Testing reference assignment no key ***
-array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-int(0)
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-int(1)
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-bool(true)
-array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-Warning: Cannot use a scalar value as an array in %s on line %d
-float(0.1)
-array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-Done
---UEXPECTF--
-*** Indexing - Testing value assignment with key ***
 array(1) {
   [u"foo"]=>
   array(1) {
@@ -381,4 +209,4 @@ array(1) {
   }
 }
 
-Done
\ No newline at end of file
+Done
diff --git a/Zend/tests/int_overflow_32bit.phpt b/Zend/tests/int_overflow_32bit.phpt
index d9b56495e9..cfbf059630 100644
--- a/Zend/tests/int_overflow_32bit.phpt
+++ b/Zend/tests/int_overflow_32bit.phpt
@@ -20,7 +20,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(-2147483648)
 int(-2147483647)
 int(-2147483638)
diff --git a/Zend/tests/int_overflow_64bit.phpt b/Zend/tests/int_overflow_64bit.phpt
index 769b17926e..0cb9ea9f81 100644
--- a/Zend/tests/int_overflow_64bit.phpt
+++ b/Zend/tests/int_overflow_64bit.phpt
@@ -22,7 +22,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 int(9223372036854775807)
 int(9223372036854775807)
 int(9223372036854775807)
diff --git a/Zend/tests/int_underflow_32bit.phpt b/Zend/tests/int_underflow_32bit.phpt
index 901e7cfb55..68e3576242 100644
--- a/Zend/tests/int_underflow_32bit.phpt
+++ b/Zend/tests/int_underflow_32bit.phpt
@@ -20,7 +20,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(-2147483648)
 int(-2147483648)
 int(-2147483648)
diff --git a/Zend/tests/int_underflow_64bit.phpt b/Zend/tests/int_underflow_64bit.phpt
index 48a43a3ca3..40a6dff9ec 100644
--- a/Zend/tests/int_underflow_64bit.phpt
+++ b/Zend/tests/int_underflow_64bit.phpt
@@ -20,7 +20,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 int(-9223372036854775808)
 int(-9223372036854775808)
 int(-9223372036854775808)
diff --git a/Zend/tests/lsb_001.phpt b/Zend/tests/lsb_001.phpt
index 20a2fd83bb..f22649dcea 100644
--- a/Zend/tests/lsb_001.phpt
+++ b/Zend/tests/lsb_001.phpt
@@ -48,7 +48,7 @@ echo ChildClass2::testClassConst() . "\n";
 echo ChildClass2::testStaticFunction() . "\n";
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 TestClassStatic
 TestClassConst
 TestClassFunction
diff --git a/Zend/tests/lsb_002.phpt b/Zend/tests/lsb_002.phpt
index 4fca6ddd72..9dbc496cc0 100644
--- a/Zend/tests/lsb_002.phpt
+++ b/Zend/tests/lsb_002.phpt
@@ -53,7 +53,7 @@ echo $childClass2->testClassConst() . "\n";
 echo $childClass2->testStaticFunction() . "\n";
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 TestClassStatic
 TestClassConst
 TestClassFunction
diff --git a/Zend/tests/lsb_003.phpt b/Zend/tests/lsb_003.phpt
index 4e9fe1f7c8..a7a787e568 100644
--- a/Zend/tests/lsb_003.phpt
+++ b/Zend/tests/lsb_003.phpt
@@ -18,7 +18,7 @@ echo get_class($testClass) . "\n";
 echo get_class($childClass) . "\n";
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 TestClass
 ChildClass
 ==DONE==
diff --git a/Zend/tests/lsb_004.phpt b/Zend/tests/lsb_004.phpt
index 6baeba00bd..9583ef2547 100644
--- a/Zend/tests/lsb_004.phpt
+++ b/Zend/tests/lsb_004.phpt
@@ -15,7 +15,7 @@ echo TestClass::getClassName() . "\n";
 echo ChildClass::getClassName() . "\n";
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 TestClass
 ChildClass
 ==DONE==
diff --git a/Zend/tests/lsb_005.phpt b/Zend/tests/lsb_005.phpt
index 00647a5c70..a01ccd7ca9 100644
--- a/Zend/tests/lsb_005.phpt
+++ b/Zend/tests/lsb_005.phpt
@@ -36,7 +36,7 @@ TestA::test();
 
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 TestA
 TestB
 TestC
diff --git a/Zend/tests/lsb_006.phpt b/Zend/tests/lsb_006.phpt
index 39bff7fa92..b10b742463 100644
--- a/Zend/tests/lsb_006.phpt
+++ b/Zend/tests/lsb_006.phpt
@@ -9,4 +9,4 @@ class Foo extends static {
 ?>
 ==DONE==
 --EXPECTF--
-Parse error: syntax error, unexpected T_STATIC, expecting T_STRING or T_PAAMAYIM_NEKUDOTAYIM or T_NAMESPACE in %s on line %d
+Parse error: %s error,%sexpecting %s in %s on line %d
diff --git a/Zend/tests/lsb_007.phpt b/Zend/tests/lsb_007.phpt
index 68c2fc2757..593001f0bf 100644
--- a/Zend/tests/lsb_007.phpt
+++ b/Zend/tests/lsb_007.phpt
@@ -9,4 +9,4 @@ class Foo implements static {
 ?>
 ==DONE==
 --EXPECTF--
-Parse error: syntax error, unexpected T_STATIC, expecting T_STRING or T_PAAMAYIM_NEKUDOTAYIM or T_NAMESPACE in %s on line %d
+Parse error: parse error, expecting `T_STRING' or `T_PAAMAYIM_NEKUDOTAYIM' or `T_NAMESPACE' in %slsb_007.php on line %d
\ No newline at end of file
diff --git a/Zend/tests/lsb_008.phpt b/Zend/tests/lsb_008.phpt
index 88507b3266..27c94c7f78 100644
--- a/Zend/tests/lsb_008.phpt
+++ b/Zend/tests/lsb_008.phpt
@@ -5,4 +5,4 @@ ZE2 Late Static Binding class name "static"
 class static {
 }
 --EXPECTF--
-Parse error: syntax error, unexpected T_STATIC, expecting T_STRING in %slsb_008.php on line 2
+Parse error: parse error, expecting `T_STRING' in %slsb_008.php on line %d
diff --git a/Zend/tests/lsb_009.phpt b/Zend/tests/lsb_009.phpt
index 7bf308676c..6c16f45915 100644
--- a/Zend/tests/lsb_009.phpt
+++ b/Zend/tests/lsb_009.phpt
@@ -5,4 +5,4 @@ ZE2 Late Static Binding interface name "static"
 interface static {
 }
 --EXPECTF--
-Parse error: syntax error, unexpected T_STATIC, expecting T_STRING in %slsb_009.php on line 2
+Parse error: parse error, expecting `T_STRING' in %slsb_009.php on line %d
diff --git a/Zend/tests/lsb_010.phpt b/Zend/tests/lsb_010.phpt
index 2ac0306120..c6ef2d8614 100644
--- a/Zend/tests/lsb_010.phpt
+++ b/Zend/tests/lsb_010.phpt
@@ -29,7 +29,7 @@ unset($foo);
 unset($fooChild);
 
 ?>
---EXPECTF--
+--EXPECT--
 Foo::__construct
 FooChild::__construct
 Foo::__destruct
diff --git a/Zend/tests/lsb_015.phpt b/Zend/tests/lsb_015.phpt
index 8077a4fb26..719ad83387 100644
--- a/Zend/tests/lsb_015.phpt
+++ b/Zend/tests/lsb_015.phpt
@@ -68,7 +68,7 @@ echo "via B:\n";
 B::myCatch();
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 via A:
 A
 A
diff --git a/Zend/tests/lsb_016.phpt b/Zend/tests/lsb_016.phpt
index f19c6aada8..4c5fa3248e 100644
--- a/Zend/tests/lsb_016.phpt
+++ b/Zend/tests/lsb_016.phpt
@@ -34,7 +34,7 @@ $o->a = "b";
 echo $o->a;
 ?>
 ==DONE==
---EXPECTF--
+--EXPECT--
 TestChild
 TestChild
 TestChild
diff --git a/Zend/tests/lsb_018.phpt b/Zend/tests/lsb_018.phpt
index 1fa5604700..51b47c23f2 100755
--- a/Zend/tests/lsb_018.phpt
+++ b/Zend/tests/lsb_018.phpt
@@ -56,44 +56,6 @@ $z->identify();
 ?>
 ===DONE===
 --EXPECTF--
-object(Foo)#%d (1) {
-  ["instanceId":"Singleton":private]=>
-  int(0)
-}
-object(Bar)#%d (1) {
-  ["instanceId":"Singleton":private]=>
-  int(1)
-}
-object(Baz)#%d (1) {
-  ["instanceId":"Singleton":private]=>
-  int(2)
-}
-object(Foo)#%d (1) {
-  ["instanceId":"Singleton":private]=>
-  int(0)
-}
-object(Bar)#%d (1) {
-  ["instanceId":"Singleton":private]=>
-  int(1)
-}
-object(Baz)#%d (1) {
-  ["instanceId":"Singleton":private]=>
-  int(2)
-}
-object(Foo)#%d (1) {
-  ["instanceId":"Singleton":private]=>
-  int(0)
-}
-object(Bar)#%d (1) {
-  ["instanceId":"Singleton":private]=>
-  int(1)
-}
-object(Baz)#%d (1) {
-  ["instanceId":"Singleton":private]=>
-  int(2)
-}
-===DONE===
---UEXPECTF--
 object(Foo)#%d (1) {
   [u"instanceId":u"Singleton":private]=>
   int(0)
diff --git a/Zend/tests/lsb_019.phpt b/Zend/tests/lsb_019.phpt
index f0d2bc28c8..0c1144e983 100644
--- a/Zend/tests/lsb_019.phpt
+++ b/Zend/tests/lsb_019.phpt
@@ -39,10 +39,10 @@ echo ChildClass1::testStaticFunction() . "\n";
 echo ChildClass2::testStaticVar() . "\n";
 echo ChildClass2::testStaticFunction() . "\n";
 ?>
---EXPECTF--
+--EXPECT--
 TestClassStatic
 TestClassFunction
 ChildClassStatic
 ChildClassFunction
 TestClassStatic
-TestClassFunction
\ No newline at end of file
+TestClassFunction
diff --git a/Zend/tests/lsb_020.phpt b/Zend/tests/lsb_020.phpt
index f328b01774..1e9caed87f 100644
--- a/Zend/tests/lsb_020.phpt
+++ b/Zend/tests/lsb_020.phpt
@@ -39,10 +39,10 @@ echo ChildClass1::testStaticFunction() . "\n";
 echo ChildClass2::testStaticVar() . "\n";
 echo ChildClass2::testStaticFunction() . "\n";
 ?>
---EXPECTF--
+--EXPECT--
 TestClassStatic
 TestClassFunction
 ChildClassStatic
 ChildClassFunction
 TestClassStatic
-TestClassFunction
\ No newline at end of file
+TestClassFunction
diff --git a/Zend/tests/magic_by_ref_001.phpt b/Zend/tests/magic_by_ref_001.phpt
index e9bcf8fa28..09d744418f 100644
--- a/Zend/tests/magic_by_ref_001.phpt
+++ b/Zend/tests/magic_by_ref_001.phpt
@@ -13,5 +13,5 @@ $t->$name = 1;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__set() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_002.phpt b/Zend/tests/magic_by_ref_002.phpt
index cb62f67f56..4129446857 100644
--- a/Zend/tests/magic_by_ref_002.phpt
+++ b/Zend/tests/magic_by_ref_002.phpt
@@ -12,5 +12,5 @@ $t->prop = 1;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__set() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_003.phpt b/Zend/tests/magic_by_ref_003.phpt
index 022cbd563c..c328b422ab 100644
--- a/Zend/tests/magic_by_ref_003.phpt
+++ b/Zend/tests/magic_by_ref_003.phpt
@@ -13,5 +13,5 @@ var_dump($t->$name);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__get() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_004.phpt b/Zend/tests/magic_by_ref_004.phpt
index aa04d1aee6..a3a941d742 100644
--- a/Zend/tests/magic_by_ref_004.phpt
+++ b/Zend/tests/magic_by_ref_004.phpt
@@ -14,5 +14,5 @@ var_dump($t->$name);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__unset() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_005.phpt b/Zend/tests/magic_by_ref_005.phpt
index 513c0618df..5c451cac13 100644
--- a/Zend/tests/magic_by_ref_005.phpt
+++ b/Zend/tests/magic_by_ref_005.phpt
@@ -14,5 +14,5 @@ var_dump(isset($t->$name));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__isset() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_006.phpt b/Zend/tests/magic_by_ref_006.phpt
index 14d7d708b8..0d22c0ef4d 100644
--- a/Zend/tests/magic_by_ref_006.phpt
+++ b/Zend/tests/magic_by_ref_006.phpt
@@ -14,5 +14,5 @@ $t->$func();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__call() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_007.phpt b/Zend/tests/magic_by_ref_007.phpt
index c962d45813..d38227b985 100644
--- a/Zend/tests/magic_by_ref_007.phpt
+++ b/Zend/tests/magic_by_ref_007.phpt
@@ -15,5 +15,5 @@ $t->$func($arg);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__call() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_008.phpt b/Zend/tests/magic_by_ref_008.phpt
index ba8290cba4..1de2d6b461 100644
--- a/Zend/tests/magic_by_ref_008.phpt
+++ b/Zend/tests/magic_by_ref_008.phpt
@@ -14,5 +14,5 @@ $t->$func();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__callstatic() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_009.phpt b/Zend/tests/magic_by_ref_009.phpt
index 3cae5e228c..93bd17dae5 100644
--- a/Zend/tests/magic_by_ref_009.phpt
+++ b/Zend/tests/magic_by_ref_009.phpt
@@ -15,5 +15,5 @@ $t->$func($arg);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__callstatic() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_010.phpt b/Zend/tests/magic_by_ref_010.phpt
index 3544f4d2a6..89b5357bd0 100644
--- a/Zend/tests/magic_by_ref_010.phpt
+++ b/Zend/tests/magic_by_ref_010.phpt
@@ -21,7 +21,7 @@ var_dump($v);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
 str
 5
diff --git a/Zend/tests/mod_001.phpt b/Zend/tests/mod_001.phpt
index 88596f3d5f..f727bf8d29 100644
--- a/Zend/tests/mod_001.phpt
+++ b/Zend/tests/mod_001.phpt
@@ -11,7 +11,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Division by zero in %s on line %d
 bool(false)
 Done
diff --git a/Zend/tests/mul_001.phpt b/Zend/tests/mul_001.phpt
index 4c5a75e7d1..ae46b1096e 100644
--- a/Zend/tests/mul_001.phpt
+++ b/Zend/tests/mul_001.phpt
@@ -11,5 +11,5 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Unsupported operand types in %s on line %d
diff --git a/Zend/tests/multibyte/multibyte_encoding_003.phpt b/Zend/tests/multibyte/multibyte_encoding_003.phpt
index 19b29f209b..8fae7d2e28 100755
Binary files a/Zend/tests/multibyte/multibyte_encoding_003.phpt and b/Zend/tests/multibyte/multibyte_encoding_003.phpt differ
diff --git a/Zend/tests/not_001.phpt b/Zend/tests/not_001.phpt
index 0a6f0123b9..b00742bdff 100644
--- a/Zend/tests/not_001.phpt
+++ b/Zend/tests/not_001.phpt
@@ -16,11 +16,7 @@ var_dump(bin2hex($s1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-int(-24)
-string(8) "8c90929a"
-Done
---UEXPECTF--	
+--EXPECT--
 int(-24)
 unicode(8) "8c90929a"
 Done
diff --git a/Zend/tests/not_002.phpt b/Zend/tests/not_002.phpt
index df27772a73..f8f662ae61 100644
--- a/Zend/tests/not_002.phpt
+++ b/Zend/tests/not_002.phpt
@@ -11,5 +11,5 @@ var_dump($a);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Unsupported operand types in %s on line %d
diff --git a/Zend/tests/nowdoc_009.phpt b/Zend/tests/nowdoc_009.phpt
index ec8b78f010..fdc6e4e21d 100644
--- a/Zend/tests/nowdoc_009.phpt
+++ b/Zend/tests/nowdoc_009.phpt
@@ -37,4 +37,3 @@ ENDOFNOWDOC    ;
 ENDOFNOWDOC    
     ENDOFNOWDOC
 $ENDOFNOWDOC;
-
diff --git a/Zend/tests/nowdoc_011.phpt b/Zend/tests/nowdoc_011.phpt
index 84bcdb6916..3d35989a9a 100644
--- a/Zend/tests/nowdoc_011.phpt
+++ b/Zend/tests/nowdoc_011.phpt
@@ -16,5 +16,5 @@ THISMUSTNOTERROR;
 print e::E . "\n";
 
 ?>
---EXPECTF--
+--EXPECT--
 If you DON'T see this, something's wrong.
diff --git a/Zend/tests/nowdoc_015.phpt b/Zend/tests/nowdoc_015.phpt
index cafa07668d..d7819cb799 100644
--- a/Zend/tests/nowdoc_015.phpt
+++ b/Zend/tests/nowdoc_015.phpt
@@ -49,31 +49,6 @@ echo "ok\n";
 ?>
 --EXPECT--
 6
-string(0) ""
-10
-string(0) ""
-14
-string(4) "test"
-19
-string(4) "test"
-24
-string(20) "test1
-test2
-
-test3
-
-"
-34
-string(20) "test1
-test2
-
-test3
-
-"
-44
-ok
---UEXPECT--
-6
 unicode(0) ""
 10
 unicode(0) ""
diff --git a/Zend/tests/ns_023.phpt b/Zend/tests/ns_023.phpt
index 4be9dc700a..b2e67eda1f 100755
--- a/Zend/tests/ns_023.phpt
+++ b/Zend/tests/ns_023.phpt
@@ -6,6 +6,4 @@ namespace test::foo;
 
 var_dump(__NAMESPACE__);
 --EXPECT--
-string(9) "test::foo"
---UEXPECT--
 unicode(9) "test::foo"
diff --git a/Zend/tests/ns_024.phpt b/Zend/tests/ns_024.phpt
index 6e4f8bb22c..249ce877ab 100755
--- a/Zend/tests/ns_024.phpt
+++ b/Zend/tests/ns_024.phpt
@@ -4,6 +4,4 @@
 <?php
 var_dump(__NAMESPACE__);
 --EXPECT--
-string(0) ""
---UEXPECT--
 unicode(0) ""
diff --git a/Zend/tests/ns_033.phpt b/Zend/tests/ns_033.phpt
index dc431d82b9..8d616c1db2 100755
--- a/Zend/tests/ns_033.phpt
+++ b/Zend/tests/ns_033.phpt
@@ -5,4 +5,3 @@
 use A;
 --EXPECTF--
 Warning: The use statement with non-compound name 'A' has no effect in %sns_033.php on line 2
-
diff --git a/Zend/tests/ns_038.phpt b/Zend/tests/ns_038.phpt
index fcaa3c4454..c0ce428f72 100755
--- a/Zend/tests/ns_038.phpt
+++ b/Zend/tests/ns_038.phpt
@@ -12,4 +12,3 @@ Exception::bar();
 ok
 
 Fatal error: Call to undefined method Exception::bar() in %sns_038.php on line 7
-
diff --git a/Zend/tests/ns_053.phpt b/Zend/tests/ns_053.phpt
index 8df545face..b127da581e 100644
--- a/Zend/tests/ns_053.phpt
+++ b/Zend/tests/ns_053.phpt
@@ -10,4 +10,3 @@ echo test::ns1::NAME."\n";
 --EXPECT--
 ns_053.php
 ns_053.php
-
diff --git a/Zend/tests/ns_057.phpt b/Zend/tests/ns_057.phpt
index cfa02f923f..bd17d6c318 100755
--- a/Zend/tests/ns_057.phpt
+++ b/Zend/tests/ns_057.phpt
@@ -43,7 +43,7 @@ echo namespace::f1();
 echo namespace::f2();
 echo namespace::f3(new namespace::foo());
 ?>
---EXPECTF--
+--EXPECT--
 const ok
 func ok
 const ok
diff --git a/Zend/tests/ns_059.phpt b/Zend/tests/ns_059.phpt
index ea66037b43..ae96128f0b 100755
--- a/Zend/tests/ns_059.phpt
+++ b/Zend/tests/ns_059.phpt
@@ -5,4 +5,3 @@
 const C = array();
 --EXPECTF--
 Fatal error: Arrays are not allowed as constants in %sns_059.php on line 2
-
diff --git a/Zend/tests/ns_064.phpt b/Zend/tests/ns_064.phpt
index d1e7d364d3..bc6d65ba68 100644
--- a/Zend/tests/ns_064.phpt
+++ b/Zend/tests/ns_064.phpt
@@ -30,15 +30,6 @@ $x->d->e[0]->f = 2;
 
 ?>
 --EXPECT--
-string(1) "a"
-int(1)
-string(1) "b"
-string(1) "c"
-int(1)
-string(1) "d"
-string(1) "f"
-int(2)
---UEXPECT--
 unicode(1) "a"
 int(1)
 unicode(1) "b"
diff --git a/Zend/tests/null_argument_001.phpt b/Zend/tests/null_argument_001.phpt
index 9a5c707151..2c6682a9af 100644
--- a/Zend/tests/null_argument_001.phpt
+++ b/Zend/tests/null_argument_001.phpt
@@ -16,23 +16,7 @@ var_dump(urldecode($fp));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(0) ""
-string(0) ""
-string(0) ""
-
-Warning: urldecode() expects parameter 1 to be string, array given in %s on line %d
-NULL
-string(1) "1"
-string(0) ""
-
-Warning: urldecode() expects parameter 1 to be string, object given in %s on line %d
-NULL
-
-Warning: urldecode() expects parameter 1 to be string, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
+--EXPECTF--
 string(0) ""
 string(0) ""
 
diff --git a/Zend/tests/objects_001.phpt b/Zend/tests/objects_001.phpt
index 5cdc3dded0..eba8098091 100644
--- a/Zend/tests/objects_001.phpt
+++ b/Zend/tests/objects_001.phpt
@@ -27,7 +27,7 @@ var_dump($b == 1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(false)
 bool(true)
 bool(true)
diff --git a/Zend/tests/objects_002.phpt b/Zend/tests/objects_002.phpt
index ac79e8de97..b130097d6a 100644
--- a/Zend/tests/objects_002.phpt
+++ b/Zend/tests/objects_002.phpt
@@ -19,5 +19,5 @@ class test3 extends test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
diff --git a/Zend/tests/objects_003.phpt b/Zend/tests/objects_003.phpt
index 9041e30110..ec1e7d701c 100644
--- a/Zend/tests/objects_003.phpt
+++ b/Zend/tests/objects_003.phpt
@@ -19,5 +19,5 @@ class test3 extends test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
diff --git a/Zend/tests/objects_004.phpt b/Zend/tests/objects_004.phpt
index 14620c15a4..182ca8ec29 100644
--- a/Zend/tests/objects_004.phpt
+++ b/Zend/tests/objects_004.phpt
@@ -19,5 +19,5 @@ class test3 extends test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
diff --git a/Zend/tests/objects_005.phpt b/Zend/tests/objects_005.phpt
index d4ab8697c4..9f8c2b9f99 100644
--- a/Zend/tests/objects_005.phpt
+++ b/Zend/tests/objects_005.phpt
@@ -19,5 +19,5 @@ class test3 extends test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
diff --git a/Zend/tests/objects_006.phpt b/Zend/tests/objects_006.phpt
index 67f43c33bb..adb0e8826d 100644
--- a/Zend/tests/objects_006.phpt
+++ b/Zend/tests/objects_006.phpt
@@ -19,5 +19,5 @@ class test3 extends test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
diff --git a/Zend/tests/objects_007.phpt b/Zend/tests/objects_007.phpt
index 21e07c0c9e..5b6b68bd22 100644
--- a/Zend/tests/objects_007.phpt
+++ b/Zend/tests/objects_007.phpt
@@ -19,5 +19,5 @@ class test3 extends test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
diff --git a/Zend/tests/objects_008.phpt b/Zend/tests/objects_008.phpt
index 49ad42ded2..e0bba4c756 100644
--- a/Zend/tests/objects_008.phpt
+++ b/Zend/tests/objects_008.phpt
@@ -19,5 +19,5 @@ class test3 extends test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
diff --git a/Zend/tests/objects_009.phpt b/Zend/tests/objects_009.phpt
index 67611f14e2..d3de6b5630 100644
--- a/Zend/tests/objects_009.phpt
+++ b/Zend/tests/objects_009.phpt
@@ -19,5 +19,5 @@ class test3 extends test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
diff --git a/Zend/tests/objects_010.phpt b/Zend/tests/objects_010.phpt
index 5d004629d9..4771799964 100644
--- a/Zend/tests/objects_010.phpt
+++ b/Zend/tests/objects_010.phpt
@@ -14,6 +14,6 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Strict Standards: Redefining already defined constructor for class test in %s on line %d
 Done
diff --git a/Zend/tests/objects_011.phpt b/Zend/tests/objects_011.phpt
index eb1fc0c1f0..0836c0eceb 100644
--- a/Zend/tests/objects_011.phpt
+++ b/Zend/tests/objects_011.phpt
@@ -14,6 +14,6 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Strict Standards: Redefining already defined constructor for class test in %s on line %d
 Done
diff --git a/Zend/tests/objects_012.phpt b/Zend/tests/objects_012.phpt
index 95cce3eca9..dd5f149c42 100644
--- a/Zend/tests/objects_012.phpt
+++ b/Zend/tests/objects_012.phpt
@@ -11,5 +11,5 @@ interface bar extends foo {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: bar cannot implement foo - it is not an interface in %s on line %d
diff --git a/Zend/tests/objects_013.phpt b/Zend/tests/objects_013.phpt
index 3f7bea81af..7550a12c63 100644
--- a/Zend/tests/objects_013.phpt
+++ b/Zend/tests/objects_013.phpt
@@ -11,5 +11,5 @@ class bar implements foo, foo {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Class bar cannot implement previously implemented interface foo in %s on line %d
diff --git a/Zend/tests/objects_014.phpt b/Zend/tests/objects_014.phpt
index c422b392ea..b4cf033143 100644
--- a/Zend/tests/objects_014.phpt
+++ b/Zend/tests/objects_014.phpt
@@ -11,5 +11,5 @@ interface bar extends foo, foo {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Class bar cannot implement previously implemented interface foo in %s on line %d
diff --git a/Zend/tests/objects_015.phpt b/Zend/tests/objects_015.phpt
index a923ee0c46..714d27ad5b 100755
--- a/Zend/tests/objects_015.phpt
+++ b/Zend/tests/objects_015.phpt
@@ -15,7 +15,7 @@ var_dump(is_null($o));
 
 ?>
 ===DONE===
---EXPECT--	
+--EXPECT--
 bool(false)
 bool(true)
 bool(false)
diff --git a/Zend/tests/objects_019.phpt b/Zend/tests/objects_019.phpt
index 27d101d773..07e747dcf0 100644
--- a/Zend/tests/objects_019.phpt
+++ b/Zend/tests/objects_019.phpt
@@ -17,20 +17,6 @@ var_dump($foo, $x);
 
 ?>
 --EXPECT--
-array(2) {
-  [0]=>
-  object(stdClass)#1 (1) {
-    ["a"]=>
-    &int(2)
-  }
-  [1]=>
-  object(stdClass)#2 (1) {
-    ["a"]=>
-    &int(2)
-  }
-}
-string(3) "foo"
---UEXPECT--
 array(2) {
   [0]=>
   object(stdClass)#1 (1) {
diff --git a/Zend/tests/objects_020.phpt b/Zend/tests/objects_020.phpt
index ce0bba82a7..9b40db0de2 100644
--- a/Zend/tests/objects_020.phpt
+++ b/Zend/tests/objects_020.phpt
@@ -15,25 +15,6 @@ var_dump($$test);
 ?>
 --EXPECTF--
 Strict Standards: Creating default object from empty value in %s on line %d
-object(stdClass)#1 (2) {
-  ["a"]=>
-  &object(stdClass)#1 (2) {
-    ["a"]=>
-    *RECURSION*
-    ["b"]=>
-    array(1) {
-      [0]=>
-      int(2)
-    }
-  }
-  ["b"]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
---UEXPECTF--
-Strict Standards: Creating default object from empty value in %s on line %d
 object(stdClass)#1 (2) {
   [u"a"]=>
   &object(stdClass)#1 (2) {
diff --git a/Zend/tests/objects_024.phpt b/Zend/tests/objects_024.phpt
index af3f879db9..c67bd8137b 100644
--- a/Zend/tests/objects_024.phpt
+++ b/Zend/tests/objects_024.phpt
@@ -50,4 +50,3 @@ object(foo)#%d (0) {
 int(3)
 object(foo)#%d (0) {
 }
-
diff --git a/Zend/tests/objects_027.phpt b/Zend/tests/objects_027.phpt
index b8051cbb03..0756852e57 100644
--- a/Zend/tests/objects_027.phpt
+++ b/Zend/tests/objects_027.phpt
@@ -42,5 +42,3 @@ Strict Standards: Non-static method foo::test() should not be called statically
 Strict Standards: Non-static method bar::show() should not be called statically in %s on line %d
 object(bar)#%d (0) {
 }
-
-
diff --git a/Zend/tests/oct_overflow_32bit.phpt b/Zend/tests/oct_overflow_32bit.phpt
index d27c1f547c..fb8cdd4778 100644
--- a/Zend/tests/oct_overflow_32bit.phpt
+++ b/Zend/tests/oct_overflow_32bit.phpt
@@ -22,7 +22,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(4308640384%d)
 float(3545655%d)
 float(262143)
diff --git a/Zend/tests/offset_array.phpt b/Zend/tests/offset_array.phpt
index eba6611e6c..cc3e4a5895 100644
--- a/Zend/tests/offset_array.phpt
+++ b/Zend/tests/offset_array.phpt
@@ -24,7 +24,7 @@ var_dump($arr[$arr1]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(2)
 int(1)
 
diff --git a/Zend/tests/offset_assign.phpt b/Zend/tests/offset_assign.phpt
index eebf63c4f3..2bce69a52f 100644
--- a/Zend/tests/offset_assign.phpt
+++ b/Zend/tests/offset_assign.phpt
@@ -7,5 +7,5 @@ $x['x']['y'] += 1;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use string offset as an array in %s on line %d
diff --git a/Zend/tests/offset_bool.phpt b/Zend/tests/offset_bool.phpt
index 9bf8a89da7..a08dd5450c 100644
--- a/Zend/tests/offset_bool.phpt
+++ b/Zend/tests/offset_bool.phpt
@@ -24,7 +24,7 @@ var_dump($bool[$arr]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 NULL
 NULL
 NULL
diff --git a/Zend/tests/offset_long.phpt b/Zend/tests/offset_long.phpt
index c65a5ba3f8..98b9b0f08b 100644
--- a/Zend/tests/offset_long.phpt
+++ b/Zend/tests/offset_long.phpt
@@ -24,7 +24,7 @@ var_dump($long[$arr]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 NULL
 NULL
 NULL
diff --git a/Zend/tests/offset_null.phpt b/Zend/tests/offset_null.phpt
index 9364f0a2e5..c6ad6561db 100644
--- a/Zend/tests/offset_null.phpt
+++ b/Zend/tests/offset_null.phpt
@@ -24,7 +24,7 @@ var_dump($null[$arr]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 NULL
 NULL
 NULL
diff --git a/Zend/tests/offset_object.phpt b/Zend/tests/offset_object.phpt
index b570fd2a2f..a47e130e5c 100644
--- a/Zend/tests/offset_object.phpt
+++ b/Zend/tests/offset_object.phpt
@@ -7,5 +7,5 @@ $object = new stdClass;
 var_dump($object[1]);
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use object of type stdClass as array in %s on line %d
diff --git a/Zend/tests/offset_string.phpt b/Zend/tests/offset_string.phpt
index 63f92c5fd8..3ced2e9bd5 100644
--- a/Zend/tests/offset_string.phpt
+++ b/Zend/tests/offset_string.phpt
@@ -24,26 +24,7 @@ var_dump($str[$arr]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(1) "i"
-string(1) "S"
-string(1) "S"
-string(1) "S"
-string(1) "i"
-string(1) "S"
-
-Warning: Illegal offset type in %s on line %d
-string(1) "%s"
-
-Warning: Illegal offset type in %s on line %d
-
-Notice: Object of class stdClass could not be converted to int in %s on line %d
-string(1) "%s"
-
-Warning: Illegal offset type in %s on line %d
-string(1) "i"
-Done
---UEXPECTF--
+--EXPECTF--
 unicode(1) "i"
 unicode(1) "S"
 unicode(1) "S"
diff --git a/Zend/tests/or_001.phpt b/Zend/tests/or_001.phpt
index dbe8da111b..57ac4cc135 100644
--- a/Zend/tests/or_001.phpt
+++ b/Zend/tests/or_001.phpt
@@ -21,7 +21,7 @@ var_dump($s);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 string(8) "3337>755"
 string(8) "3337>755"
 string(4) "wou"
diff --git a/Zend/tests/selfParent_001.phpt b/Zend/tests/selfParent_001.phpt
index 29b698e2ba..8f7f963de8 100755
--- a/Zend/tests/selfParent_001.phpt
+++ b/Zend/tests/selfParent_001.phpt
@@ -23,8 +23,5 @@ A::test();
 B::test();
 ?>
 --EXPECT--
-string(10) "const in A"
-string(10) "const in A"
---UEXPECT--
 unicode(10) "const in A"
-unicode(10) "const in A"
\ No newline at end of file
+unicode(10) "const in A"
diff --git a/Zend/tests/selfParent_002.phpt b/Zend/tests/selfParent_002.phpt
index 30a4a4f7b8..6b89bda903 100755
--- a/Zend/tests/selfParent_002.phpt
+++ b/Zend/tests/selfParent_002.phpt
@@ -23,8 +23,5 @@ B::test();
 A::test();
 ?>
 --EXPECT--
-string(10) "const in A"
-string(10) "const in A"
---UEXPECT--
 unicode(10) "const in A"
 unicode(10) "const in A"
diff --git a/Zend/tests/settype_array.phpt b/Zend/tests/settype_array.phpt
index 98c3b87978..ac12df8925 100644
Binary files a/Zend/tests/settype_array.phpt and b/Zend/tests/settype_array.phpt differ
diff --git a/Zend/tests/settype_bool.phpt b/Zend/tests/settype_bool.phpt
index cf59200b81..06b003ac86 100644
--- a/Zend/tests/settype_bool.phpt
+++ b/Zend/tests/settype_bool.phpt
@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 bool(true)
 bool(true)
 bool(false)
diff --git a/Zend/tests/settype_double.phpt b/Zend/tests/settype_double.phpt
index ed63f8ae83..71998e798b 100644
--- a/Zend/tests/settype_double.phpt
+++ b/Zend/tests/settype_double.phpt
@@ -38,7 +38,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(0)
 float(8754456)
 float(0)
diff --git a/Zend/tests/settype_int.phpt b/Zend/tests/settype_int.phpt
index 7b96cd594e..f278bf1bcd 100644
--- a/Zend/tests/settype_int.phpt
+++ b/Zend/tests/settype_int.phpt
@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 int(8754456)
 int(0)
diff --git a/Zend/tests/settype_null.phpt b/Zend/tests/settype_null.phpt
index 0abf2f9810..ca1d03a8e4 100644
--- a/Zend/tests/settype_null.phpt
+++ b/Zend/tests/settype_null.phpt
@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 NULL
 NULL
 NULL
diff --git a/Zend/tests/settype_object.phpt b/Zend/tests/settype_object.phpt
index a3a433cf98..aa4ebe4134 100644
Binary files a/Zend/tests/settype_object.phpt and b/Zend/tests/settype_object.phpt differ
diff --git a/Zend/tests/settype_resource.phpt b/Zend/tests/settype_resource.phpt
index 7210613123..5ea67405ef 100644
Binary files a/Zend/tests/settype_resource.phpt and b/Zend/tests/settype_resource.phpt differ
diff --git a/Zend/tests/settype_string.phpt b/Zend/tests/settype_string.phpt
index e8e5ff1e60..4a21d78d2a 100644
Binary files a/Zend/tests/settype_string.phpt and b/Zend/tests/settype_string.phpt differ
diff --git a/Zend/tests/shift_001.phpt b/Zend/tests/shift_001.phpt
index aeb399452d..200d17507c 100644
--- a/Zend/tests/shift_001.phpt
+++ b/Zend/tests/shift_001.phpt
@@ -18,7 +18,7 @@ var_dump($s2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(492)
 int(0)
 int(362760)
diff --git a/Zend/tests/shift_002.phpt b/Zend/tests/shift_002.phpt
index 4d8421a566..ad42a37a63 100644
--- a/Zend/tests/shift_002.phpt
+++ b/Zend/tests/shift_002.phpt
@@ -18,7 +18,7 @@ var_dump($s2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(30)
 int(0)
 int(5668)
diff --git a/Zend/tests/strict_001.phpt b/Zend/tests/strict_001.phpt
index 8070eb9fe7..e125f3cbc7 100644
--- a/Zend/tests/strict_001.phpt
+++ b/Zend/tests/strict_001.phpt
@@ -13,7 +13,7 @@ var_dump($array[$fp]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Strict Standards: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d
 int(%d)
 Done
diff --git a/Zend/tests/strict_002.phpt b/Zend/tests/strict_002.phpt
index cb372dca19..b1f0ef4e6a 100644
--- a/Zend/tests/strict_002.phpt
+++ b/Zend/tests/strict_002.phpt
@@ -18,14 +18,7 @@ var_dump($t);
 
 echo "Done\n";
 ?>
---EXPECTF--	
-Strict Standards: Accessing static property test::$foo as non static in %s on line %d
-object(test)#%d (1) {
-  ["foo"]=>
-  int(5)
-}
-Done
---UEXPECTF--
+--EXPECTF--
 Strict Standards: Accessing static property test::$foo as non static in %s on line %d
 object(test)#%d (1) {
   [u"foo"]=>
diff --git a/Zend/tests/sub_001.phpt b/Zend/tests/sub_001.phpt
index 2a8b3cdffd..3dd26e060f 100644
--- a/Zend/tests/sub_001.phpt
+++ b/Zend/tests/sub_001.phpt
@@ -11,5 +11,5 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Unsupported operand types in %s on line %d
diff --git a/Zend/tests/unicode_001.phpt b/Zend/tests/unicode_001.phpt
index 5a10854afe..a4bd1186e4 100644
--- a/Zend/tests/unicode_001.phpt
+++ b/Zend/tests/unicode_001.phpt
@@ -62,17 +62,6 @@ int(24)
 int(24)
 int(24)
 int(24)
-int(24)
-int(24)
-int(24)
-int(24)
-int(24)
---UEXPECT--
-int(24)
-int(24)
-int(24)
-int(24)
-int(24)
 int(8)
 int(8)
 int(8)
diff --git a/Zend/tests/unicode_002.phpt b/Zend/tests/unicode_002.phpt
index 8c6ac1c9c0..9fd4331d12 100644
--- a/Zend/tests/unicode_002.phpt
+++ b/Zend/tests/unicode_002.phpt
@@ -9,6 +9,4 @@ var_dump(isset($GLOBALS['Å']));
 
 ?>
 --EXPECT--
-bool(false)
---UEXPECT--
 bool(true)
diff --git a/Zend/tests/unset_cv07.phpt b/Zend/tests/unset_cv07.phpt
index fe16abf750..93ec021fbc 100644
--- a/Zend/tests/unset_cv07.phpt
+++ b/Zend/tests/unset_cv07.phpt
@@ -12,7 +12,7 @@ import_request_variables("g","_");
 echo $_x;
 echo "\nok\n";
 ?>
---EXPECTF--
+--EXPECT--
 1
 2
 ok
diff --git a/Zend/tests/unset_cv08.phpt b/Zend/tests/unset_cv08.phpt
index 9b8ab1520f..0798ca48ed 100644
--- a/Zend/tests/unset_cv08.phpt
+++ b/Zend/tests/unset_cv08.phpt
@@ -9,7 +9,7 @@ echo $a;
 echo $b;
 echo "ok\n";
 ?>
---EXPECTF--
+--EXPECT--
 ok
 ok
 ok
diff --git a/Zend/tests/unset_cv11.phpt b/Zend/tests/unset_cv11.phpt
index 95788b6c6e..d9bf29a840 100644
--- a/Zend/tests/unset_cv11.phpt
+++ b/Zend/tests/unset_cv11.phpt
@@ -10,16 +10,6 @@ var_dump($x);
 echo "ok\n";
 ?>
 --EXPECT--
-array(1) {
-  ["default"]=>
-  string(2) "ok"
-}
-array(1) {
-  ["default"]=>
-  string(2) "ok"
-}
-ok
---UEXPECT--
 array(1) {
   [u"default"]=>
   unicode(2) "ok"
diff --git a/Zend/tests/xor_001.phpt b/Zend/tests/xor_001.phpt
index e1a521dff9..1a6d0fb633 100644
--- a/Zend/tests/xor_001.phpt
+++ b/Zend/tests/xor_001.phpt
@@ -11,6 +11,6 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(1)
 Done
diff --git a/Zend/tests/xor_002.phpt b/Zend/tests/xor_002.phpt
index 11e8bc93bd..f0bfd2dcd3 100644
--- a/Zend/tests/xor_002.phpt
+++ b/Zend/tests/xor_002.phpt
@@ -29,15 +29,7 @@ var_dump(bin2hex($s));
 
 echo "Done\n";
 ?>
---EXPECTF--	
-string(6) "030107"
-string(6) "030107"
-string(8) "070a1e11"
-string(8) "070a1e11"
-string(8) "070a1e11"
-string(8) "070a1e11"
-Done
---UEXPECTF--	
+--EXPECT--
 unicode(6) "030107"
 unicode(6) "030107"
 unicode(8) "070a1e11"
diff --git a/Zend/tests/xor_003.phpt b/Zend/tests/xor_003.phpt
index 8aa1c636b7..4ed98f3415 100644
--- a/Zend/tests/xor_003.phpt
+++ b/Zend/tests/xor_003.phpt
@@ -12,7 +12,7 @@ var_dump($f ^ $f);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 int(1)
 int(0)
 int(0)
diff --git a/Zend/tests/zend_strtod.phpt b/Zend/tests/zend_strtod.phpt
index 1b11be0388..f3e9789a0a 100644
--- a/Zend/tests/zend_strtod.phpt
+++ b/Zend/tests/zend_strtod.phpt
@@ -11,7 +11,7 @@ var_dump("123123139932690.21688500" - "11399327900000000.21688500");
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECT--
 float(-100)
 float(808792757210)
 float(-4.5646456464565E+27)