From 0588ddce2a8268cf3a6249983cdcfef4477b6263 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Sat, 2 Feb 2008 02:29:27 +0000
Subject: [PATCH] Fix tests (new error message)

---
 ext/standard/tests/array/uasort_error.phpt    |  2 +-
 .../tests/array/uasort_variation2.phpt        | 57 +++++++++----------
 .../tests/array/uasort_variation8.phpt        |  4 +-
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/ext/standard/tests/array/uasort_error.phpt b/ext/standard/tests/array/uasort_error.phpt
index ed69b482f4..820ab58478 100644
--- a/ext/standard/tests/array/uasort_error.phpt
+++ b/ext/standard/tests/array/uasort_error.phpt
@@ -72,7 +72,7 @@ Warning: uasort() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 -- Testing uasort() function with non-existent compare function --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 -- Testing uasort() function with non-existent compare function and extra argument --
 
diff --git a/ext/standard/tests/array/uasort_variation2.phpt b/ext/standard/tests/array/uasort_variation2.phpt
index a1cfcfebdc..c106c1dfa0 100644
--- a/ext/standard/tests/array/uasort_variation2.phpt
+++ b/ext/standard/tests/array/uasort_variation2.phpt
@@ -99,115 +99,114 @@ echo "Done"
 *** Testing uasort() : Unexpected values in place of comparison function ***
 -- Iteration 1 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: uasort() expects parameter 2 to be valid callback, integer given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 6 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 7 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 8 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 9 --
 
-Warning: uasort() expects parameter 2 to be valid callback, double given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 10 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() 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: uasort() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: uasort() 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: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 16 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 17 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 18 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 19 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 20 --
 
-Warning: uasort() expects parameter 2 to be valid callback, boolean given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 21 --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 22 --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
 NULL
 -- Iteration 23 --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() 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: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() 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: uasort() expects parameter 2 to be valid callback, object given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 26 --
 
-Warning: uasort() expects parameter 2 to be valid callback, resource given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 27 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 -- Iteration 28 --
 
-Warning: uasort() expects parameter 2 to be valid callback, null given in %s on line %d
+Warning: uasort() 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/uasort_variation8.phpt b/ext/standard/tests/array/uasort_variation8.phpt
index c16b1f476d..dd0a7a3913 100644
--- a/ext/standard/tests/array/uasort_variation8.phpt
+++ b/ext/standard/tests/array/uasort_variation8.phpt
@@ -69,10 +69,10 @@ array(5) {
 }
 -- Testing uasort() with language construct as 'cmp_function' --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 -- Testing uasort() with language construct as 'cmp_function' --
 
-Warning: uasort() expects parameter 2 to be valid callback, string given in %s on line %d
+Warning: uasort() expects parameter 2 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d
 NULL
 Done
-- 
2.50.1