Fix tests (new error message)

diff --git a/Zend/tests/bug31720.phpt b/Zend/tests/bug31720.phpt
index 43ae3f805fea5c4d70275056eff21623f52ee902..5b2644b58ed79b31f27bdf01028fa7ca6af5cdb6 100644 (file)
--- a/Zend/tests/bug31720.phpt
+++ b/Zend/tests/bug31720.phpt
@@ -10,5 +10,5 @@ array_walk($array, array($nonesuchvar,'show'));
 --EXPECTF--
 Notice: Undefined variable: nonesuchvar in %s on line %d
 
-Warning: array_walk() expects parameter 2 to be valid callback, array given in %s on line %d
+Warning: array_walk() expects parameter 2 to be a valid callback, second array member is not a valid method in %s on line %d
 ===DONE===

diff --git a/Zend/tests/bug32290.phpt b/Zend/tests/bug32290.phpt
index f1c4e294d719e4f660253c92c9035da6051f44d4..169f269876c571e6beb365991d395acc38565adb 100755 (executable)
--- a/Zend/tests/bug32290.phpt
+++ b/Zend/tests/bug32290.phpt
@@ -99,8 +99,9 @@ var_dump($x->doSomethingStatic(1));
 ===A===
 TestB::doSomething(1)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, array given in %s on line %d
-NULL
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method TestA::doSomething() should not be called statically, assuming $this from compatible context TestB in %s on line %d
+TestA::doSomething(2)
+int(1)
 
 ===B===
 TestB::doSomethingThis(1)
@@ -110,8 +111,9 @@ int(1)
 ===C===
 TestB::doSomethingParent(1)
 
-Warning: call_user_func_array() expects parameter 1 to be valid callback, array given in %s on line %d
-NULL
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method TestA::doSomethingParent() should not be called statically, assuming $this from compatible context TestB in %s on line %d
+TestA::doSomethingParent(2)
+int(1)
 
 ===D===
 TestB::doSomethingParentThis(1)