Another batch of fixed tests

diff --git a/ext/standard/tests/array/array_map_object1.phpt b/ext/standard/tests/array/array_map_object1.phpt
index 3b1ffce2e71766693b9571c89dce5c1b7f3a50b6..33b3b013640c669b2c03cd0f4dd1c536145c994c 100644 (file)
--- a/ext/standard/tests/array/array_map_object1.phpt
+++ b/ext/standard/tests/array/array_map_object1.phpt
@@ -121,29 +121,35 @@ 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
+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
+
+Warning: array_map() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
 -- 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
+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
+
+Warning: array_map() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
 -- class with final method --
-Warning: array_map() expects parameter 1 to be valid callback, array given in %s on line %d%d
+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
+
+Warning: array_map() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 NULL
 
 -- class with static members --
@@ -154,10 +160,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) {

diff --git a/ext/standard/tests/array/array_map_object2.phpt b/ext/standard/tests/array/array_map_object2.phpt
index 9670d6ff861fac8b887961e493a9facd98b0cece..1b181b0593f51de2a6d7e0c35362f2313582a6f0 100644 (file)
--- a/ext/standard/tests/array/array_map_object2.phpt
+++ b/ext/standard/tests/array/array_map_object2.phpt
@@ -37,10 +37,10 @@ echo "Done";
 *** 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

diff --git a/ext/standard/tests/array/array_map_object3.phpt b/ext/standard/tests/array/array_map_object3.phpt
index 6c00d56143556b68f1d974740b9c57dfac957322..d1a6d8062955da7694941b985fe9818db28f2a3a 100644 (file)
--- a/ext/standard/tests/array/array_map_object3.phpt
+++ b/ext/standard/tests/array/array_map_object3.phpt
@@ -74,7 +74,7 @@ array(3) {
 }
 -- 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,6 +87,6 @@ array(3) {
 }
 -- 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