From: Rasmus Lerdorf <rasmus@php.net>
Date: Sat, 2 Feb 2008 01:31:18 +0000 (+0000)
Subject: Fix a few more tests
X-Git-Tag: RELEASE_1_3_1~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54e98bbb9765bcdfc5b5ba631be4dcd9a6a4a80e;p=php

Fix a few more tests
---

diff --git a/ext/standard/tests/array/array_filter_error.phpt b/ext/standard/tests/array/array_filter_error.phpt
index eb95c4183c..20e89aa4b7 100644
--- a/ext/standard/tests/array/array_filter_error.phpt
+++ b/ext/standard/tests/array/array_filter_error.phpt
@@ -45,6 +45,6 @@ NULL
 Warning: array_filter() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 -- Testing array_filter() function with incorrect callback --
-Warning: array_filter() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 'even' not found or invalid function name in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_filter_variation2.phpt b/ext/standard/tests/array/array_filter_variation2.phpt
index 1b5c2cc029..6cb05e1055 100644
--- a/ext/standard/tests/array/array_filter_variation2.phpt
+++ b/ext/standard/tests/array/array_filter_variation2.phpt
@@ -98,87 +98,87 @@ echo "Done"
 --EXPECTF--
 *** Testing array_filter() : usage variations - unexpected values for 'callback' function***
 -- Iteration 1 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 2 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 3 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 4 --
-Warning: array_filter() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 5 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 6 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 7 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 8 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 9 --
-Warning: array_filter() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 10 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 11 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 12 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 13 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 -- Iteration 14 --
-Warning: array_filter() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
 NULL
 -- Iteration 15 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 16 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 17 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 18 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 19 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 20 --
-Warning: array_filter() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 21 --
-Warning: array_filter() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 22 --
-Warning: array_filter() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 23 --
-Warning: array_filter() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 'string' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 24 --
-Warning: array_filter() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 'string' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 25 --
-Warning: array_filter() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 26 --
-Warning: array_filter() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 27 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 28 --
-Warning: array_filter() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/array_filter_variation9.phpt b/ext/standard/tests/array/array_filter_variation9.phpt
index cb7d8ed9c2..81554f13e1 100644
--- a/ext/standard/tests/array/array_filter_variation9.phpt
+++ b/ext/standard/tests/array/array_filter_variation9.phpt
@@ -64,9 +64,9 @@ array(8) {
   NULL
 }
 
-Warning: array_filter() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 
-Warning: array_filter() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: array_filter() expects parameter 2 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d
 NULL
 Done