Fix tests (new error message)

diff --git a/ext/spl/tests/bug38325.phpt b/ext/spl/tests/bug38325.phpt
index 126e1f3c023f263b8a7fd12f396b53446f360f9b..0e838640566ae945840196418ea187df872eacbb 100644 (file)
--- a/ext/spl/tests/bug38325.phpt
+++ b/ext/spl/tests/bug38325.phpt
@@ -8,4 +8,4 @@ spl_autoload_register();
 new Foo();
 ?>
 --EXPECTF--
-Fatal error: spl_autoload(): Class Foo could not be loaded in %s on line 3
+Fatal error: Class 'Foo' not found in %s on line %d

diff --git a/ext/sqlite/tests/sqlite_oo_030.phpt b/ext/sqlite/tests/sqlite_oo_030.phpt
index 023fe72b748145c6f1d9332490525890afee41fb..07ce84f9d6e25a573879302557e865240bd87fc0 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_030.phpt
+++ b/ext/sqlite/tests/sqlite_oo_030.phpt
@@ -39,7 +39,9 @@ NULL
 string(1) "1"
 string(3) "PHP"
 
-Fatal error: Call to undefined method foo::bar("php")() in %ssqlite_oo_030.php on line %d
+Warning: SQLiteDatabase::singleQuery(): function `foo::bar("PHP")' is not a function name in %s on line %d
+bool(false)
+===DONE===
 --UEXPECTF--
 NULL
 unicode(1) "1"
@@ -48,4 +50,6 @@ NULL
 unicode(1) "1"
 unicode(3) "PHP"
 
-Fatal error: Call to undefined method foo::bar("php")() in %ssqlite_oo_030.php on line %d
+Warning: SQLiteDatabase::singleQuery(): function `foo::bar("PHP")' is not a function name in %s on line %d
+bool(false)
+===DONE===

