From: Felipe Pena <felipe@php.net>
Date: Sat, 2 Feb 2008 01:48:29 +0000 (+0000)
Subject: Ops, fix the fix
X-Git-Tag: RELEASE_1_3_1~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17e1a396c1adafea604f70aa5db5a8025decd0ec;p=php

Ops, fix the fix
---

diff --git a/ext/standard/tests/array/array_map_variation14.phpt b/ext/standard/tests/array/array_map_variation14.phpt
index 59366799d3..8177a34819 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 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
+Warning: array_map() expects parameter 1 to be a valid callback, function '(null)' not found or invalid function name in %s on line %d
 NULL
 -- with empty array --
 
-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
+Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members 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 0fa5d13ed8..758487d966 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 a valid callback, no array or string given in /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 2 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 3 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 4 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 5 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 6 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 7 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 8 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 9 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 10 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 11 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 12 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 13 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 14 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, function '(null)' 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 /home/felipe/php5/ext/standard/tests/array/array_map_variation17.php on line 67
+Warning: array_map() expects parameter 1 to be a valid callback, function '(null)' not found or invalid function name in %s on line %d
 NULL
 
 -- Iteration 16 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
 -- Iteration 17 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
 -- Iteration 18 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
 -- Iteration 19 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 
 -- Iteration 20 --
-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
+Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done