felipe          Mon Feb  4 12:37:15 2008 UTC

  Modified files:              
    /php-src/ext/standard/tests/general_functions       bug32647.phpt 
                                                        010.phpt 
    /php-src/ext/standard/tests/array   array_map_object2.phpt 
                                        array_map_object3.phpt 
                                        array_map_variation12.phpt 
                                        array_map_variation14.phpt 
                                        array_map_variation15.phpt 
                                        array_map_variation16.phpt 
                                        array_map_variation17.phpt 
                                        array_walk_error1.phpt 
                                        array_walk.phpt 
                                        array_walk_recursive1.phpt 
  Log:
  Fix tests (new error message)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug32647.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug32647.phpt
diff -u php-src/ext/standard/tests/general_functions/bug32647.phpt:1.3 
php-src/ext/standard/tests/general_functions/bug32647.phpt:1.4
--- php-src/ext/standard/tests/general_functions/bug32647.phpt:1.3      Fri Sep 
14 15:04:46 2007
+++ php-src/ext/standard/tests/general_functions/bug32647.phpt  Mon Feb  4 
12:37:14 2008
@@ -49,13 +49,13 @@
 
 Warning: register_shutdown_function(): Invalid shutdown callback 'bar' passed 
in %s on line %d
 
-Strict Standards: Non-static method bar::barfoo() cannot be called statically 
in %sbug32647.php on line %d
+Strict Standards: Non-static method bar::barfoo() should not be called 
statically in %s on line %d
 
-Warning: register_shutdown_function(): Invalid shutdown callback 'bar::foobar' 
passed in %sbug32647.php on line %d
+Warning: register_shutdown_function(): Invalid shutdown callback 'bar::foobar' 
passed in %s on line %d
 foo!
 
-Strict Standards: Non-static method bar::barfoo() cannot be called statically 
in Unknown on line 0
+Strict Standards: Non-static method bar::barfoo() should not be called 
statically in Unknown on line 0
 
-Strict Standards: Non-static method bar::barfoo() cannot be called statically 
in Unknown on line 0
+Strict Standards: Non-static method bar::barfoo() should not be called 
statically in Unknown on line 0
 bar!
 bar!
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/010.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/010.phpt
diff -u php-src/ext/standard/tests/general_functions/010.phpt:1.1 
php-src/ext/standard/tests/general_functions/010.phpt:1.2
--- php-src/ext/standard/tests/general_functions/010.phpt:1.1   Fri Sep 15 
09:11:31 2006
+++ php-src/ext/standard/tests/general_functions/010.phpt       Mon Feb  4 
12:37:14 2008
@@ -15,11 +15,5 @@
 
 echo "Done\n";
 ?>
---EXPECTF--    
-Strict Standards: Non-static method test::__call() cannot be called statically 
in %s on line %d
-NULL
-Done
-
-Strict Standards: Non-static method test::__call() cannot be called statically 
in Unknown on line 0
-
-Fatal error: Non-static method test::__call() cannot be called statically in 
Unknown on line 0
+--EXPECTF--
+Fatal error: Non-static method test::__call() cannot be called statically in 
%s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_object2.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_object2.phpt
diff -u php-src/ext/standard/tests/array/array_map_object2.phpt:1.1 
php-src/ext/standard/tests/array/array_map_object2.phpt:1.2
--- php-src/ext/standard/tests/array/array_map_object2.phpt:1.1 Thu Jan  3 
09:35:11 2008
+++ php-src/ext/standard/tests/array/array_map_object2.phpt     Mon Feb  4 
12:37:15 2008
@@ -37,21 +37,21 @@
 *** Testing array_map() :  with non-existent class and method ***
 -- with non-existent class --
 
-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, first array 
member is not a valid class name in %s on line %d
 NULL
 -- with existent class and non-existent method --
 
-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, class 
'SimpleClass' does not have a method 'non-existent' in %s on line %d
 NULL
 Done
 --UEXPECTF--
 *** Testing array_map() :  with non-existent class and method ***
 -- with non-existent class --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, first array 
member is not a valid class name in %s on line %d
 NULL
 -- with existent class and non-existent method --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, class 
'SimpleClass' does not have a method 'non-existent' in %s on line %d
 NULL
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_object3.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_object3.phpt
diff -u php-src/ext/standard/tests/array/array_map_object3.phpt:1.1 
php-src/ext/standard/tests/array/array_map_object3.phpt:1.2
--- php-src/ext/standard/tests/array/array_map_object3.phpt:1.1 Thu Jan  3 
09:35:11 2008
+++ php-src/ext/standard/tests/array/array_map_object3.phpt     Mon Feb  4 
12:37:15 2008
@@ -74,7 +74,7 @@
 }
 -- accessing child method from parent class --
 
