fix tests for builtin Zend functions using new parsing API

diff --git a/ext/standard/tests/array/each.phpt b/ext/standard/tests/array/each.phpt
index 1953a04397dca63132130da77335de8a377b81e7..19ee728fd2ee51d8dced3b1ae18aab8e60dba706 100644 (file)
Binary files a/ext/standard/tests/array/each.phpt and b/ext/standard/tests/array/each.phpt differ

diff --git a/ext/standard/tests/array/each_error.phpt b/ext/standard/tests/array/each_error.phpt
index 02c8ef9c067e593d1431dcd8097ff0d0a2e4ce4b..08344356109880be49bd536e6acbaaf4cc4870d2 100644 (file)
--- a/ext/standard/tests/array/each_error.phpt
+++ b/ext/standard/tests/array/each_error.phpt
@@ -32,11 +32,11 @@ echo "Done";
 
 -- Testing each() function with Zero arguments --
 
-Warning: Wrong parameter count for each() in %s on line %d
+Warning: each() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
 -- Testing each() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for each() in %s on line %d
+Warning: each() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/class_object/get_class_error_001.phpt b/ext/standard/tests/class_object/get_class_error_001.phpt
index b563c318817d2784b9924e6e9e6568501477019a..fb3bacb904ef840f65318b7d943bc4650ea22df5 100644 (file)
--- a/ext/standard/tests/class_object/get_class_error_001.phpt
+++ b/ext/standard/tests/class_object/get_class_error_001.phpt
@@ -23,6 +23,6 @@ echo "Done";
 
 -- Testing get_class() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for get_class() in %s on line 14
+Warning: get_class() expects at most 1 parameter, 2 given in %s on line 14
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/class_object/get_class_methods_error_001.phpt b/ext/standard/tests/class_object/get_class_methods_error_001.phpt
index 6edb1080325b420ab98069c95eaee12efba1b366..e606ab693720eee65e7fdd7e3f51ba2af0f52f5d 100644 (file)
--- a/ext/standard/tests/class_object/get_class_methods_error_001.phpt
+++ b/ext/standard/tests/class_object/get_class_methods_error_001.phpt
@@ -31,11 +31,11 @@ echo "Done";
 
 -- Testing get_class_methods() function with Zero arguments --
 
-Warning: Wrong parameter count for get_class_methods() in %s on line 16
+Warning: get_class_methods() expects exactly 1 parameter, 0 given in %s on line 16
 NULL
 
 -- Testing get_class_methods() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for get_class_methods() in %s on line 22
+Warning: get_class_methods() expects exactly 1 parameter, 2 given in %s on line 22
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/class_object/get_class_variation_001.phpt b/ext/standard/tests/class_object/get_class_variation_001.phpt
index 6cbe0b36836fc3d54a132b49d6fc83806d3c0b53..2e83b1dc5eea76de6675f0eaf2ef56e8b7c3a299 100644 (file)
--- a/ext/standard/tests/class_object/get_class_variation_001.phpt
+++ b/ext/standard/tests/class_object/get_class_variation_001.phpt
@@ -81,80 +81,132 @@ Notice: Undefined variable: undefined_var in %s on line 58
 Notice: Undefined variable: unset_var in %s on line 61
 
 Arg value: 0 (type: integer)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
+NULL
 
 Arg value: 1 (type: integer)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
+NULL
 
 Arg value: 12345 (type: integer)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
+NULL
 
 Arg value: -2345 (type: integer)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, integer given in %s on line %d
+NULL
 
 Arg value: 10.5 (type: double)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
+NULL
 
 Arg value: -10.5 (type: double)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
+NULL
 
 Arg value: 101234567000 (type: double)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
+NULL
 
 Arg value: 1.07654321E-9 (type: double)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
+NULL
 
 Arg value: 0.5 (type: double)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, double given in %s on line %d
+NULL
 
 Arg value: Array (type: array)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
+NULL
 
 Arg value: Array (type: array)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
+NULL
 
 Arg value: Array (type: array)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
