From e88c5b082b4d0cf485efa5259ab29cfb5b284e52 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sat, 2 Feb 2008 03:00:57 +0000 Subject: [PATCH] Fix tests (new error message) --- .../tests/array/array_map_variation16.phpt | 16 ++++++++-------- .../tests/array/array_map_variation17.phpt | 4 ++-- ext/standard/tests/array/array_walk.phpt | 4 ++-- ext/standard/tests/array/array_walk_error1.phpt | 2 +- .../tests/array/array_walk_recursive1.phpt | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ext/standard/tests/array/array_map_variation16.phpt b/ext/standard/tests/array/array_map_variation16.phpt index 196bc39d2c..c4987cb385 100644 --- a/ext/standard/tests/array/array_map_variation16.phpt +++ b/ext/standard/tests/array/array_map_variation16.phpt @@ -40,34 +40,34 @@ echo "Done"; *** Testing array_map() : non-permmited built-in functions *** -- Iteration 1 -- -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 -- Iteration 2 -- -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 'array' not found or invalid function name in %s on line %d NULL -- Iteration 3 -- -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 'empty' not found or invalid function name in %s on line %d NULL -- Iteration 4 -- -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 'eval' not found or invalid function name in %s on line %d NULL -- Iteration 5 -- -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 'exit' not found or invalid function name in %s on line %d NULL -- Iteration 6 -- -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 'isset' not found or invalid function name in %s on line %d NULL -- Iteration 7 -- -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 'list' not found or invalid function name in %s on line %d NULL -- Iteration 8 -- -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 'print' not found or invalid function name in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt index 758487d966..18682f3286 100644 --- a/ext/standard/tests/array/array_map_variation17.phpt +++ b/ext/standard/tests/array/array_map_variation17.phpt @@ -129,11 +129,11 @@ Warning: array_map() expects parameter 1 to be a valid callback, no array or str NULL -- Iteration 14 -- -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 -- Iteration 15 -- -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 -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt index 4a693ac435..d3dcbaa204 100644 --- a/ext/standard/tests/array/array_walk.phpt +++ b/ext/standard/tests/array/array_walk.phpt @@ -34,10 +34,10 @@ echo "Done\n"; Warning: array_walk() expects at least 2 parameters, 0 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 -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 int(1) int(0) diff --git a/ext/standard/tests/array/array_walk_error1.phpt b/ext/standard/tests/array/array_walk_error1.phpt index 39092c5261..334dfe4ef7 100644 --- a/ext/standard/tests/array/array_walk_error1.phpt +++ b/ext/standard/tests/array/array_walk_error1.phpt @@ -43,6 +43,6 @@ Warning: array_walk() expects at least 2 parameters, 1 given in %s on line %d NULL -- Testing array_walk() function with non existent callback function -- -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 'non_existent' not found or invalid function name in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt index e5dfea06ab..6c10e5b78b 100644 --- a/ext/standard/tests/array/array_walk_recursive1.phpt +++ b/ext/standard/tests/array/array_walk_recursive1.phpt @@ -34,10 +34,10 @@ echo "Done\n"; Warning: array_walk_recursive() expects at least 2 parameters, 0 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 -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 int(1) int(0) -- 2.40.0