- 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 78d982a7adb7f327719cf07591dd2a7016650ef8..40a1877d938d78166d871a2e9c4612e0acd86c00 100644 (file)
--- 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 73c8d3ec43ec038e429b03788ef8ff71de8e58eb..5c4ff79ef58767dfe36554c6c10a74cae56c31a3 100644 (file)
--- 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 81f70b8d872aceeb6fdcd866b4e5e9f2517e3130..2ab64c4fd630e724e259bbc6b3eb812eba25141d 100644 (file)
--- 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 6beafe70769f657d44e2e7847e258b5d39476d17..179684d076737029266229a494967d17534edda6 100644 (file)
--- 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 2ca7d6c254cdbcd24075742c570d9f7f5093bcee..e48d3d88e5cef8b993626a82217ecc6d64ec48b3 100644 (file)
--- 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 f95a56e7ef885e5e1bf23e233dd4276d6e3c976f..70fc072d93cbf7842f49b54d5a85dc98b7e95918 100644 (file)
--- 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 f26ff83531e17a18e9c9211194ee6b19773134a8..3c81a722b112b0f6d21ed93fa93b1550be0557ee 100644 (file)
--- 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 5b229a0704aa707fea02a4cfa7069e0d81e9b2f2..cd631003ddd065a33ad730c2aafe3ad8f3b46173 100644 (file)
--- 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 b65eab796cdb3121910f3e6c9f64c69c5bf7a491..885115e6d2e5e99e953f90b0996d51f4d44fca8e 100644 (file)
--- 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 5adc7b62acb7200fee877a9a3203168cdf137b78..81d884ac037a5300257f98d3d27b5c1d944c1a6a 100644 (file)
--- 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 58ed8d74d299c17133caa14691c0f46bf04b3e4f..9513d5a948600cccf840aaf1f180cd3090c465a2 100644 (file)
--- 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 18f63f828a2e63b2bbd6fb542e10c30e2f2faa18..128f6eaf4b4cc107b348d69ea9c20dc8379e7bd9 100644 (file)
--- 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 fd52ac16216fb7f53a74ef1d0f1437552e8fe434..883b616bc5a2b68cc66969834685aada6d5c8bdf 100644 (file)
--- 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 20e6b87d9c6c88cb509a3897e93a8110e48fabba..9769ed6ddcbf6f24ddce852724a74cdc7405e3de 100644 (file)
--- 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 a802542813e581233ed00e9f27dd3f98f763f568..a838e19da8de764667969dd0fe0378eafd0fbb3b 100644 (file)
--- 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 6ec507e6b1f3dc84c12efe8d00bba632d5eb19b3..875e05d344a8125507210e90ec1fc73b02ffdb61 100644 (file)
--- 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 780e8d71169eb202395ca6161caa90b4786ada73..7cac6dd315c22053a658e23c98e3e4b70e4de755 100644 (file)
--- 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 d44362143c746b543a60e3fc74d000d39a8aa6b1..569096e9495616e1407ac7fa5c9ead55279437eb 100644 (file)
--- 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 77e04c41d4370bb5e1332132fc6a5e5a0fd9b74f..cb59a71a68a0a3862aa2c3047add4b8f174de88d 100644 (file)
--- 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 fa49a9327969627ea55f45eb72461f1d91da0c06..98865f921ef124e398aae3c3ce0af71897842d2f 100644 (file)
--- 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 6238795fd813fea46b08007f2a287909c73c5031..9190fc0883ef774cd94e613dc11ce0c457f93e42 100644 (file)
--- 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 8912ad159b0184d95e37fc58a48e1a4f26dac260..fc26a80a18b163c8d434c767494ab99d589b40f0 100644 (file)
--- 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 469dd081bb3f32b58013e89b77b8a83ed96bf46c..306dfc539c2227a3dee6b003645be1c076b1e85c 100644 (file)
--- 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 3bdc0dc74062cc03f5dcea832fc3dd06842cdee0..dab506983b4e5059fac795fca6f148f3754aa3aa 100644 (file)
--- 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 989b926be3d6cc643811a7071ba19067878933ab..f89d55bd938532757b859d1914ab58894872e66e 100644 (file)
--- 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 cc5df306f1007fd9f6924d11fb47549bed970218..f0b15e43dc85b5f701538e0837cf636f08f5e7a0 100644 (file)
--- 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 9c5a20a28c69ae7729f14a08b47120f53aa6f865..01afb7393143844d10ff6a6963179ff9ccce4d34 100644 (file)
--- 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 c023d2cb6d4da62fea2abf5be5d3a68287820134..2be203a9179281c34859aad534b6cc12056934da 100644 (file)
--- 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 b32394d7f6bbe1bd93c51e3e81153fc84e5277ac..7780cf4ca69b8437bdebdf58cf4f0c9cf475f56e 100644 (file)
--- 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 293fc1c64c27a2799140a2690da85931f5f0ea71..aefe27c68a24bde2d081daf51ba1291787c2b393 100644 (file)
--- 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 26779e6e688723dd1ec0e610cb68efbe01898e81..4860c52c29d386855351a564851409a5f2f877a2 100644 (file)
--- 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 b2e3475053be1f45385f4be8687db82f791a22be..95e0e7563de8efb291dba4a8e78ec75abd7be1bb 100644 (file)
--- 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 437ac9113ab839f620a6874ef509be0ec2fcac96..e9e601c1538e676a81c12b57d2e4b185c0b6193f 100644 (file)
--- 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 4223af3f19ba49d9fee6e067ed8cfc9526c2eac5..66479391061e34a55e4683466d0e4d38433c39e4 100644 (file)
--- 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 492ff31ba3f8fe6077279a9f1d1d37ac05f3365d..bf4499809c94286d503aa82d70fbd343e61a1eff 100644 (file)
--- 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 7e9bc25d8f31ba1b10c4fb3da9b46a4defaef660..f5c20124cc75a42fe6dad1a8fcbe40c053f0f8d3 100644 (file)
--- 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 d56df2f329cd3fba8faa0037d06f4696b92b5402..18b55499bf8736f46ab7d053e68bd194a8e6879a 100644 (file)
--- 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 b2f1559b7a56feda1b303c8c3faac639e38cd380..c9ea4212c5b51964a15fb3d1b743536ae416c8dd 100644 (file)
--- 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 c793828c21199417d08b134781900d4a638993f6..c4bc2f29b373933c8039bfb39dba962982e666d5 100644 (file)
--- 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 3aa99f1b0191b5db31e4c3973ff42d378dea8e81..0e3008589b8e5ec1dff2f92388daa24558c515f5 100644 (file)
--- 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 d37ebbcbd89133302b898233ada273d791617c64..c6b8c6298c2b262d7d7d7a6743f8028080c96ea1 100644 (file)
--- 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 c90516138571d2401769d0df7f56db5996f58853..7a853790054b795f098f39e742e252338803e8ee 100644 (file)
--- 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 911ee0bb8e6266dc49e57b064996417b0f09d626..b915c7231e1ebe5e4cbf78280601a8bad2a3d004 100644 (file)
--- 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 73a39a76329c270d77ca3723d1e49cf43cebc0b0..d3cb5c5ac3b78f0175533cf3caf7a5b92fd9f90b 100644 (file)
--- 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 eefd80dfab236bee071357e47c07c0c696e68d66..8313d2d026cfd2846c3971eff5e730ed4f953cbd 100644 (file)
--- 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 9c4e805cdd6951c81d5d35f8070cda33c4fca75c..79c473aefc2301c1e05585be0c9129e78d359883 100644 (file)
--- 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 83192f799b6c1d47a96596745ce849202b43cd5b..ed673a27ce795577e20c13cdf355b413fbe43e31 100644 (file)
--- 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 d83b6c299ff41025ac8b21cf5f645d0824d2b207..1e2edd000b7fa1533d25893c5299afb3568cd938 100755 (executable)
--- 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 62ceacda58d3825d4408db58ded1e9a8115f20d1..14083dfb9f574d51ae177ff5e5dd5c833acdf962 100755 (executable)
--- 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 8266a23e34e36ddd07edd1be4ee5a6ebcd91d22e..b304e5790ff659527610793aea40eaa2c3ea830b 100755 (executable)
--- 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 4d513e91aa24b90dd4e3475856a1a2c0892bae38..26f591888196f67f885b0ded04668fb6260ccb74 100755 (executable)
--- 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 25c03e91a03419a0bf8a773202c9f0c236c4f4b9..5051cd26c23b1f93a399c2d1ffcafdb358695983 100755 (executable)
--- 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 99ed5e6cbec7058368f13a0fa2b389d81ba4cdc3..0040144b4ff15490d2b010330215ecc4da9e8855 100755 (executable)
--- 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 3c8cfa6df7bb0b07474922d443a9e73c70c9c3a5..1c13bca3b9d4c07c3c8c42bc0bdb367334b90b12 100755 (executable)
--- 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 a2f5c9ee551163404111a524c1b35e81aabd8fd9..cfe08d3a7dc7d44f7c44ed90c66640ab1d63cc90 100644 (file)
--- 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 c16399abbcb1d1a00f42b27c3bca542ca968bcbf..1987fa9b45d528028051c188bd50f1c8db9bcb4e 100755 (executable)
--- 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 2814157b58a8f0009d078b9bdffea67b320782c7..5316df4ec40eec97bc282024f148e252af1359ac 100755 (executable)
--- 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 06133ba4d61617070ad49551807a67f68bbb3874..544e170bc0cf1c3430d46b32a54600235f4703d7 100755 (executable)
--- 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 1e2eb0b067eb30146fbb99cf8731d17b2c2aa59f..35a92d459c68cb047da1aaa71db1d265c1648730 100755 (executable)
--- 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 6c0cf1ec7a6dc0c23adab0cf5c3c5425794d0d0b..41a8159d52ec16ebc9b43d8ff7460b3dbf2e7889 100644 (file)
--- 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 bd8401e1bed69c9afddb7d3ac0365b2bfcdf8c47..061f2b29304a67dddccd027fabf7785cadaf94ff 100755 (executable)
--- 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 1a17a1f6c1c911efb848d125bd98e3cac97cb62b..fe2d444ab310e11768c3241b6fccdae16e893646 100755 (executable)
--- 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 a94ed5d7afc8a788c85046b13251301c79b74ac8..22d58ea40a2a0274b06a3d33f3e3696320a4b0b1 100755 (executable)
--- 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 dd43bd47d38305cdcc51dabb2b4161cbfaaedf41..cffa2011cd581a857deb60b48328a9d7431145e1 100644 (file)
--- 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 7d70cba071752cea5ecfe77afdea1b7ca7175caa..f633d11445327a27327b5786943a4311103efe38 100755 (executable)
--- 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 b8ae438c229a5b675ed954df9be6ba9f2a7534bd..604d66a9895655365ff673b5c4f07acf074b1b48 100644 (file)
--- 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 edc2caca7ea6e1252f1220304aff833c99b5c51b..f37bbd5d171299682fc63c665be6234214dec97b 100755 (executable)
--- 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 306ed81b64c1ae5f6eed8f80021a05c10736355e..9ec6354f2e42fcff1b808a1eea17db0e92eea291 100644 (file)
--- 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 2dd0cfe9f003bf0a359b6535f8648a550ddd7c78..b2232515e91f6f2b9dcd2d7c7eacc6ffa665ba5f 100755 (executable)
--- 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 dc1afbb1535d164136156bc0ac6f460d0713eec1..48abe0ad11109ccea674e531651ae81a2048a44b 100755 (executable)
--- 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 a4af5addeeb3ad7c15941a3f6970daf5a778e2a8..9891717cc4c30f69b7e5c09cf9fb1a33b5000cc1 100755 (executable)
--- 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 9c87fc6017f55d2a79ca329112a3fa6138f5f94f..5c00ad7ca68656724d8d7661f0772041e63e7d37 100755 (executable)
--- 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 5d6f5ca96ded8b78c77b3ce0c9a6c28dad386866..761bad9377a5cb76de5df2ac56e5c0f52a0f1374 100644 (file)
--- 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 477179e9be3fe0df0c0103e8dd76cb15e8c23108..22245b9b90d23c5cacf9dc8e25a0845d6011e6aa 100755 (executable)
--- 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 bcb4ad8c64c137fb01eb32a8908598b9a76f3ffb..f1c0e477a94e8c65e10f933e6d95305436a49a34 100755 (executable)
--- 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 d8d9f546be84afb41bb0800537f3953d1ae46d3e..c153a365362c8cdd9cd8d5a3be59884d9ddf7b6c 100755 (executable)
--- 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 23c43c4f9f8b1956c6e423b45f337ef9f6db8713..247f9085ee50e33d7eab9b008c5feadea737aa75 100755 (executable)
--- 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 a1b6e4b76a747c3eb3dfd662db068dab5c847b70..a71b52461fca3314d08e42569aa202ec025d4cf8 100644 (file)
--- 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 606142bde7e4d21e74427c4dd553079796a8ded2..6c422ca26811128a2ed5c4ada60eaebe9e3c52b0 100755 (executable)
--- 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 4adf7709ae716e5fd17ad8b385b8c4a599f9ade0..3a6f4f730c848b47563fa54a8d50b6df2cd47bff 100755 (executable)
--- 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 d34b94e9dff2f8207bd292211d76755502d0d1c9..4f835010c08ce0512b376fec40ee24eb2992c8a9 100755 (executable)
--- 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 5fb08fc27ff879406b515ae9a97d867863adb57b..7c88b68b62542ae913c821f0b928b7f63c9dba6e 100755 (executable)
--- 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 eae7f6bc7adef69b03f59a63801badfa301ee634..da4f5da58f189e8c0cc44a0ea177c6171eb370dd 100755 (executable)
--- 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 f8503f8da95605fba146bf4386d5eab583c2d45d..c81b167467be0c6844a40370914e75096f3ce32c 100755 (executable)
--- 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 0a75c4e8ccffc4d31b67d4720a09fc03aabb7103..8f3a7576596ac5cb3810355bf5565a52e963102d 100755 (executable)
--- 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 cd54b3b2325da3d08ef9a1ea0305bd31aa1b3f0d..084f4082a1c89b97665966cf31294582cd3e98fe 100755 (executable)
--- 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 1964958526b76abde03a7fce0093f67dbb720c68..ac2dfb8777db8084c498c38033e811d21b98f4dc 100755 (executable)
--- 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 def4e04d7cf553d78415b6837b56faf8b40f6b00..d7f292d5ff87d7bdb4429378fb603e87ff360dd7 100755 (executable)
--- 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 281d999019f027a4cfe1fd7fab184a39e2ba9c32..6f571876b8e9e06afbbce12a976834afb0a05d48 100644 (file)
--- 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 081e35c72a80dd16a48a831588f698c34f16418d..bed1a7a3bf38565676782c63f1e01554a6b1bff5 100644 (file)
--- 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 919a13c0acfb4d966d0cc959b1f402428ab7c667..e7f74c8ca950be940043e2ef648c5a0004c1a669 100644 (file)
--- 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 0a92a63906e213b09214f1308cd7d7904f1fcf05..e6b64f9169dd2cca8aea5d930c07aef87a1dff3c 100644 (file)
--- 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 0fc4bfecdc19f549938fb488f4a98183840f55de..487a569b6d1f7aaf29146bcaed4630d503ee8b88 100755 (executable)
--- 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 7a3da849bd4afda3534c312e27c637d61c99b238..4506a54330df88cc027f830860f60d58b3577c15 100644 (file)
--- 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 017012fddf4051cfdc8d62c0406d551226560950..419810eaa1720f64ada3be5952c1b671fe3c435f 100644 (file)
--- 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 c05bcd3f73d2f63ea13c0637a488a292544944ec..edbbb5fb6a7accaaf439f54e11fbfd3054d9aaf7 100644 (file)
--- 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 564ba55be213be5759cd9a8b5a3561e485b858c8..916a49d5262e1d5b5b31a380c524339f81aedc30 100644 (file)
--- 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 6da8f2a16ba12fcf84819964fe35ed861844812a..17d16f6481705ce240171bc7c8961180eadfa3ec 100644 (file)
--- 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 6f7477a9ebc9a7ab9f80aafd40a181994a9aa84e..3386097523a04a177eb2a4a056154b97c89fad1e 100644 (file)
--- 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 7caac215e05ac5441f138e5ef6f2d41e8c838e15..3b8701d09d0511401eb9833b019d38ffc6fb98e2 100644 (file)
--- 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 d2b4baf456e10de930706f0d7ad2c1ac56487c54..fbac58e1aad5802df0b849248291572d18fb0972 100644 (file)
--- 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 f555b637ad80a64ec1ca91f91d70cbecb522f79e..2e54583239d3ee24189117b8ba7f11ee66eaae19 100755 (executable)
--- 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 5498ede02005231255bd3a5559b00f89a7debfe1..d1d98bc6ec3296c977b3e783d3e6a5bdadd5e412 100644 (file)
--- 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 62af6a03366f344a416b0b4da0b39cecde52443e..6e40669341d8c4b6cd3f059d4fb8f5d21aba1e82 100644 (file)
--- 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 7009eaa457ee4fe05ea83e93df53b6d9e4b5be4b..0a36189d747ee1d0bf8d3e126da89aadf2d1bb4e 100644 (file)
--- 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 9cb23882c20e8e099aa5dc21e5ece3fd09b3b0da..0137ff7920d9c4288568e7ba339cf162463877b1 100644 (file)
--- 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 50d2109cac4fe04bf8355ac656b1b06531521b42..096091e439c6bd74a90c1031d1fa4cd8c36816e8 100755 (executable)
--- 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 f10db109803974da90fca25d6385ad4dc5a4912f..a4fbb3cd68adf3cd94253decb94888f4ea51db9f 100644 (file)
--- 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 11ef334f457b0cd24cdd6e7d6f2e84c46231eaff..44e52b4e9b93c68f3b8c48d1bd1d6dfa9cdc0e68 100644 (file)
--- 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 c330b14fe8a4155311c3582a0625b803c750c9f1..c17554a1a00dd8b60126b22657828d706a7b2b97 100644 (file)
--- 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 e9f2a1e2124534c4a080e744ab411d68f43c7a11..80f6b8b00493dabc5650ec2bf9a37ed362007bf4 100644 (file)
--- 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 09ad693b44adce9dd508c41d82c7e3afad7ae73d..9874a09cb7a871e673e9c4f3f4653e286fdd3220 100644 (file)
--- 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 0a6c7d7876bf5f362ad8ce55c84803fe3a3e2f29..c5b13b43eb12e274bcd6ef6e1d61d8c3e8234fd2 100755 (executable)
--- 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 61313eb2c6a4a93cb43a34a81110676b021f7260..8da2c833a17687cfe9506bc8f6b84529d4bd4d2b 100755 (executable)
--- 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 6f59e833ed7a53a162ba38627e5f3ed04a42ed53..580ffdbec1bb89f496c4e101f9fe12ec9b2646de 100644 (file)
--- 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 28e2a51a425301bee1e3d6a92925b53582f889ea..fd9b651e65a54b479ac58a0db48618eda7922f38 100644 (file)
--- 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 3e4a0ec94667a3576ee5ff0068eca364c7e9110d..71ce129201ade3d084ef863bf40896e0a6c2a299 100755 (executable)
--- 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 5c59d916cff56c72e2245e7c8e1b7f798b67cff5..eed0b81fe76d76667b4dcd9afac6d7df2e7a882a 100644 (file)
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 75ab09d1b5ef451c268fd15f37c9af70efccfc9d..ebb1df6dfd643a45731555931bc426c036411872 100644 (file)
--- 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 a5b9819b02c558f841614efe722534daba664703..211f3a90aeb8013b98abe85fe6c49a79765ff548 100644 (file)
--- 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 28c57ddf63b94ad8eb4c3d7705871701972ced18..2a637e15e5c221867437ca0f93481a59729efff3 100644 (file)
--- 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 586b76ae52a0cfbd54fca5505d4b033a068f336d..1a3ed3db7269e6f3581786c92460ab81706accb0 100644 (file)
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 bcbc40295855f87956d14468e5fe905b6e86807e..816c7f86deb7fb16a86c67b3639c4366534b0b75 100644 (file)
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 f4d3626e45a5f159b3433363de74a7231afcc955..555e77622717b78b7da79377172c5fa89059fa55 100644 (file)
--- 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 f2c3b3e548ebfd4caeec690d5e3c0d217aa36383..26cd87a94ec2aaeaf4eb95e7e64fa3b82753c23b 100644 (file)
--- 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 9aad8088da800e350d1025d4a9630d815402ef89..726b9b8357da80a650c78d916539ead2f1971cb5 100644 (file)
--- 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 c2782ff1c99ef5f2ddf750a395a03c9541f3980b..14222a49605ccaabaab6ea0c6b432760eb14e54d 100644 (file)
--- 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 059ed4a46517f2ceefd4116bc9bb946bd75dc4ed..9029c2f667c81fbfb43a7c59a81ee74ea1b3ecfc 100644 (file)
--- 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 98de1be5a3fecc440d6f0245d21a602d24add031..e09802a5eb7150134edfe07fdf42615f33fbd300 100644 (file)
--- 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 889f700c4904a2191c4bd697451026fcd88c29ba..3969671342d810a280c946cdcb10b3aff6204568 100644 (file)
--- 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 e6fda1a6ee7ab2c4c15f8d18565561d0ad1b0425..6ed8afba52a4d743e86af19526c03c9db197c6bc 100644 (file)
--- 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 6bd4f5d8bd55bd55ce96689f69f6fcbb5fea84a9..885ec145dfe36ba5b4c8dedc571b8541d9def083 100644 (file)
--- 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 5a8b831cd5791369f9372bb35beab8f621614e4f..517d1ec6048d826f34a1221d399987096ff1c538 100644 (file)
--- 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 bcf80653bb40a5e41e48dd47679356040847a486..98054cf13df30b15318cc843fcdc84f24e6b563e 100644 (file)
--- 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 57f9d0025b81bce2e16789ec252d303fb8aff7e8..87a1f2129de7b3e7b1e78497fd145e35bf4a2166 100644 (file)
--- 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 1fa6749e476c2983110fd85ba224787f52982a11..0cb6f645c969a1abf3851a786d856b4bc20b6336 100644 (file)
--- 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 523d14bf94c76c8d47d600b635ec0f8617d62c01..05b25a641b10b39f0228e60e6208ac220b266f08 100644 (file)
--- 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 7107fd8bc00d4564abc870a417660783988b7660..e569fdc4608e3f2f22c5f284238d679123f31d8e 100644 (file)
--- 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 e72f20495ccd65514eb4f4fdf01f3bced99014c5..87e8d3062803712fc90e606f533e2f6f5f762ac7 100644 (file)
--- 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 543dbb013ef3dd43460ce8a932000bd5e751b137..e1f4396695141425108ede941bff5f49b2864bbe 100644 (file)
--- 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 fd28dfb46a555153e9e2437f047d5d9c91674ed8..e1a9919d85fc5948d41c638526a70e37eb46aab6 100644 (file)
--- 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 2e769f5dbf879a6b8a50f76021e56d83dce6c545..6f66c3d5c91a438364e53cf04948627f8db3f445 100644 (file)
--- 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 6449187a34405900bec64ca428c02643e1ee3202..e88674647325f6ccef5446c9d4f566546c320aa4 100644 (file)
--- 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 2e79d76c851c1863d7ee2f33c7c4508399f7a110..d8ecb6d3cb624766cca0557a43770807d3d60b5f 100644 (file)
--- 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 5fa264a11e5e1ba5e307bf2b5afe354beeebf2f5..051ed3f733995d5193a9ed365405c870a7e96f27 100644 (file)
--- 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 6ade1d9f51b9859616f9b0670c88416d8df80659..5dabbede00c06c9cf58bce26178d9d16f2acef22 100644 (file)
--- 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 a7e253afc377400199478db59f71241efe176ebd..d6150e6f40f96d547b8e9af66f2ff50c0bb54180 100644 (file)
--- 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 da16eb6c12191675608581500277ac27569fa27e..941aea8eca8844a5a86c4964c992089753a94b21 100644 (file)
--- 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 59ff7a75dd59cd49f0ce98011238902148f4753c..526e2df27be6769e02ded3d6b29de2ad73adcb4e 100644 (file)
--- 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 8c0c32a7f7afb79628c04fe41172db5b24e45924..f9ca30ebeb65e0317fe88ae94500bc2367211ec5 100644 (file)
--- 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 b85e032b90973c79ffb18b9258e9f0e9505cbc09..33f9561378728c9320cf741db294e32b27a8ecee 100644 (file)
--- 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 b7330c9f1f407868f41e10484f4a5937a91a8448..d1c4cb893f6e5efc313e76cdcbf061eb9983dd75 100644 (file)
--- 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 64e458781d33797ce327b0b4d07c6b97d754dc19..8daa66ae10224ca21ac1b6cd1e8aa5f2b9c532f6 100644 (file)
--- 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 e6d22d6aba1d2149c6a6f3d6d40cddd95cd35ef5..e322b66429af2a814c613a37e526b8fb69fa92b4 100644 (file)
--- 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 31c924cbb35c417b47d4c4ddbd677d41c9468cb5..a7a2dc803c4a5b0e46eb71823148cb1e745ea023 100644 (file)
--- 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 976093d854b7d1ffa960466024fbe4af5db677f1..1165770d4b06663c034b5d246fe9c6d87a5ec1bd 100644 (file)
--- 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 1ac296695ddf7fbd21c12591c1a63ebba85997d1..de0e9d1f10d3c9b8750643986c6bccbae9f71748 100644 (file)
--- 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 e900603a8993cc42bb19266f6e9a921f58db0601..f399afe414596276736b9e8e607cd73f645bab4d 100644 (file)
--- 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 4834fa3e7a71c14f6fd30fc824ae16e3cd41fbbc..c65b40e0d5f4514f8dfbf18adb6bb86a7310af70 100644 (file)
--- 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 ae2572f7bc0b999b694d70fd042737e9b46716f0..76faf13ee22ef4f432044e8f7b0922c0bb007603 100644 (file)
--- 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 9cfde0f8bbd1a66c09d04567941a4bf9197efdc4..5333f3b23c9d901272f5c3ee8d8168040faf3508 100644 (file)
--- 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 183785be043fa5b4016bad47b0d900220b49816d..c914125af5db6803d7e8a48572463a2d5b6eb833 100644 (file)
--- 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 d1f248ec281217a3985b93e6dc43077b03861933..27a3d8f3261a4109af74dece1e4cf775db5eb78d 100644 (file)
--- 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 77e12b05e9c2fde7922e87900a25ddfb5e7ee7e2..6dc03844ee25f25b7dfcf15a4758428b0aa6cf5e 100644 (file)
--- 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 8e626e5092138f86ece4d52edf6b351ad6c78206..948dee2f7660a3d05b94b705f03d3d6c4d89ce76 100644 (file)
--- 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 ccda07b9a36e377230f779fdc69813b294f5db93..05e10b41ab50c8399773c28d8f2a3c70ae809ace 100644 (file)
--- 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 df2b665687e70d248bbe36b9ac26bc82cfb4c407..3ee18a5c40aa8db833f941aa2b4968af38882b20 100644 (file)
--- 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 9776753c6023ffb5509b24e6e9eb3b0e1870b09b..cd52bc70df06653dbd4f74c2f7f78ed14ea1215a 100644 (file)
--- 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 2b45650cf2745d4f9cab0a0ae5f3438db2fadc03..12043795872fa56cf8c52ba7c03e52eb1decee10 100644 (file)
--- 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 8199d5d06e4186826ac62415671b9631ed0d4d86..636e29d01fe31c434dbc84a5f8f5882724019fb8 100644 (file)
--- 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 4e62f85111fb42494742ae968876170a06d8b9c1..7514e683590449ba9e8ce75365792485805bd53a 100644 (file)
--- 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 ea7b082f9ef79a448c8736055e026ab2c9000ab7..aba8d750c6e9065dedfb22416e08001a7aba5534 100644 (file)
--- 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 9fd7804ea461d22a0cd3493bdaa2b25f6791ae14..4752a4b4fd745ef9f3ab03df7aadf43ef22ee71d 100644 (file)
--- 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 011e6fdea9a73d6fd0af47f60456bb09bf6d6702..0755d2b75c69925baf7c64f3c93b124d39c58fc2 100644 (file)
--- 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 d853f734285f6b4da37a49372cde25720b1be8eb..5b4578ac929d80b36375f889ef24520009a96095 100644 (file)
--- 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 1954122900c4fb2b0ed800a43bb50bb211afeb07..79336b217d8f8d1d1c248b6b75a333ff2d6bdddd 100644 (file)
--- 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 f4fec6155c0d01f30aa9350b4df975cf551294ef..b2cd4e16555d9f5c3a7f1ceacc09ba716c223551 100644 (file)
--- 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 3331cb35bf5c3608b2d3e280fb761eed9573538f..12fd36384fb2f8dc27afa1b9410a8eee891b98cf 100644 (file)
--- 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 73b85ce6a510a9770070b00447ff7ebc27d3c565..e40cb2dc682407012e7069389f1f96a0249490cd 100644 (file)
--- 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 ab6ccbd41eba068ac1139c49bc6a054acc60a008..c0d42263c34e0c8e02873db911ef6dcef1a27e6d 100644 (file)
--- 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 6e356485492fe6f65c56b7e0c00e50239df3e75f..c847a26e64257f7b9593e8a09a1f3301c4a1c64e 100644 (file)
--- 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 6e34604cd80c7f69c8cdb552a8d8e374b69476ca..f21e269a891fb66dc9330e71e7056b756d2afbb8 100644 (file)
--- 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 96938900eca39838c874abc6582a9b6e9da18615..e5f36912b02bf82550fd9b51a2a5d9fd8616a500 100644 (file)
--- 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 1494fe53213ed4294a3408d5eb44ebc95656b55d..a8bfc80b9a1852b0fe1245954572875152f703c0 100644 (file)
--- 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 76cbe3d48b0bf65b096ff9650e64467dc337eb26..e8fa8da8e8a72db21baf1178dc9b182a5b059733 100644 (file)
--- 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 d1f4274bd110a02780d39d167792b2aeb7fc5c45..4f98f384d78582c9a4150dba772c311f04a03fef 100644 (file)
--- 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 6b98bb33395f2a7f5d7530cb89670e6385a7c02e..b67ce0b5d0c056fb38932977c9a6a1012d508fbe 100644 (file)
--- 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 2927e945fee9eb460b4a96f8f1a2f23e0fdc9bde..6312ef64cef5fb20b5767496ca3f6e0454a323b7 100644 (file)
--- 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 0000811879b22afe9cc1f2807d4b9a18a8d1c811..5371ba56c613749af64f793563dd2607fe23e29e 100644 (file)
--- 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 f3d0afcf0a32e331e6d0f3dab9038b75d1cb016f..f84071c20262a8de1de87aaa8eadff256a1d55a1 100644 (file)
--- 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 bfcafd261dff749a53134173174ea7ec3104fce1..2a60652a42692ddcc85c77fd5f342cf8717087bb 100644 (file)
--- 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 3b4ea7c26789fd8ab4d4d289e61dd882a1168197..3ed20415c41db5814de33870b36951d6159ed648 100644 (file)
--- 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 3de8bc2062e9c0e057b2ab48429e14fb0352515d..f876953b97bf3c21a99c5f874b4aa90d88ad5fc3 100644 (file)
--- 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 da094ae7592e95b49c0dee524399c435472306be..66d8955f18c6da0ca39451784159417d81a6fce9 100644 (file)
--- 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 252700c098cfd539986da6618dc177a5c28ce9c8..ea6ec22bcbfbdf61d3d7a42a522fbdd58f3ea1d1 100644 (file)
--- 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 44c0d2f2d55a823568c903fc13426a6d245a7066..f8947988e4cfe9256101f45c5d3ae60f3a70ce13 100644 (file)
--- 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 2da496361e6580123f34bd7ca50eec3298ba1300..e92298d3e5ae3816dba593660badf02a26ed2d7b 100644 (file)
--- 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 0b2f5e578938125a113c817d190e09279b9a82aa..4c2f0fcb4a702ede15896a20fafb442e92c9b87b 100644 (file)
--- 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 fb7c2115f6cd1c9244c070ed55d877ee96831aec..d116cbfc422852f99fe8cffb6cc9e0a7426089b4 100644 (file)
--- 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 9018e7ca1c772cf14b0aac5b482e0acd9119c1ee..17fb44a5eb0c905ad2d103ccdd63f148fe88a82d 100644 (file)
--- 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 76cff2c1daeb2851ff77dfff5a2dbe4cd5302347..432eeda7eee8557cda593e18d0512bcbae4b656b 100644 (file)
--- 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 7afda000d2a77f206417cf89a8f97ea61fa5bddc..0694a79824a03a705cd8881d848061d46cc10cc3 100644 (file)
--- 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 d4e55342885a2f7f325afa099bc8ff430ef56a52..3df21435e0c9210424cd88bb9f6f1de7d21ffd4d 100644 (file)
--- 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 085abb001be8d6a8e61142a87ce7af4c462c2b93..5d745e2ff0164b94302ae6f5e571fe7f6e02e0d6 100644 (file)
--- 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 6003efec47b22ff1a1a0e4cb8d5a0ca732c54020..6123f39b56697f3dde1b4e59bd3e6bd2fd1be181 100644 (file)
--- 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 b980b9c894e6a952e72d35248b55a8decb5ba2ba..a6cac5a857749f8527faa7078655cf031d72f6ec 100644 (file)
--- 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 2f367817e3bbb6773043383bb5177adbdc17ec4b..e496c1af6372dd58b375d9eec77bd02b860fce92 100644 (file)
--- 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 11ac0ba40246ff1bbfba2c6f3862bb7f65213824..61ac03c8dd0ece63586ecdaa5cbd56bc87f9de7b 100644 (file)
--- 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 63b4eff451c7531671a4f7b24fc27a5e5b256662..b535ac59398581d4146cb43289dca61cdcc70069 100644 (file)
--- 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 041a7636ed9a6eb85a94103d5a4c2e03da849754..0835e40aaf6933483e5c077ce3e046854077d739 100644 (file)
--- 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 a451b41dbe60f6a85c21fcc75002e4cb44c99d79..33381f620b1b4db03f5aa2169f81b8771e63cb85 100644 (file)
--- 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 101d9839e98edf013bd1e5dd12e8ba2073c6f339..aa4a160e6c70f5d3c92866914b99464220322dd7 100644 (file)
--- 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 4e0f02d413e56fcd966f31e45d45f7af9be6d977..74fe288c834912289c80c868de87791c1967be67 100644 (file)
--- 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 50c68e3909391f5c66a477605f3ae3251cf6015f..ecd3e3805071d2bfa14635a916adedd8dd4a3f10 100644 (file)
--- 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 efe132aa85e7c4f455d64d11f2b33b86ab9df28e..e4035ca76e7bde3ab58ec1e0e220fc03ba6bdea9 100644 (file)
--- 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 3b7ed066fc60347eb17c9e839310c302cc7ffece..f39a63779821e4dde995838f02d9c17cd4009496 100644 (file)
--- 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 ab6ee41fcec2439ac3fc3bcd4e013a3528aa2e89..523b65205c5008f15121c0e942b67dd0732850ca 100644 (file)
--- 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 a0af41294b77f78c81f0f1cdf166b5e04693f7d8..865e7305dd00184d5c60d7e1ba52426fff85d5df 100644 (file)
--- 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 3c4ea68f477c7480c389aa480f717d2553d6f7ee..4333356cbe28326e369dbda6aed31d14f77c4aac 100644 (file)
--- 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 5115fe16d8a549965d540ee5f716c1688a690a03..fad23326bf3d0e23d93b77103870ec1ce243ac84 100644 (file)
--- 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 0b445c80cdcad7fa3fec1e398f355c2c4a8536e8..049e22779db672a0b4987f2be063ef6ed11dd502 100644 (file)
--- 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 8bbc08589326c54c5e25c68511adbb21bf6018f8..3a2a477196cebb9dab61c7cc674e714d947109b8 100644 (file)
--- 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 99d76966021b87e21d6fa8e2ba19b0c8387b70eb..48418fcd058c9736a675102586e87fc6a77e5284 100644 (file)
--- 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 267fbb20b9d25132cebc2cfcb08d4cb6344c92eb..161568e402fe4e9abdeca301e5d4d02578bbd433 100644 (file)
--- 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 4987b29b2ca23a372a37b2282215184eadb6c4a1..77b3696f2286b20918b6bd7c8a9a11f9c7ebd81f 100644 (file)
--- 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 0ced2142cde95898e839a5f76fa249b9319892ff..da8ac6cae9447529a544a77dd9312d1883e032f2 100644 (file)
--- 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 6ee16f79b98f655622d6716b0b0ccda7886329a2..7bd7410c73bd935ab9ba8c5e5824be360ac7a411 100644 (file)
--- 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 43e532ce7dcbc19aad83f40a109070f1b37dbab3..53a4fc76f9ef87b1f11a9fce8bb6502ad51d6ace 100644 (file)
--- 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 8ab3a65f1b22666f552ca292cdb60df9eeddc861..1e380e2b4e7b912b40aa182d9a02285c829926a0 100644 (file)
--- 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 6a1d5a00db95fd34e3a3cc5db3ed524b7bfdd3aa..44cee19eea3b7c8863a9325bd1d70eb09b9ed423 100644 (file)
--- 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 b2a66734695319dd1821f9383fa5aa2670a4cee8..4d13d5827176eec331499d5a7db85e6af4f5f0a4 100644 (file)
--- 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 fa404567d0dc2567c6ac187bd20e7b02f5a137dd..7de5107344268dd7bf54ac453ee9ad9ccd81854f 100644 (file)
--- 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 36e9a7e9d32f3c093c25b0f5fff88a8cf3b9add9..eae789f267a43176b882ea48b24a57f5278b2872 100644 (file)
--- 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 fa524664f36ab4dacd84837a3d1fc15b33f75a9e..72682fde92feb36d0bb97403abc5c3a5a1e6b7b9 100644 (file)
--- 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 ea73aa29f5a2430acea34ad4361c45878cd28a88..c64f13be1fc53bcaabcbdb82fb3aafe7d1384edb 100644 (file)
--- 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 d9b56495e9f702557b2ad6e2d2298518b37a01ec..cfbf059630b2b704a5777640128362ec30446068 100644 (file)
--- 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 769b17926e92490bf2fa7ced1490f79fffcf13ea..0cb9ea9f810d178f759c85af9886edead32897cc 100644 (file)
--- 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 901e7cfb55de2d3a9bae9fd0221e09347f967132..68e3576242c056bf7f7aabd29f29febc2c116ac1 100644 (file)
--- 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 48a43a3ca38e4d2e2bb368cec3fbe3ca2b0156c8..40a6dff9ec24af96eafce1e660ca5454660fadea 100644 (file)
--- 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 20a2fd83bbc2588a1e499337e98a139b1cb7eb32..f22649dceab067e00548b85c0704c1a4cc860502 100644 (file)
--- 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 4fca6ddd72bdc2d3fe993d2a7dc43001795ea5df..9dbc496cc0d770e8a0bc812a4bd44a89ae352474 100644 (file)
--- 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 4e9fe1f7c832a8014b47d290d4d2dc2e57d11188..a7a787e568f9a1333493c6559d81138476b803d1 100644 (file)
--- 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 6baeba00bddc3986258abd86c0eccab295473066..9583ef254704024586401f84d8b45a2a7790b2be 100644 (file)
--- 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 00647a5c7091d82d1c99fe33dec96be8bf28d835..a01ccd7ca9d772d6fb27aea8edc97e7122753abc 100644 (file)
--- 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 39bff7fa92690af4704a42526208b8e92f8987ca..b10b7424630d76acb0c43d79171f3866ee726bbe 100644 (file)
--- 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 68c2fc2757b293df3fd022ee1a63a885c073e63a..593001f0bf577beb93aa01c35cb294f089ae33af 100644 (file)
--- 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 88507b32666ca57d664d873320e8d8c40e77164d..27c94c7f7820ab80c752f998e5029495214e0f0e 100644 (file)
--- 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 7bf308676c6709bf545d651cbe490090985cb1f7..6c16f459158cd3a0d0b6156d8c3b7fa29550fc10 100644 (file)
--- 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 2ac030612031c924b669d3f2debeefad302b45c0..c6ef2d8614daed2055f7f96b6354d646e3f3c026 100644 (file)
--- 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 8077a4fb269a12075dacd03c884d2220e7783980..719ad833875b9ea97b41dc767f8af16302430ca2 100644 (file)
--- 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 f19c6aada855fb726ce85788b14dbbf4b656a7a9..4c5fa3248e1a966c1ed3abf579d4581fb1803e92 100644 (file)
--- 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 1fa560470030d084c987dbb09eaa706354b5ee60..51b47c23f23bf4db0c1345d52e87f0c2539249f8 100755 (executable)
--- 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 f0d2bc28c845dfda5b83d17de0500bc8edaf608b..0c1144e983ee5449a0141449f4d58ce127993099 100644 (file)
--- 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 f328b0177433d89e03b6839067f2f6b4be08cf4d..1e9caed87f92ee37182349fa98ec393cdcbee637 100644 (file)
--- 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 e9bcf8fa2878f4fde0911633ca214069433e0d6c..09d744418f6732c6b36c791735f0e60741a2d5a5 100644 (file)
--- 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 cb62f67f56addf6bbf3d055e9878d4b8ba244dbd..41294468576c503bdd913d85345efedd2d12c467 100644 (file)
--- 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 022cbd563c689861523a60efca7b1c44cf15f46b..c328b422ab0c58601056cd3e563fe22a59a79fae 100644 (file)
--- 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 aa04d1aee6444a86f6401bd10606cd6b5547b880..a3a941d742cc3f4c9b463fa2019193d06c870149 100644 (file)
--- 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 513c0618df222a118b35d23447536beaa94b3947..5c451cac13f7176682cc9bb022996aa5959917ab 100644 (file)
--- 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 14d7d708b8e7145b5689f8d19469a2a49122fe0e..0d22c0ef4d591957dec9702abfb3fbc40c4d0817 100644 (file)
--- 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 c962d4581367f80a19b4c8f4aaf6adfd0745828d..d38227b98532e6e8f78ada690e02c7d84874b86d 100644 (file)
--- 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 ba8290cba4a7a770746889df055c568c970243fd..1de2d6b461d4715274c2da6e574135d9f8c18c5e 100644 (file)
--- 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 3cae5e228c9dbd79522b0253fd5df8925232d0f2..93bd17dae57b7195add715e558b6971fb2eb1ea7 100644 (file)
--- 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 3544f4d2a638110cf8b8490d6bee053eced11d30..89b5357bd0eb367209415c3962f2288b6d703573 100644 (file)
--- 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 88596f3d5faffee29628f9ec8500a630f194b800..f727bf8d29ce9a7a7fd9be5318161d3132d1530d 100644 (file)
--- 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 4c5a75e7d1fdf2d20f3f120d988eef1de26fc2f5..ae46b1096ea2e2be6cfc0457b4bdb92beafba72c 100644 (file)
--- 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 19b29f209bd888bbb64cf8a18188ef3d6c21b0f5..8fae7d2e28223dd7d52414bc867b8d68144b64f1 100755 (executable)
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 0a6f0123b9e3b02d55bbe53f047f4a6f139d01fc..b00742bdff3a38286dcd7a5dbe88b0f2a0ea498b 100644 (file)
--- 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 df27772a73809987bbed446d7ef72a5d177af56c..f8f662ae61f8bd82d4f2f9d47c98635f1b5f2eed 100644 (file)
--- 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 ec8b78f010c8fdb3aa23c220c6491a4a22062f68..fdc6e4e21de8b62bce2ae7f7c601ea0aa7eae656 100644 (file)
--- 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 84bcdb6916c2f4f63ab1c369dbee707339682477..3d35989a9a1db6c3f6bdcf76309cdb892b5459df 100644 (file)
--- 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 cafa07668d8c80efd037271460b3d9c6aebf9016..d7819cb799f19b063f56031f0c9aafc4019dcb84 100644 (file)
--- 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 4be9dc700a4da883fa49783f5f55fcb3132e4881..b2e67eda1fe9de3e534c0c4b5bbf4f465af960c4 100755 (executable)
--- 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 6e4f8bb22c65b0716d90d4da6f02fe913c1fe85a..249ce877ab734f7c2e0e9065e25ae50a47ef7f6a 100755 (executable)
--- 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 dc431d82b9b324f20c461eb9468df482f47480dc..8d616c1db2fb023cc1c0812b6d05f84669310f9b 100755 (executable)
--- 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 fcaa3c445444756b2058f43c942a6b79ed7c25b1..c0ce428f7277a6b3f686b4dca6631fe94e5b16bf 100755 (executable)
--- 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 8df545faceb6782b71a401b98c284c370303fce2..b127da581e484b1d200ef6ee0b58ebf59e124672 100644 (file)
--- 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 cfa02f923fa53781b8bbd4092e9e2e3eda121328..bd17d6c318a2f13a86a8b9a54d3b6a3a521a0844 100755 (executable)
--- 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 ea66037b433a9d49bc11318d9d59c599dff3873e..ae96128f0b09037f6aee19bd40f51ba0d1ef5a05 100755 (executable)
--- 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 d1e7d364d3b9740d991ca018e4b2a2a62a8eb2dc..bc6d65ba6858234e73670c9ded9bfb8266e8e31e 100644 (file)
--- 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 9a5c707151c6cdeef1d416b85b36f1a2e67dc647..2c6682a9af049a642274fa57829f0add4df55164 100644 (file)
--- 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 5cdc3dded0cc5bb46019093157f27bdd91aa6c4f..eba8098091c7cfa2ac82732cb56e02fcfe746087 100644 (file)
--- 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 ac79e8de9704c16cdda7d6f3c2c43bb749c9bb8f..b130097d6acc294f347c1e9377a0c300578cfc85 100644 (file)
--- 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 9041e30110ad202d2e6bb4ea677f7546cdaa992c..ec1e7d701c5c5a74d68033a1d1ef800e6154b940 100644 (file)
--- 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 14620c15a4317343c12cbb2a0d6d4507bbbc48ee..182ca8ec299020fcc378a7aca36185ee71c66099 100644 (file)
--- 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 d4ab8697c4f63594717f3daecfa8daef393720f7..9f8c2b9f993593d06a839b969f62a9cefdc74107 100644 (file)
--- 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 67f43c33bb6a4fd81346869922e6c5e2f35cc355..adb0e8826d5cad478ba84bda6b468d0029526361 100644 (file)
--- 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 21e07c0c9eaa67b3194a87471ef9a589bee97a80..5b6b68bd2285a24cfea76b7ff6dc6f3112f7ca1f 100644 (file)
--- 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 49ad42ded233f39b34a8ae38735e5a093d567096..e0bba4c756a3b92e0ffdf7addefd221b18e6eab7 100644 (file)
--- 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 67611f14e2cb713d5b1e1f5c619b71951839cf1c..d3de6b563057842959404bf2a224024d36d16ccb 100644 (file)
--- 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 5d004629d90dd35385b326b0d3730f925c509c31..4771799964f3d94879405cb350b72150a6c158c3 100644 (file)
--- 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 eb1fc0c1f0a7be8d8c90b3cc3e6dc1d54eaf8ede..0836c0ecebad6843549b6893bec639de7c9b2067 100644 (file)
--- 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 95cce3eca9a9b60493e7f6c61c7f632ad685b7d6..dd5f149c42ffe301c04279f60f1ebf78f2570b8a 100644 (file)
--- 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 3f7bea81af8b265cb5a114fcb9b0edcf55ae218b..7550a12c63eb9995306219154ce5062ac6a910d6 100644 (file)
--- 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 c422b392ea9c3b439a17b5090e4dd6d58f2f1220..b4cf033143221ea5b4d10285dce7be11b277970d 100644 (file)
--- 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 a923ee0c46413e4c0179f535f0cd3230712b0235..714d27ad5b09a8da376cb3d8b571f676ca4d0b52 100755 (executable)
--- 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 27d101d7732ff4ba85b140df77c13372effd70be..07e747dcf0a511223c915099570e2e66e69bf8e4 100644 (file)
--- 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 ce0bba82a773e6e77683011d0c60d8c024f57a30..9b40db0de2bb1e0170f2aec109ab8ba510951729 100644 (file)
--- 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 af3f879db919d9d3c310cf6e41e9cd57fb7ff130..c67bd8137b5f53a3b797c3cc1ed702f1e1aae468 100644 (file)
--- 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 b8051cbb0396a49c7cd5a151eb4d40ab5d18b861..0756852e57d3964fe09b3dc7e5ca68e38ee74afb 100644 (file)
--- 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 d27c1f547c5991a51bd4642fda69b1b1a0c429c3..fb8cdd477886740ef810c7c63b74429cd4e832a2 100644 (file)
--- 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 eba6611e6ca89a654747318afe22e47c141bf00c..cc3e4a58953ffeccabad15cb510800b0ff68d17e 100644 (file)
--- 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 eebf63c4f370cecdd9b0ef71ca06dcc9aa1aa43d..2bce69a52fd8de980ff309b421a560ddc6260fd0 100644 (file)
--- 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 9bf8a89da7683bfca66b63e40b474478ac8587cb..a08dd5450c21b2412f702191c8b2cd838aa0d4f4 100644 (file)
--- 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 c65a5ba3f8d4d115579ab5f23963f87781380f62..98b9b0f08b9754a27327d2f8789000da689e9958 100644 (file)
--- 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 9364f0a2e522d09e7fbcdd8fb777112c9a699e90..c6ad6561dbdad1dc8bab3a803248b60ae9c2473c 100644 (file)
--- 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 b570fd2a2f6e17d02faa9539e45c5cb071f8b687..a47e130e5c4d6d9bd75a10d3bb7a4255c83257da 100644 (file)
--- 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 63f92c5fd81920558d867ae3c87331894e5a2179..3ced2e9bd5d9bd40e97e2608be823dc767ea0d47 100644 (file)
--- 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 dbe8da111b8f50c2bfa431c9b1bd513ff4f793ec..57ac4cc135a4dd9f7a5e2c8b2645f5f3b4683870 100644 (file)
--- 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) "wo\7fu"