+NULL
 
 Arg value: Array (type: array)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
+NULL
 
 Arg value: Array (type: array)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, array given in %s on line %d
+NULL
 
 Arg value:  (type: NULL)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
+NULL
 
 Arg value:  (type: NULL)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
+NULL
 
 Arg value: 1 (type: boolean)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
+NULL
 
 Arg value:  (type: boolean)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
+NULL
 
 Arg value: 1 (type: boolean)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
+NULL
 
 Arg value:  (type: boolean)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, boolean given in %s on line %d
+NULL
 
 Arg value:  (type: string)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
+NULL
 
 Arg value:  (type: string)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
+NULL
 
 Arg value: string (type: string)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
+NULL
 
 Arg value: string (type: string)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, string given in %s on line %d
+NULL
 
 Arg value:  (type: NULL)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
+NULL
 
 Arg value:  (type: NULL)
-bool(false)
+
+Warning: get_class() expects parameter 1 to be object, null given in %s on line %d
+NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/class_object/get_object_vars_error_001.phpt b/ext/standard/tests/class_object/get_object_vars_error_001.phpt
index 67a2705d05cae9eb3e854297d21441c76756296a..2cb37f4a912a6ef42ac12aa18173a34da92346c5 100644 (file)
--- a/ext/standard/tests/class_object/get_object_vars_error_001.phpt
+++ b/ext/standard/tests/class_object/get_object_vars_error_001.phpt
@@ -27,11 +27,11 @@ echo "Done";
 
 -- Testing get_object_vars() function with Zero arguments --
 
-Warning: Wrong parameter count for get_object_vars() in %s on line 12
+Warning: get_object_vars() expects exactly 1 parameter, 0 given in %s on line 12
 NULL
 
 -- Testing get_object_vars() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for get_object_vars() in %s on line 18
+Warning: get_object_vars() expects exactly 1 parameter, 2 given in %s on line 18
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
index 70794e7d57acbeaba33724d3790f2f4c0b6fe39f..adefa793ad3472be1281091095555ee5b4dadaf2 100644 (file)
--- a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
+++ b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
@@ -79,80 +79,132 @@ Notice: Undefined variable: undefined_var in %s on line 56
 Notice: Undefined variable: unset_var in %s on line 59
 
 Arg value 0 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+NULL
 
 Arg value 1 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+NULL
 
 Arg value 12345 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+NULL
 
 Arg value -2345 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d
+NULL
 
 Arg value 10.5 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d
+NULL
 
 Arg value -10.5 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d
+NULL
 
 Arg value 101234567000 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d
+NULL
 
 Arg value 1.07654321E-9 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d
+NULL
 
 Arg value 0.5 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, double given in %s on line %d
+NULL
 
 Arg value Array 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d
+NULL
 
 Arg value Array 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d
+NULL
 
 Arg value Array 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d
+NULL
 
 Arg value Array 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d
+NULL
 
 Arg value Array 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, array given in %s on line %d
+NULL
 
 Arg value  
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, null given in %s on line %d
+NULL
 
 Arg value  
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, null given in %s on line %d
+NULL
 
 Arg value 1 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d
+NULL
 
 Arg value  
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d
+NULL
 
 Arg value 1 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d
+NULL
 
 Arg value  
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d
+NULL
 
 Arg value  
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, string given in %s on line %d
+NULL
 
 Arg value  
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, string given in %s on line %d
+NULL
 
 Arg value string 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, string given in %s on line %d
+NULL
 
 Arg value string 
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, string given in %s on line %d
+NULL
 
 Arg value  
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, null given in %s on line %d
+NULL
 
 Arg value  
-bool(false)
+
+Warning: get_object_vars() expects parameter 1 to be object, null given in %s on line %d
+NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/class_object/get_parent_class_error_001.phpt b/ext/standard/tests/class_object/get_parent_class_error_001.phpt
index cf9c3e86744fd123998b0edbe7c12cd8cd8c82c0..40c3dba279458eb75523aec0ab4e849e9f524a93 100644 (file)
--- a/ext/standard/tests/class_object/get_parent_class_error_001.phpt
+++ b/ext/standard/tests/class_object/get_parent_class_error_001.phpt
@@ -24,6 +24,6 @@ echo "Done";
 
 -- Testing get_parent_class() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for get_parent_class() in %s on line 15