-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, class 
'ParentClass' does not have a method 'staticchild' in %s on line %d
 NULL
 -- accessing parent method using child class object --
 array(3) {
@@ -87,7 +87,7 @@
 }
 -- accessing child method using parent class object --
 
-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, class 
'ParentClass' does not have a method 'staticchild' in %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -103,7 +103,7 @@
 }
 -- accessing child method from parent class --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, class 
'ParentClass' does not have a method 'staticchild' in %s on line %d
 NULL
 -- accessing parent method using child class object --
 array(3) {
@@ -116,6 +116,6 @@
 }
 -- accessing child method using parent class object --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, class 
'ParentClass' does not have a method 'staticchild' in %s on line %d
 NULL
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_variation12.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_variation12.phpt
diff -u php-src/ext/standard/tests/array/array_map_variation12.phpt:1.1 
php-src/ext/standard/tests/array/array_map_variation12.phpt:1.2
--- php-src/ext/standard/tests/array/array_map_variation12.phpt:1.1     Thu Jan 
 3 09:35:11 2008
+++ php-src/ext/standard/tests/array/array_map_variation12.phpt Mon Feb  4 
12:37:15 2008
@@ -40,11 +40,11 @@
 }
 -- 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,7 +55,7 @@
 }
 -- 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
 --UEXPECTF--
@@ -86,6 +86,6 @@
 }
 -- with language construct --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string 
given in %s on line %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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_variation14.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_variation14.phpt
diff -u php-src/ext/standard/tests/array/array_map_variation14.phpt:1.1 
php-src/ext/standard/tests/array/array_map_variation14.phpt:1.2
--- php-src/ext/standard/tests/array/array_map_variation14.phpt:1.1     Thu Jan 
 3 09:35:11 2008
+++ php-src/ext/standard/tests/array/array_map_variation14.phpt Mon Feb  4 
12:37:15 2008
@@ -116,11 +116,11 @@
 }
 -- 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 '' 
not found or invalid function name in %s on line %d
 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 %s on line %d
 NULL
 Done
 --UEXPECTF--
@@ -132,7 +132,7 @@
     [0]=>
     int(1)
     [1]=>
-    unicode(3) "one"
+    string(3) "one"
     [2]=>
     float(1.1)
   }
@@ -141,7 +141,7 @@
     [0]=>
     int(2)
     [1]=>
-    unicode(3) "two"
+    string(3) "two"
     [2]=>
     float(2.2)
   }
@@ -152,7 +152,7 @@
     [0]=>
     int(1)
     [1]=>
-    unicode(3) "one"
+    string(3) "one"
     [2]=>
     float(1.1)
   }
@@ -161,7 +161,7 @@
     [0]=>
     int(2)
     [1]=>
-    unicode(3) "two"
+    string(3) "two"
     [2]=>
     float(2.2)
   }
@@ -173,7 +173,7 @@
     [0]=>
     int(1)
     [1]=>
-    unicode(3) "one"
+    string(3) "one"
     [2]=>
     float(1.1)
   }
@@ -182,7 +182,7 @@
     [0]=>
     int(2)
     [1]=>
-    unicode(3) "two"
+    string(3) "two"
     [2]=>
     float(2.2)
   }
@@ -196,10 +196,10 @@
 }
 -- with empty string --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string 
given 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 --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, array must 
have exactly two members in %s on line %d
 NULL
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_variation15.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_variation15.phpt
diff -u php-src/ext/standard/tests/array/array_map_variation15.phpt:1.1 
php-src/ext/standard/tests/array/array_map_variation15.phpt:1.2
--- php-src/ext/standard/tests/array/array_map_variation15.phpt:1.1     Thu Jan 
 3 09:35:11 2008
+++ php-src/ext/standard/tests/array/array_map_variation15.phpt Mon Feb  4 
12:37:15 2008
@@ -25,12 +25,12 @@
 --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
 --UEXPECTF--
 *** Testing array_map() : non existent 'callback' function ***
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string 
given in %s on line %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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_variation16.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_variation16.phpt
diff -u php-src/ext/standard/tests/array/array_map_variation16.phpt:1.1 
php-src/ext/standard/tests/array/array_map_variation16.phpt:1.2
--- php-src/ext/standard/tests/array/array_map_variation16.phpt:1.1     Thu Jan 
 3 09:35:11 2008
