Fix more tests (some of these were not broken by the recent changes)

diff --git a/Zend/tests/access_modifiers_003.phpt b/Zend/tests/access_modifiers_003.phpt
index 9c5a20a28c69ae7729f14a08b47120f53aa6f865..f5fafe3c8a76eaec193bc78932159ff4be765a0c 100644 (file)
--- a/Zend/tests/access_modifiers_003.phpt
+++ b/Zend/tests/access_modifiers_003.phpt
@@ -10,4 +10,4 @@ final final class test {
 echo "Done\n";
 ?>
 --EXPECTF--    
-Parse error: syntax error, unexpected T_FINAL, expecting T_CLASS in %s on line %d
+Parse error: parse error, expecting `T_CLASS' in %s on line %d

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 a0bd8d25742b0acbf420c25dc645e795b3d494f0..3223e8e9ac85a0cc7a0a2fdc941253b4a16da725 100755 (executable)
--- a/Zend/tests/bug32290.phpt
+++ b/Zend/tests/bug32290.phpt
@@ -100,7 +100,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
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method TestA::doSomething() cannot be called statically, assuming $this from compatible context TestB in %s on line %d
+
+Warning: call_user_func_array() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
 ===B===
@@ -111,7 +113,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
+Strict Standards: call_user_func_array() expects parameter 1 to be a valid callback, non-static method TestA::doSomethingParent() cannot be called statically, assuming $this from compatible context TestB in %s on line %d
+
+Warning: call_user_func_array() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
 ===D===

diff --git a/Zend/tests/lsb_006.phpt b/Zend/tests/lsb_006.phpt
index 39bff7fa92690af4704a42526208b8e92f8987ca..2bd12253af6b9b47ee32ddd541f04631e5e01d32 100644 (file)
--- a/Zend/tests/lsb_006.phpt
+++ b/Zend/tests/lsb_006.phpt
@@ -9,4 +9,4 @@ class Foo extends static {
 ?>
 ==DONE==
 --EXPECTF--
-Parse error: syntax error, unexpected T_STATIC, expecting T_STRING or T_PAAMAYIM_NEKUDOTAYIM or T_NAMESPACE in %s on line %d
+Parse error: parse error, expecting `T_STRING' or `T_PAAMAYIM_NEKUDOTAYIM' or `T_NAMESPACE' in %s on line %d

diff --git a/Zend/tests/lsb_007.phpt b/Zend/tests/lsb_007.phpt
index 68c2fc2757b293df3fd022ee1a63a885c073e63a..643c46fdf16aa10d8d297a037cb7541e5ad7f028 100644 (file)
--- a/Zend/tests/lsb_007.phpt
+++ b/Zend/tests/lsb_007.phpt
@@ -9,4 +9,4 @@ class Foo implements static {
 ?>
 ==DONE==
 --EXPECTF--
-Parse error: syntax error, unexpected T_STATIC, expecting T_STRING or T_PAAMAYIM_NEKUDOTAYIM or T_NAMESPACE in %s on line %d
+Parse error: parse error, expecting `T_STRING' or `T_PAAMAYIM_NEKUDOTAYIM' or `T_NAMESPACE' in %s on line %d

diff --git a/Zend/tests/lsb_008.phpt b/Zend/tests/lsb_008.phpt
index 88507b32666ca57d664d873320e8d8c40e77164d..6d4d4e29c715c10bcd0e70e7361d6fa17153b0de 100644 (file)
--- a/Zend/tests/lsb_008.phpt
+++ b/Zend/tests/lsb_008.phpt
@@ -5,4 +5,5 @@ ZE2 Late Static Binding class name "static"
 class static {
 }
 --EXPECTF--
-Parse error: syntax error, unexpected T_STATIC, expecting T_STRING in %slsb_008.php on line 2
+Parse error: parse error, expecting `T_STRING' in %s on line %d
+

diff --git a/Zend/tests/lsb_009.phpt b/Zend/tests/lsb_009.phpt
index 7bf308676c6709bf545d651cbe490090985cb1f7..cb2f7475d0a4e47f16b8007fae0d8e36c5ea733a 100644 (file)
--- a/Zend/tests/lsb_009.phpt
+++ b/Zend/tests/lsb_009.phpt
@@ -5,4 +5,4 @@ ZE2 Late Static Binding interface name "static"
 interface static {
 }
 --EXPECTF--
-Parse error: syntax error, unexpected T_STATIC, expecting T_STRING in %slsb_009.php on line 2
+Parse error: parse error, expecting `T_STRING' in %s on line %d