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 365771c614f5f9b23465b60967b7eef7e1fb8af4..75966e8833f3287455f8f5d052848418541e979f 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_error1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error1.phpt
@@ -44,6 +44,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, 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 12bddb490ed64ea5bc07a1bca3a1e4d6a4b0c096..bef44b59ad6dbb89c148c9138a818800da8bf299 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation2.phpt
@@ -92,177 +92,177 @@ 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, first array member is not a valid class name or object 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, first array member is not a valid class name or object 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

diff --git a/ext/standard/tests/array/array_walk_recursive_variation8.phpt b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
index 605f3d0bab0943ccfdc389ca25f18112db37bd23..671fcdb375b5a256f80958e034de68eb694bea39 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
@@ -37,6 +37,6 @@ 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