+Warning: get_parent_class() expects at most 1 parameter, 2 given in %s on line 15
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/class_object/is_a_error_001.phpt b/ext/standard/tests/class_object/is_a_error_001.phpt
index d20016a495bd75fa3e671f0f232ec06316c2d313..f41c707b02aa69d9082d5c9c79cf32aa881a021f 100644 (file)
--- a/ext/standard/tests/class_object/is_a_error_001.phpt
+++ b/ext/standard/tests/class_object/is_a_error_001.phpt
@@ -34,13 +34,13 @@ echo "Done";
 
 Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 16
 
-Warning: Wrong parameter count for is_a() in %s on line 16
+Warning: is_a() expects exactly 2 parameters, 3 given in %s on line 16
 NULL
 
 -- Testing is_a() function with less than expected no. of arguments --
 
 Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 21
 
-Warning: Wrong parameter count for is_a() in %s on line 21
+Warning: is_a() expects exactly 2 parameters, 1 given in %s on line 21
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/class_object/is_a_variation_002.phpt b/ext/standard/tests/class_object/is_a_variation_002.phpt
index ed2c475de470e47305dbec9344701d7da83c4ec0..0ec87980e5f58f5b38c8979de4691027f1a60f79 100644 (file)
--- a/ext/standard/tests/class_object/is_a_variation_002.phpt
+++ b/ext/standard/tests/class_object/is_a_variation_002.phpt
@@ -90,136 +90,136 @@ Notice: Undefined variable: unset_var in %s on line 67
 
 Arg value 0 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value 1 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value 12345 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value -2345 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value 10.5 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value -10.5 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value 101234567000 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value 1.07654321E-9 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value 0.5 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value Array 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 
-Notice: Array to string conversion in %s on line 74
-bool(false)
+Warning: is_a() expects parameter 2 to be string, array given in %s on line %d
+NULL
 
 Arg value Array 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 
-Notice: Array to string conversion in %s on line 74
-bool(false)
+Warning: is_a() expects parameter 2 to be string, array given in %s on line %d
+NULL
 
 Arg value Array 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 
-Notice: Array to string conversion in %s on line 74
-bool(false)
+Warning: is_a() expects parameter 2 to be string, array given in %s on line %d
+NULL
 
 Arg value Array 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 
-Notice: Array to string conversion in %s on line 74
-bool(false)
+Warning: is_a() expects parameter 2 to be string, array given in %s on line %d
+NULL
 
 Arg value Array 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 
-Notice: Array to string conversion in %s on line 74
-bool(false)
+Warning: is_a() expects parameter 2 to be string, array given in %s on line %d
+NULL
 
 Arg value  
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value  
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value 1 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value  
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value 1 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value  
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value  
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value  
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value C Instance 
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value  
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 
 Arg value  
 
-Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line 74
+Deprecated: is_a(): Deprecated. Please use the instanceof operator in %s on line %d
 bool(false)
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt
index 4403bde4c0f6d803ddfefe2902aae9caca1690cb..bc657866d0f27137ba00b69e24cab642ad3139d4 100644 (file)
--- a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt
@@ -30,11 +30,11 @@ echo "Done";
 
 -- Testing is_subclass_of() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for is_subclass_of() in %s on line 16
+Warning: is_subclass_of() expects exactly 2 parameters, 3 given in %s on line 16
 NULL
 
 -- Testing is_subclass_of() function with less than expected no. of arguments --
 
-Warning: Wrong parameter count for is_subclass_of() in %s on line 21
+Warning: is_subclass_of() expects exactly 2 parameters, 1 given in %s on line 21
 NULL
 Done

diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt
index a45583ce6381ff1cda589e99acbab2a7d5f4e013..c550d8090c683476b2a40bfc4e8dfbb606509413 100644 (file)
--- a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt
@@ -115,24 +115,24 @@ Arg value 0.5
 bool(false)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(77)
-bool(false)
+Error: 2 - is_subclass_of() expects parameter 2 to be string, array given, %s(%d)
+NULL
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(77)
-bool(false)
+Error: 2 - is_subclass_of() expects parameter 2 to be string, array given, %s(%d)
+NULL
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(77)
-bool(false)
+Error: 2 - is_subclass_of() expects parameter 2 to be string, array given, %s(%d)
+NULL
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(77)
-bool(false)
+Error: 2 - is_subclass_of() expects parameter 2 to be string, array given, %s(%d)
+NULL
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(77)
-bool(false)
+Error: 2 - is_subclass_of() expects parameter 2 to be string, array given, %s(%d)
+NULL
 
 Arg value  
 bool(false)
@@ -157,12 +157,11 @@ bool(false)
 
 Arg value  
 bool(false)
-Error: 4096 - Object of class stdClass could not be converted to string, %s(76)
+Error: 4096 - Object of class stdClass could not be converted to string, %s(%d)
 
 Arg value  
-Error: 4096 - Object of class stdClass could not be converted to string, %s(77)
-Error: 8 - Object of class stdClass to string conversion, %s(77)
-bool(false)
+Error: 2 - is_subclass_of() expects parameter 2 to be string, object given, %s(%d)
+NULL
 
 Arg value  
 bool(false)

diff --git a/ext/standard/tests/class_object/method_exists_error_001.phpt b/ext/standard/tests/class_object/method_exists_error_001.phpt
index 203128c67798a42a3e3d61660620b7e88b802f76..929d84a76fc373efcfe2b68daeab1fc475f5bc70 100644 (file)
--- a/ext/standard/tests/class_object/method_exists_error_001.phpt
+++ b/ext/standard/tests/class_object/method_exists_error_001.phpt
@@ -30,11 +30,11 @@ echo "Done";
 
 -- Testing method_exists() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for method_exists() in %s on line 16
+Warning: method_exists() expects exactly 2 parameters, 3 given in %s on line 16
 NULL
 
 -- Testing method_exists() function with less than expected no. of arguments --
 
-Warning: Wrong parameter count for method_exists() in %s on line 21
+Warning: method_exists() expects exactly 2 parameters, 1 given in %s on line 21
 NULL
 Done

diff --git a/ext/standard/tests/class_object/method_exists_variation_002.phpt b/ext/standard/tests/class_object/method_exists_variation_002.phpt
index 54d0ef94f55472053c24668bb6f73e51049338bf..ba38894b535ab97f7ff9d6c5f4a45b88c616ec01 100644 (file)
--- a/ext/standard/tests/class_object/method_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/method_exists_variation_002.phpt
@@ -115,24 +115,24 @@ Arg value 0.5
 bool(false)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(77)
-bool(false)
+Error: 2 - method_exists() expects parameter 2 to be string, array given, %s(77)
+NULL
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(77)
-bool(false)
+Error: 2 - method_exists() expects parameter 2 to be string, array given, %s(77)
+NULL
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(77)
-bool(false)
+Error: 2 - method_exists() expects parameter 2 to be string, array given, %s(77)
+NULL
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(77)
-bool(false)
+Error: 2 - method_exists() expects parameter 2 to be string, array given, %s(77)
+NULL
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(77)
-bool(false)
+Error: 2 - method_exists() expects parameter 2 to be string, array given, %s(77)
+NULL
 
 Arg value  
 bool(false)
@@ -160,9 +160,8 @@ bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(76)
 
 Arg value  
-Error: 4096 - Object of class stdClass could not be converted to string, %s(77)
-Error: 8 - Object of class stdClass to string conversion, %s(77)
-bool(false)
+Error: 2 - method_exists() expects parameter 2 to be string, object given, %s(77)
+NULL
 
 Arg value  
 bool(false)

