From 315f534c0241d980d9768037037a447201d12c03 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Sat, 2 Feb 2008 01:40:45 +0000
Subject: [PATCH] Fix tests (new error message)

---
 .../tests/array/array_map_variation14.phpt    |  4 +-
 .../tests/array/array_map_variation17.phpt    | 40 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ext/standard/tests/array/array_map_variation14.phpt b/ext/standard/tests/array/array_map_variation14.phpt
index 0a0eb15551..59366799d3 100644
--- a/ext/standard/tests/array/array_map_variation14.phpt
+++ b/ext/standard/tests/array/array_map_variation14.phpt
@@ -116,10 +116,10 @@ array(2) {
 }
 -- with empty string --
 
-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 '(null)' not found or invalid function name in /home/felipe/php5/ext/standard/tests/array/array_map_variation14.php on line 36
 NULL
 -- with empty array --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members in /home/felipe/php5/ext/standard/tests/array/array_map_variation14.php on line 39
 NULL
 Done
diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt
index d0427e81cd..0fa5d13ed8 100644
--- a/ext/standard/tests/array/array_map_variation17.phpt
+++ b/ext/standard/tests/array/array_map_variation17.phpt
@@ -77,82 +77,82 @@ echo "Done";
 *** Testing array_map() : unexpected values for 'callback' argument ***
 
 -- Iteration 1 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 2 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 3 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 4 --
-Warning: array_map() expects parameter 1 to be valid callback, integer given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 5 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 6 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 7 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 8 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 9 --
-Warning: array_map() expects parameter 1 to be valid callback, double given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 10 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 11 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 12 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 13 --
-Warning: array_map() expects parameter 1 to be valid callback, boolean given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 14 --
-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 '(null)' not found or invalid function name in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 15 --
-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 '(null)' not found or invalid function name in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 16 --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 17 --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, second array member is not a valid method in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 18 --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, second array member is not a valid method in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 19 --
-Warning: array_map() expects parameter 1 to be valid callback, object given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 
 -- Iteration 20 --
-Warning: array_map() expects parameter 1 to be valid callback, resource given in %s on line %d%d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
 NULL
 Done
-- 
2.40.0