+++ php-src/ext/standard/tests/array/array_map_variation16.phpt Mon Feb  4 
12:37:15 2008
@@ -40,69 +40,69 @@
 *** 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
 --UEXPECTF--
 *** Testing array_map() : non-permmited built-in functions ***
 -- Iteration 1 --
 
-Warning: array_map() expects parameter 1 to be valid callback, Unicode string 
given in %s on line %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, Unicode string 
given in %s on line %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, Unicode string 
given in %s on line %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, Unicode string 
given in %s on line %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, Unicode string 
given in %s on line %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, Unicode string 
given in %s on line %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, Unicode string 
given in %s on line %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, Unicode string 
given in %s on line %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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_variation17.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_map_variation17.phpt
diff -u php-src/ext/standard/tests/array/array_map_variation17.phpt:1.1 
php-src/ext/standard/tests/array/array_map_variation17.phpt:1.2
--- php-src/ext/standard/tests/array/array_map_variation17.phpt:1.1     Thu Jan 
 3 09:35:11 2008
+++ php-src/ext/standard/tests/array/array_map_variation17.phpt Mon Feb  4 
12:37:15 2008
@@ -77,165 +77,165 @@
 *** 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 '' 
not found or invalid function name in %s on line %d
 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 '' 
not found or invalid function name in %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 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 %s on line %d
 NULL
 Done
 --UEXPECTF--
 *** 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
+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 valid callback, integer given 
in %s on line %d
+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 valid callback, integer given 
in %s on line %d
+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 valid callback, integer given 
in %s on line %d
+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 valid callback, double given in 
%s on line %d
+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 valid callback, double given in 
%s on line %d
+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 valid callback, double given in 
%s on line %d
+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 valid callback, double given in 
%s on line %d
+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 valid callback, double given in 
%s on line %d
+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 valid callback, boolean given 
in %s on line %d
+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 valid callback, boolean given 
in %s on line %d
+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 valid callback, boolean given 
in %s on line %d
+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 valid callback, boolean given 
in %s on line %d
+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 valid callback, Unicode string 
given 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 valid callback, Unicode string 
given 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 --
-Warning: array_map() expects parameter 1 to be valid callback, array given in 
%s on line %d
+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 valid callback, array given in 
%s on line %d
+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 valid callback, array given in 
%s on line %d
+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 valid callback, object given in 
%s on line %d
+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 valid callback, resource given 
in %s on line %d
+Warning: array_map() expects parameter 1 to be a valid callback, no array or 
string given in %s on line %d
 NULL
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_error1.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk_error1.phpt
diff -u php-src/ext/standard/tests/array/array_walk_error1.phpt:1.2 
php-src/ext/standard/tests/array/array_walk_error1.phpt:1.3
--- php-src/ext/standard/tests/array/array_walk_error1.phpt:1.2 Mon Dec 17 
13:00:52 2007
+++ php-src/ext/standard/tests/array/array_walk_error1.phpt     Mon Feb  4 
12:37:15 2008
@@ -43,7 +43,7 @@
 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
 --UEXPECTF--
@@ -58,6 +58,6 @@
 NULL
 -- Testing array_walk() function with non existent callback function  --
 
-Warning: array_walk() expects parameter 2 to be valid callback, Unicode 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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk.phpt
diff -u php-src/ext/standard/tests/array/array_walk.phpt:1.2 
php-src/ext/standard/tests/array/array_walk.phpt:1.3
--- php-src/ext/standard/tests/array/array_walk.phpt:1.2        Tue Sep 19 
09:33:02 2006
+++ php-src/ext/standard/tests/array/array_walk.phpt    Mon Feb  4 12:37:15 2008
@@ -34,10 +34,10 @@
 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)
@@ -52,10 +52,10 @@
 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, Unicode 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)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_recursive1.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_walk_recursive1.phpt
diff -u php-src/ext/standard/tests/array/array_walk_recursive1.phpt:1.2 
php-src/ext/standard/tests/array/array_walk_recursive1.phpt:1.3
--- php-src/ext/standard/tests/array/array_walk_recursive1.phpt:1.2     Tue Sep 
19 09:33:02 2006
+++ php-src/ext/standard/tests/array/array_walk_recursive1.phpt Mon Feb  4 
12:37:15 2008
@@ -34,10 +34,10 @@
 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)
@@ -58,10 +58,10 @@
 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, 
Unicode 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)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to