Fix tests (new error message)

diff --git a/ext/standard/tests/array/array_map_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt
index 7b8a2e0b09fb3a389749935b3b865ed285aaa8b8..5c6d9fb97a69ad0d6b457e5f2fc8cb9d608dd0c0 100644 (file)
--- a/ext/standard/tests/array/array_map_variation12.phpt
+++ b/ext/standard/tests/array/array_map_variation12.phpt
@@ -40,11 +40,11 @@ array(3) {
 }
 -- with built-in function 'pow' and one parameter --
 
-Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d%d
+Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d
 
-Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d%d
+Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d
 
-Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d%d
+Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d
 array(3) {
   [0]=>
   NULL
@@ -55,6 +55,6 @@ array(3) {
 }
 -- with language construct --
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 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_map_variation14.phpt b/ext/standard/tests/array/array_map_variation14.phpt
index 8177a348191602f3ed388e0558a333349828bc30..771d3f949ef0b4ff20492e7984943768ddb6d45e 100644 (file)
--- a/ext/standard/tests/array/array_map_variation14.phpt
+++ b/ext/standard/tests/array/array_map_variation14.phpt
@@ -116,7 +116,7 @@ array(2) {
 }
 -- with empty string --
 
-Warning: array_map() expects parameter 1 to be a valid callback, function '(null)' not found or invalid function name in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- with empty array --
 

diff --git a/ext/standard/tests/array/array_map_variation15.phpt b/ext/standard/tests/array/array_map_variation15.phpt
index c7be3b7dedb84c20b7b62d2f4a37288d65378c97..b29af47713ffb42182521a39671ddaa8c3c7a4ed 100644 (file)
--- a/ext/standard/tests/array/array_map_variation15.phpt
+++ b/ext/standard/tests/array/array_map_variation15.phpt
@@ -25,6 +25,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_map() : non existent 'callback' function ***
 
-Warning: array_map() expects parameter 1 to be valid callback, string given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 Done