diff --git a/ext/standard/tests/array/array_filter.phpt b/ext/standard/tests/array/array_filter.phpt
index b57ec6e515210f62c41a15a0b4e35d050eb24f45..21be6e9c417c8e4490a2c792d56f8aa9fc084f8a 100644 (file)
--- a/ext/standard/tests/array/array_filter.phpt
+++ b/ext/standard/tests/array/array_filter.phpt
@@ -82,13 +82,13 @@ array(2) {
 array(0) {
 }
 
-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
 
 Warning: array_filter() expects parameter 1 to be array, string given in %s on line %d
 NULL
 
-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
 == DONE ==
 --UEXPECTF--
@@ -141,12 +141,12 @@ array(2) {
 array(0) {
 }
 
-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
 
-Warning: array_filter() expects parameter 1 to be array, Unicode string given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, string given in %s on line %d
 NULL
 
-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
 == DONE ==

diff --git a/ext/standard/tests/array/array_filter_error.phpt b/ext/standard/tests/array/array_filter_error.phpt
index 3e19da185b20018bfd755e716e2015a6a62843d6..d898056750c6117092ff20de23ccd4151ab32e18 100644 (file)
--- a/ext/standard/tests/array/array_filter_error.phpt
+++ b/ext/standard/tests/array/array_filter_error.phpt
@@ -45,7 +45,7 @@ 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
 --UEXPECTF--
@@ -57,6 +57,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, Unicode 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 d08e58f11591819b5bcac5799b9ac3979ec1697d..50041ed58429fd949fa4a9cfac663ec6fe12809e 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation2.phpt
+++ b/ext/standard/tests/array/array_filter_variation2.phpt
@@ -98,174 +98,174 @@ 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
 --UEXPECTF--
 *** 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, Unicode 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, Unicode 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, Unicode 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, Unicode 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 6bbef515ef99c1b30e5b464baad0e00b7bb62121..9d6c645f4e098f4a77aa75d57d91b8b74d276ee2 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation9.phpt
+++ b/ext/standard/tests/array/array_filter_variation9.phpt
@@ -64,10 +64,10 @@ 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
 --UEXPECTF--
@@ -105,9 +105,9 @@ array(8) {
   NULL
 }
 
-Warning: array_filter() expects parameter 2 to be valid callback, Unicode 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, Unicode 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

diff --git a/ext/standard/tests/array/array_intersect_variation9.phpt b/ext/standard/tests/array/array_intersect_variation9.phpt
index b2ab13638348fb52e93130dad46cf54d41a8ab86..0fec5cc9f1830b9a51a29a3e705982ccc8f77c0a 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation9.phpt
+++ b/ext/standard/tests/array/array_intersect_variation9.phpt
@@ -71,6 +71,30 @@ Notice: Array to string conversion in %s on line %d
 
 Notice: Array to string conversion in %s on line %d
 
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
 Notice: Array to string conversion in %s on line %d
 array(4) {
   [0]=>
@@ -136,6 +160,41 @@ Notice: Array to string conversion in %s on line %d
 
 Notice: Array to string conversion in %s on line %d
 
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
 array(4) {
   [0]=>
   array(4) {
@@ -209,6 +268,30 @@ Notice: Array to string conversion in %s on line %d
 
 Notice: Array to string conversion in %s on line %d
 
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
 Notice: Array to string conversion in %s on line %d
 array(4) {
   [0]=>
@@ -272,6 +355,42 @@ Notice: Array to string conversion in %s on line %d
 
 Notice: Array to string conversion in %s on line %d
 
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
+Notice: Array to string conversion in %s on line %d
+
 Notice: Array to string conversion in %s on line %d
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/array_map_object1.phpt b/ext/standard/tests/array/array_map_object1.phpt
index f3bac6e080178013b61cfd12a1953a274494b7d3..b508e9d6ba47e714b80fd0e45fbabbab6aa8c2c2 100644 (file)
--- a/ext/standard/tests/array/array_map_object1.phpt
+++ b/ext/standard/tests/array/array_map_object1.phpt
@@ -121,30 +121,57 @@ echo "Done";
 *** Testing array_map() : object functionality ***
 -- simple class with public variable and method --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, non-static method SimpleClass::square() should not be called statically in %s on line %d
+
+Strict Standards: Non-static method SimpleClass::square() should not be called statically in %s on line %d
+
+Strict Standards: Non-static method SimpleClass::square() should not be called statically in %s on line %d
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(4)
+}
 
 -- simple class with private variable and 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, cannot access private method SimpleClassPri::add() in %s on line %d
 NULL
 
 -- simple class with protected variable and 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, cannot access protected method SimpleClassPro::mul() in %s on line %d
 NULL
 
 -- class without members --
-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
 
 -- abstract class --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, non-static method ChildClass::emptyFunction() should not be called statically in %s on line %d
+
+Strict Standards: Non-static method ChildClass::emptyFunction() should not be called statically in %s on line %d
+defined in child
+Strict Standards: Non-static method ChildClass::emptyFunction() should not be called statically in %s on line %d
+defined in childarray(2) {
+  [0]=>
+  NULL
+  [1]=>
+  NULL
+}
 
 -- class with final method --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, non-static method FinalClass::finalMethod() should not be called statically in %s on line %d
+
+Strict Standards: Non-static method FinalClass::finalMethod() should not be called statically in %s on line %d
+This function can't be overloaded
+Strict Standards: Non-static method FinalClass::finalMethod() should not be called statically in %s on line %d
+This function can't be overloadedarray(2) {
+  [0]=>
+  NULL
+  [1]=>
+  NULL
+}
 
 -- class with static members --
 array(2) {
@@ -154,10 +181,10 @@ array(2) {
   int(4)
 }
 
-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, cannot access private method StaticClass::cube() in %s on line %d
 NULL
 
-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, cannot access protected method StaticClass::retVal() in %s on line %d
 NULL
 -- class implementing an interface --
 array(2) {
@@ -171,30 +198,57 @@ Done
 *** Testing array_map() : object functionality ***
 -- simple class with public variable and method --
 
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, non-static method SimpleClass::square() should not be called statically in %s on line %d
+
+Strict Standards: Non-static method SimpleClass::square() should not be called statically in %s on line %d
+
+Strict Standards: Non-static method SimpleClass::square() should not be called statically in %s on line %d
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(4)
+}
 
 -- simple class with private variable and 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, cannot access private method SimpleClassPri::add() in %s on line %d
 NULL
 
 -- simple class with protected variable and 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, cannot access protected method SimpleClassPro::mul() in %s on line %d
 NULL
 
 -- class without members --
-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
 
 -- abstract class --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, non-static method ChildClass::emptyFunction() should not be called statically in %s on line %d
+
+Strict Standards: Non-static method ChildClass::emptyFunction() should not be called statically in %s on line %d
+defined in child
+Strict Standards: Non-static method ChildClass::emptyFunction() should not be called statically in %s on line %d
+defined in childarray(2) {
+  [0]=>
+  NULL
+  [1]=>
+  NULL
+}
 
 -- class with final method --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d
-NULL
+Strict Standards: array_map() expects parameter 1 to be a valid callback, non-static method FinalClass::finalMethod() should not be called statically in %s on line %d
+
+Strict Standards: Non-static method FinalClass::finalMethod() should not be called statically in %s on line %d
+This function can't be overloaded
+Strict Standards: Non-static method FinalClass::finalMethod() should not be called statically in %s on line %d
+This function can't be overloadedarray(2) {
+  [0]=>
+  NULL
+  [1]=>
+  NULL
+}
 
 -- class with static members --
 array(2) {
@@ -204,10 +258,10 @@ array(2) {
   int(4)
 }
 
-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, cannot access private method StaticClass::cube() in %s on line %d
 NULL
 
-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, cannot access protected method StaticClass::retVal() in %s on line %d
 NULL
 -- class implementing an interface --
 array(2) {

diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt
index a55bc56f52a9adeaf253b5d290a1793e446881b8..ffc87970ca09a6164165d465ba1c5114b54599f0 100644 (file)
--- a/ext/standard/tests/assert/assert_variation.phpt
+++ b/ext/standard/tests/assert/assert_variation.phpt
@@ -107,7 +107,7 @@ array(2) {
 ini.get("assert.callback") => [f2]
 
 
-Strict Standards: Non-static method c1::assert() cannot be called statically in %s on line 53
+Strict Standards: Non-static method c1::assert() should not be called statically in %s on line %d
 Class assertion failed 53, "0 != 0"
 NULL
 
@@ -166,7 +166,7 @@ array(2) {
 ini.get("assert.callback") => [f2]
 
 
-Strict Standards: Non-static method c1::assert() cannot be called statically in %s on line 53
+Strict Standards: Non-static method c1::assert() should not be called statically in %s on line %d
 Class assertion failed 53, "0 != 0"
 NULL
 

diff --git a/ext/standard/tests/general_functions/bug40398.phpt b/ext/standard/tests/general_functions/bug40398.phpt
index c56d081717ebc9fe4f1344dcb14a2f6a0c7614af..5f777bf717f4ac887f8e0b4a21c11e999e707cea 100755 (executable)
--- a/ext/standard/tests/general_functions/bug40398.phpt
+++ b/ext/standard/tests/general_functions/bug40398.phpt
@@ -78,23 +78,31 @@ new Derived_6('6');
 Base::__construct(1)
 Base::__construct(2)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, string given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_3 in %s on line %d
+Base::__construct(3)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, string given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_4 in %s on line %d
+Base::__construct(4)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, array given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_5 in %s on line %d
+Base::__construct(5)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, array given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_6 in %s on line %d
+Base::__construct(6)
 ===DONE===
 --UEXPECTF--
 Base::__construct(1)
 Base::__construct(2)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, Unicode string given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_3 in %s on line %d
+Base::__construct(3)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, Unicode string given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_4 in %s on line %d
+Base::__construct(4)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, array given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_5 in %s on line %d
+Base::__construct(5)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, array given in %sbug40398.php on line %d
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method Base::__construct() cannot be called statically, assuming $this from compatible context Derived_6 in %s on line %d
+Base::__construct(6)
 ===DONE===