Fix tests (new error message)

diff --git a/ext/standard/tests/array/array_walk_recursive_error1.phpt b/ext/standard/tests/array/array_walk_recursive_error1.phpt
index 446b138cb8e57d7a0ff2e50523e069cc7d5d9ea7..182e2217bff6b8b6d76b84fdd8a485a5bbced5d2 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_error1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error1.phpt
@@ -58,6 +58,6 @@ Warning: array_walk_recursive() expects at least 2 parameters, 1 given in %s on
 NULL
 -- Testing array_walk_recursive() function with non existent callback function  --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/array_walk_recursive_variation2.phpt b/ext/standard/tests/array/array_walk_recursive_variation2.phpt
index 41afb9978c8314beaa7c90867c7bd66d4b016c05..f82e7a687bc500af6c542a895faed5450d13ec77 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation2.phpt
@@ -95,355 +95,355 @@ echo "Done"
 *** Testing array_walk_recursive() : unexpected values for 'funcname' argument ***
 -- Iteration 1 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 15 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 23 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 24 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 25 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
 --UEXPECTF--
 *** Testing array_walk_recursive() : unexpected values for 'funcname' argument ***
 -- Iteration 1 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 15 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 23 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 24 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 25 --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/array_walk_recursive_variation8.phpt b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
index 692aa96fb4bd4191cdfd29c0b93826299701f21b..2fab1ef7f52ae0f8f4ad67d9bcdeb41b3c3823c6 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
@@ -37,7 +37,7 @@ bool(true)
 bool(true)
 -- With 'echo' language construct --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -48,6 +48,6 @@ bool(true)
 bool(true)
 -- With 'echo' language construct --
 
-Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/array_walk_variation2.phpt b/ext/standard/tests/array/array_walk_variation2.phpt
index 7426d04aa73bde24cc2202c70f436cad9929ef41..633aa768f0d3a3b81c8c7cdad449fdea03e8dc4b 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation2.phpt
+++ b/ext/standard/tests/array/array_walk_variation2.phpt
@@ -95,355 +95,355 @@ echo "Done"
 *** Testing array_walk() : unexpected values for 'funcname' argument ***
 -- Iteration 1 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 15 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 23 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 24 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 25 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
 --UEXPECTF--
 *** Testing array_walk() : unexpected values for 'funcname' argument ***
 -- Iteration 1 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 15 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 23 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 24 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 25 --
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/array_walk_variation8.phpt b/ext/standard/tests/array/array_walk_variation8.phpt
index 2a718d24eaa44fac3ae4b2c8737a0442ee563956..43c6f866d539b5765c199ccf015eacdb59714e8c 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_variation8.phpt
@@ -37,7 +37,7 @@ bool(true)
 bool(true)
 -- With 'echo' language construct --
 
-Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -48,6 +48,6 @@ bool(true)
 bool(true)
 -- With 'echo' language construct --
 
-Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/uasort_error.phpt b/ext/standard/tests/array/uasort_error.phpt
index 8f24b77ec1c5897ed443a2c95ce982b23ef888b7..318a8a08b711299a9e348fe3af764170b21938ca 100644 (file)
--- a/ext/standard/tests/array/uasort_error.phpt
+++ b/ext/standard/tests/array/uasort_error.phpt
@@ -72,7 +72,7 @@ Warning: uasort() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 -- Testing uasort() function with non-existent compare function --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 -- Testing uasort() function with non-existent compare function and extra argument --
 
@@ -95,7 +95,7 @@ Warning: uasort() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 -- Testing uasort() function with non-existent compare function --
 
-Warning: uasort() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 -- Testing uasort() function with non-existent compare function and extra argument --
 

diff --git a/ext/standard/tests/array/uasort_variation2.phpt b/ext/standard/tests/array/uasort_variation2.phpt
index c7e8025f59bf9cfd786ed21957ea8ae357e1e8e6..79f9d9fd87f17de82a610ac0f47f2bc332416dcb 100644 (file)
--- a/ext/standard/tests/array/uasort_variation2.phpt
+++ b/ext/standard/tests/array/uasort_variation2.phpt
@@ -100,229 +100,229 @@ echo "Done"
 *** Testing uasort() : Unexpected values in place of comparison function ***
 -- Iteration 1 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 -- Iteration 15 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 23 --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'string' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 24 --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'string' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 25 --
 
-Warning: uasort() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 26 --
 
-Warning: uasort() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 27 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 28 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
 --UEXPECTF--
 *** Testing uasort() : Unexpected values in place of comparison function ***
 -- Iteration 1 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 -- Iteration 15 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: uasort() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: uasort() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 23 --
 
-Warning: uasort() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'string' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 24 --
 
-Warning: uasort() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'string' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 25 --
 
-Warning: uasort() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 26 --
 
-Warning: uasort() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 27 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 28 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done

diff --git a/ext/standard/tests/array/uasort_variation8.phpt b/ext/standard/tests/array/uasort_variation8.phpt
index 82fc1533a6a80f6962e28f9aefe62294b934a76c..bca6855fe0ada288c99a6a35aca33444ebf42354 100644 (file)
--- a/ext/standard/tests/array/uasort_variation8.phpt
+++ b/ext/standard/tests/array/uasort_variation8.phpt
@@ -69,11 +69,11 @@ array(5) {
 }
 -- Testing uasort() with language construct as 'cmp_function' --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 -- Testing uasort() with language construct as 'cmp_function' --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -108,10 +108,10 @@ array(5) {
 }
 -- Testing uasort() with language construct as 'cmp_function' --
 
-Warning: uasort() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 -- Testing uasort() with language construct as 'cmp_function' --
 
-Warning: uasort() expects parameter 2 to be valid callback, Unicode string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d
 NULL
 Done