diff --git a/Zend/tests/selfParent_001.phpt b/Zend/tests/selfParent_001.phpt
index 29b698e2ba29618dfe29ba32b7106d4bffdd15f8..8f7f963de86940b17d28978fa74074340764c1aa 100755 (executable)
--- 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 30a4a4f7b837fee1323d01dccf6612122e54c03b..6b89bda903ea25fc418625acadfada8731acbf87 100755 (executable)
--- 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 98c3b87978fce5292d73bcf091ef262b81241725..ac12df8925167a21df3ffcfb5a32dc07fcf182b1 100644 (file)
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 cf59200b81a625a3dca2ce76d5f6f8261a17c22e..06b003ac8679910546692b1b76d90d2f48ec8c62 100644 (file)
--- 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 ed63f8ae83b0ebac3da73a51cf1aca4daf391746..71998e798b6f948087b17fc65e7f39298a9657df 100644 (file)
--- 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 7b96cd594eaa22156b2712429d069bef7fc44af1..f278bf1bcd2e6753358b58e0bd6bf79db450d534 100644 (file)
--- 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 0abf2f98102fb07b6ef5cdb499ed298f08602e7b..ca1d03a8e424472bdd225279b305bef8d553ab02 100644 (file)
--- 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 a3a433cf988c66924ef08d9aea208081db69daba..aa4ebe4134907a84cd4540b160a068eaa60e6301 100644 (file)
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 7210613123ff992bbd4a9641f89efd2883ce1bb4..5ea67405ef278789b663799fb2f726f4d57d4023 100644 (file)
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 e8e5ff1e601d834698e0619814794e55a73e5407..4a21d78d2ad8f60e46a15cab7d50d2e5bc2afa18 100644 (file)
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 aeb399452d50b7fd98ece1d88b3536ca839a4660..200d17507ca9d0481404afac998ac9fc509795d0 100644 (file)
--- 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 4d8421a5666c0a143f4beff0a7acd5b5ce167a56..ad42a37a633fadfdc05fc6655450d207eba93a0d 100644 (file)
--- 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 8070eb9fe78a9b4c0a5c2df88aad760e548556bc..e125f3cbc77f22603835f6a2f8961d07dff485af 100644 (file)
--- 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 cb372dca1968d123d36cee474459696090eea35c..b1f0ef4e6ab78d35ea985b93b571f12b66b6f026 100644 (file)
--- 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 2a8b3cdffdf9b603e31fbd2e472f12b4b6b60243..3dd26e060f9a6deaf7c4b02ad46d0dd94df381b1 100644 (file)
--- 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 5a10854afebfc8a54fd96aeca9e333a55363222b..a4bd1186e4cb41998dbc454ddd6d5a1d2a35bfd6 100644 (file)
--- 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 8c6ac1c9c0067479f3fac2a8cbc3306016f25c76..9fd4331d12a87db4412b18d9280b4f7ae7f73471 100644 (file)
--- 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 fe16abf7507920a7291a10d29b61f0ae65f0b7f8..93ec021fbce3d9ce9ebe61fda713d56e9ba9542c 100644 (file)
--- 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 9b8ab1520fbe086f0e29b5e94c83e964f4b31a3a..0798ca48ed528a55202543ae809977d683a7c04d 100644 (file)
--- 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 95788b6c6e6d6d51b35af9034292921f64c6b812..d9bf29a84065d421184ecb958e624fe89d788c0b 100644 (file)
--- 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 e1a521dff968fb739c4ea102d0855b836c15a534..1a6d0fb6333c351c297eaae5f39e98a7088fd7dd 100644 (file)
--- 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 11e8bc93bd9c82323cd77c72f335fedfc875c5f7..f0bfd2dcd31c788caa82087be965d593ee148bce 100644 (file)
--- 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 8aa1c636b76ee3f91df1b51fa2e3cc0b604c6a45..4ed98f3415aef3660e590cce722099938c6f8532 100644 (file)
--- 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 1b11be03882323b114c5898dea33c68483b18d6d..f3e9789a0a7cebe3c2475af2d11b85674e662740 100644 (file)
--- 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)