diff --git a/ext/standard/tests/general_functions/bug41970.phpt b/ext/standard/tests/general_functions/bug41970.phpt
index 17461a312ba3786b941876d125f049d584d122fa..4bce3ac7f731ffb6a907bf7ca38f580ebf297535 100644 (file)
--- a/ext/standard/tests/general_functions/bug41970.phpt
+++ b/ext/standard/tests/general_functions/bug41970.phpt
@@ -16,12 +16,12 @@ echo "Done\n";
 Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 5
 NULL
 
-Notice: Array to string conversion in %sbug41970.php on line 6
-int(5)
+Warning: strlen() expects parameter 1 to be string, array given in %sbug41970.php on line 6
+NULL
 
 Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 7
 NULL
 
-Notice: Array to string conversion in %sbug41970.php on line 8
-int(5)
+Warning: strlen() expects parameter 1 to be string, array given in %sbug41970.php on line 8
+NULL
 Done

diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt
index ee97998649365e08ee4f91e33831b59482d47f9b..33694f987b83e5bce7854c957bf6f3b5e1473ccc 100644 (file)
Binary files a/ext/standard/tests/strings/strcasecmp.phpt and b/ext/standard/tests/strings/strcasecmp.phpt differ

diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt
index b27da6c37d57dc0c082a023d4039e8baf45ab116..0693880119111e28445dc0973dc009fbfe8fb0fb 100644 (file)
Binary files a/ext/standard/tests/strings/strcmp.phpt and b/ext/standard/tests/strings/strcmp.phpt differ

diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt
index 1a9e5a11fdd3270d022260494ed8e2f1b05fdf55..913de5c58b5d7de98d6592a2e36dd9aea457a6e1 100644 (file)
Binary files a/ext/standard/tests/strings/strlen.phpt and b/ext/standard/tests/strings/strlen.phpt differ

diff --git a/ext/standard/tests/strings/strncasecmp_error.phpt b/ext/standard/tests/strings/strncasecmp_error.phpt
index 7282ea95412c32388c5c10c34058573ededde29d..7b2d19e616f93e704069c5ed3f5ddfaf498f7c69 100644 (file)
--- a/ext/standard/tests/strings/strncasecmp_error.phpt
+++ b/ext/standard/tests/strings/strncasecmp_error.phpt
@@ -32,18 +32,18 @@ echo "*** Done ***\n";
 *** Testing strncasecmp() function: error conditions ***
 
 -- Testing strncasecmp() function with Zero arguments --
-Warning: Wrong parameter count for strncasecmp() in %s on line %d
+Warning: strncasecmp() expects exactly 3 parameters, 0 given in %s on line %d
 NULL
 
 -- Testing strncasecmp() function with less than expected number of arguments --
-Warning: Wrong parameter count for strncasecmp() in %s on line %d
+Warning: strncasecmp() expects exactly 3 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for strncasecmp() in %s on line %d
+Warning: strncasecmp() expects exactly 3 parameters, 2 given in %s on line %d
 NULL
 
 -- Testing strncasecmp() function with more than expected number of arguments --
-Warning: Wrong parameter count for strncasecmp() in %s on line %d
+Warning: strncasecmp() expects exactly 3 parameters, 4 given in %s on line %d
 NULL
 
 -- Testing strncasecmp() function with invalid argument --

diff --git a/ext/standard/tests/strings/strncasecmp_variation10.phpt b/ext/standard/tests/strings/strncasecmp_variation10.phpt
index e06b2b26bfa05b7ad91fea296a09967b1637895d..adc9253964a351c16f47b928384391ba6c58c805 100644 (file)
--- a/ext/standard/tests/strings/strncasecmp_variation10.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation10.phpt
@@ -129,34 +129,34 @@ int(-%d)
 int(-%d)
 -- Iteration 15 --
 
-Notice: Array to string conversion in %s on line 88
+Warning: strlen() expects parameter 1 to be string, array given in %s on line 88
 
