From f48bd05482cd7f991fe821a095470398c2351a6f Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Sat, 2 Feb 2008 00:55:35 +0000
Subject: [PATCH] Fix more tests (some of these were not broken by the recent
 changes)

---
 Zend/tests/access_modifiers_003.phpt | 2 +-
 Zend/tests/bug31720.phpt             | 2 +-
 Zend/tests/bug32290.phpt             | 8 ++++++--
 Zend/tests/lsb_006.phpt              | 2 +-
 Zend/tests/lsb_007.phpt              | 2 +-
 Zend/tests/lsb_008.phpt              | 3 ++-
 Zend/tests/lsb_009.phpt              | 2 +-
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Zend/tests/access_modifiers_003.phpt b/Zend/tests/access_modifiers_003.phpt
index 9c5a20a28c..f5fafe3c8a 100644
--- 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 43ae3f805f..5b2644b58e 100644
--- 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 a0bd8d2574..3223e8e9ac 100755
--- 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 39bff7fa92..2bd12253af 100644
--- 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 68c2fc2757..643c46fdf1 100644
--- 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 88507b3266..6d4d4e29c7 100644
--- 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 7bf308676c..cb2f7475d0 100644
--- 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
-- 
2.40.0