-Notice: Array to string conversion in %s on line 89
-int(-%d)
+Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line 89
+NULL
 -- Iteration 16 --
 
-Notice: Array to string conversion in %s on line 88
+Warning: strlen() expects parameter 1 to be string, array given in %s on line 88
 
-Notice: Array to string conversion in %s on line 89
-int(-%d)
+Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line 89
+NULL
 -- Iteration 17 --
 
-Notice: Array to string conversion in %s on line 88
+Warning: strlen() expects parameter 1 to be string, array given in %s on line 88
 
-Notice: Array to string conversion in %s on line 89
-int(-%d)
+Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line 89
+NULL
 -- Iteration 18 --
 
-Notice: Array to string conversion in %s on line 88
+Warning: strlen() expects parameter 1 to be string, array given in %s on line 88
 
-Notice: Array to string conversion in %s on line 89
-int(-%d)
+Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line 89
+NULL
 -- Iteration 19 --
 
-Notice: Array to string conversion in %s on line 88
+Warning: strlen() expects parameter 1 to be string, array given in %s on line 88
 
-Notice: Array to string conversion in %s on line 89
-int(-%d)
+Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line 89
+NULL
 -- Iteration 20 --
 int(-%d)
 -- Iteration 21 --
@@ -178,7 +178,11 @@ int(-%d)
 -- Iteration 29 --
 int(-%d)
 -- Iteration 30 --
-int(-%d)
+
+Warning: strlen() expects parameter 1 to be string, resource given in %s on line 88
+
+Warning: strncasecmp() expects parameter 1 to be string, resource given in %s on line 89
+NULL
 -- Iteration 31 --
 int(-%d)
 *** Done ***

diff --git a/ext/standard/tests/strings/strncasecmp_variation11.phpt b/ext/standard/tests/strings/strncasecmp_variation11.phpt
index f756c6c0060136b59e137b4f30610e8051ad459b..03cc8370776610fbce37f0b86a403d66d4be680f 100644 (file)
--- a/ext/standard/tests/strings/strncasecmp_variation11.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation11.phpt
@@ -130,34 +130,34 @@ int(%d)
 int(%d)
 -- Iteration 15 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-int(%d)
+Warning: strncasecmp() expects parameter 2 to be string, array given in %s on line %d
+NULL
 -- Iteration 16 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-int(%d)
+Warning: strncasecmp() expects parameter 2 to be string, array given in %s on line %d
+NULL
 -- Iteration 17 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-int(%d)
+Warning: strncasecmp() expects parameter 2 to be string, array given in %s on line %d
+NULL
 -- Iteration 18 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-int(%d)
+Warning: strncasecmp() expects parameter 2 to be string, array given in %s on line %d
+NULL
 -- Iteration 19 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-int(%d)
+Warning: strncasecmp() expects parameter 2 to be string, array given in %s on line %d
+NULL
 -- Iteration 20 --
 int(%d)
 -- Iteration 21 --
@@ -179,7 +179,11 @@ int(%d)
 -- Iteration 29 --
 int(%d)
 -- Iteration 30 --
-int(%d)
+
+Warning: strlen() expects parameter 1 to be string, resource given in %s on line %d
+
+Warning: strncasecmp() expects parameter 2 to be string, resource given in %s on line %d
+NULL
 -- Iteration 31 --
-int(%d)
+int(4)
 *** Done ***

diff --git a/ext/standard/tests/strings/strncasecmp_variation4.phpt b/ext/standard/tests/strings/strncasecmp_variation4.phpt
index 3f73aa35188120cf656e7506b6ac95919b6bae01..9d46db9ee13bdddd317718c5f1fa6083032c0446 100644 (file)
--- a/ext/standard/tests/strings/strncasecmp_variation4.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation4.phpt
@@ -130,44 +130,34 @@ int(0)
 int(0)
 -- Iteration 15 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-int(0)
+Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line %d
+NULL
 -- Iteration 16 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-int(0)
+Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line %d
+NULL
 -- Iteration 17 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-int(0)
+Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line %d
+NULL
 -- Iteration 18 --
 
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-int(0)
+Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line %d
+NULL
 -- Iteration 19 --
 
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-int(0)
+Warning: strncasecmp() expects parameter 1 to be string, array given in %s on line %d
+NULL
 -- Iteration 20 --
 int(0)
 -- Iteration 21 --
@@ -189,7 +179,11 @@ int(0)
 -- Iteration 29 --
 int(0)
 -- Iteration 30 --
-int(0)
+
+Warning: strlen() expects parameter 1 to be string, resource given in %s on line %d
+
+Warning: strncasecmp() expects parameter 1 to be string, resource given in %s on line %d
+NULL
 -- Iteration 31 --
 int(0)
 *** Done ***

diff --git a/ext/standard/tests/strings/strncasecmp_variation5.phpt b/ext/standard/tests/strings/strncasecmp_variation5.phpt
index 4a9fa89a7ce632c3d2a7497f2cd480d3281888f3..c391ba3e92a7a7c483eb71ae6ea6e6388d1a0c7a 100644 (file)
--- a/ext/standard/tests/strings/strncasecmp_variation5.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation5.phpt
@@ -109,15 +109,25 @@ int(0)
 -- Iteration 7 --
 int(0)
 -- Iteration 8 --
-int(0)
+
+Warning: strncasecmp() expects parameter 3 to be long, array given in %s on line %d
+NULL
 -- Iteration 9 --
-int(0)
+
+Warning: strncasecmp() expects parameter 3 to be long, array given in %s on line %d
+NULL
 -- Iteration 10 --
-int(0)
+
+Warning: strncasecmp() expects parameter 3 to be long, array given in %s on line %d
+NULL
 -- Iteration 11 --
-int(0)
+
+Warning: strncasecmp() expects parameter 3 to be long, array given in %s on line %d
+NULL
 -- Iteration 12 --
-int(0)
+
+Warning: strncasecmp() expects parameter 3 to be long, array given in %s on line %d
+NULL
 -- Iteration 13 --
 int(0)
 -- Iteration 14 --
@@ -131,17 +141,23 @@ int(0)
 -- Iteration 18 --
 int(0)
 -- Iteration 19 --
-int(0)
+
+Warning: strncasecmp() expects parameter 3 to be long, string given in %s on line %d
+NULL
 -- Iteration 20 --
-int(0)
+
+Warning: strncasecmp() expects parameter 3 to be long, string given in %s on line %d
+NULL
 -- Iteration 21 --
 int(0)
 -- Iteration 22 --
 int(0)
 -- Iteration 23 --
-int(0)
+
+Warning: strncasecmp() expects parameter 3 to be long, resource given in %s on line %d
+NULL
 -- Iteration 24 --
 
-Notice: Object of class sample could not be converted to int in %s on line %d
-int(0)
+Warning: strncasecmp() expects parameter 3 to be long, object given in %s on line %d
+NULL
 *** Done ***

diff --git a/ext/standard/tests/strings/strncmp_error.phpt b/ext/standard/tests/strings/strncmp_error.phpt
index 317a90406abae3ee884ecf4e40fdad5f52d6dceb..8e4d2805eb69091491c43ae1d69e6153632396aa 100644 (file)
--- a/ext/standard/tests/strings/strncmp_error.phpt
+++ b/ext/standard/tests/strings/strncmp_error.phpt
@@ -28,16 +28,16 @@ echo "*** Done ***\n";
 --EXPECTF--
 *** Testing strncmp() function: error conditions ***
 
-Warning: Wrong parameter count for strncmp() in %s on line %d
+Warning: strncmp() expects exactly 3 parameters, 0 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for strncmp() in %s on line %d
+Warning: strncmp() expects exactly 3 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for strncmp() in %s on line %d
+Warning: strncmp() expects exactly 3 parameters, 2 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for strncmp() in %s on line %d
+Warning: strncmp() expects exactly 3 parameters, 4 given in %s on line %d
 NULL
 
 Warning: Length must be greater than or equal to 0 in %s on line %d

diff --git a/ext/standard/tests/strings/strncmp_variation4.phpt b/ext/standard/tests/strings/strncmp_variation4.phpt
index 2af95e9b4981b3ce93471d2b98596428c94ea7fc..84684ea551e931b0f2577403eda51da87a79f369 100644 (file)
--- a/ext/standard/tests/strings/strncmp_variation4.phpt
+++ b/ext/standard/tests/strings/strncmp_variation4.phpt
@@ -133,44 +133,34 @@ int(0)
 int(0)
 -- Iteration 15 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-int(0)
+Warning: strncmp() expects parameter 1 to be string, array given in %s on line %d
+NULL
 -- Iteration 16 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-int(0)
+Warning: strncmp() expects parameter 1 to be string, array given in %s on line %d
+NULL
 -- Iteration 17 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-int(0)
+Warning: strncmp() expects parameter 1 to be string, array given in %s on line %d
+NULL
 -- Iteration 18 --
 
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-int(0)
+Warning: strncmp() expects parameter 1 to be string, array given in %s on line %d
+NULL
 -- Iteration 19 --
 
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
+Warning: strlen() expects parameter 1 to be string, array given in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-int(0)
+Warning: strncmp() expects parameter 1 to be string, array given in %s on line %d
+NULL
 -- Iteration 20 --
 int(0)
 -- Iteration 21 --
@@ -192,7 +182,11 @@ int(0)
 -- Iteration 29 --
 int(0)
 -- Iteration 30 --
-int(0)
+
+Warning: strlen() expects parameter 1 to be string, resource given in %s on line %d
+
+Warning: strncmp() expects parameter 1 to be string, resource given in %s on line %d
+NULL
 -- Iteration 31 --
 int(0)
 *** Done ***

diff --git a/ext/standard/tests/strings/strncmp_variation5.phpt b/ext/standard/tests/strings/strncmp_variation5.phpt
index cdb3afca194d62b640589d61263e447723466127..73d7e8f319991ced5291e29c47ee76f71f979376 100644 (file)
--- a/ext/standard/tests/strings/strncmp_variation5.phpt
+++ b/ext/standard/tests/strings/strncmp_variation5.phpt
@@ -123,15 +123,25 @@ int(0)
 -- Iteration 10 --
 int(0)
 -- Iteration 11 --
-int(0)
+
+Warning: strncmp() expects parameter 3 to be long, array given in%s on line %d
+NULL
 -- Iteration 12 --
-int(0)
+
+Warning: strncmp() expects parameter 3 to be long, array given in%s on line %d
+NULL
 -- Iteration 13 --
-int(0)
+
+Warning: strncmp() expects parameter 3 to be long, array given in%s on line %d
+NULL
 -- Iteration 14 --
-int(0)
+
+Warning: strncmp() expects parameter 3 to be long, array given in%s on line %d
+NULL
 -- Iteration 15 --
-int(0)
+
+Warning: strncmp() expects parameter 3 to be long, array given in%s on line %d
+NULL
 -- Iteration 16 --
 int(0)
 -- Iteration 17 --
@@ -145,17 +155,23 @@ int(0)
 -- Iteration 21 --
 int(0)
 -- Iteration 22 --
-int(0)
+
+Warning: strncmp() expects parameter 3 to be long, string given in%s on line %d
+NULL
 -- Iteration 23 --
-int(0)
+
+Warning: strncmp() expects parameter 3 to be long, string given in%s on line %d
+NULL
 -- Iteration 24 --
 int(0)
 -- Iteration 25 --
 int(0)
 -- Iteration 26 --
-int(0)
+
+Warning: strncmp() expects parameter 3 to be long, resource given in%s on line %d
+NULL
 -- Iteration 27 --
 
-Notice: Object of class sample could not be converted to int in %s on line %d
-int(0)
+Warning: strncmp() expects parameter 3 to be long, object given in%s on line %d
+NULL
 *** Done ***