- Update tests affexted by fix

diff --git a/tests/classes/abstract_derived.phpt b/tests/classes/abstract_derived.phpt
index 81cb3341ec4f32b8ef4475f64b4666fe1bf40df6..0feceac6bb28371ae08bfae12f9647faf1a48e49 100644 (file)
--- a/tests/classes/abstract_derived.phpt
+++ b/tests/classes/abstract_derived.phpt
@@ -17,4 +17,4 @@ class derived extends base {
 <?php exit(0); ?>
 --EXPECTF--
 
-Fatal error: Class derived contains 1 abstract methods and must therefore be declared abstract (derived::show) in %sabstract_derived.php on line %d
+Fatal error: Class derived contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (derived::show) in %sabstract_derived.php on line %d

diff --git a/tests/classes/abstract_not_declared.phpt b/tests/classes/abstract_not_declared.phpt
index 96c98857e314efaada2748644cf15b884b89b93a..3b81cd4980a3b9c4d22a648786444f483ac2846c 100644 (file)
--- a/tests/classes/abstract_not_declared.phpt
+++ b/tests/classes/abstract_not_declared.phpt
@@ -12,4 +12,4 @@ class fail {
 echo "Done\n"; // shouldn't be displayed
 ?>
 --EXPECTF--
-Fatal error: Class fail contains 1 abstract methods and must therefore be declared abstract (fail::show) in %s on line %d
+Fatal error: Class fail contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (fail::show) in %s on line %d

diff --git a/tests/classes/abstract_redeclare.phpt b/tests/classes/abstract_redeclare.phpt
index 716dd17fd11297b90f40e4ad51418b629362c48e..9a0a1edc3c23a68284db169dabe37e1ee0a2702c 100644 (file)
--- a/tests/classes/abstract_redeclare.phpt
+++ b/tests/classes/abstract_redeclare.phpt
@@ -19,4 +19,4 @@ echo "Done\n"; // Shouldn't be displayed
 ?>
 --EXPECTF--
 
-Fatal error: Class fail contains 1 abstract methods and must therefore be declared abstract (fail::show) in %sabstract_redeclare.php on line %d
+Fatal error: Class fail contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (fail::show) in %sabstract_redeclare.php on line %d

diff --git a/tests/classes/interface_must_be_implemented.phpt b/tests/classes/interface_must_be_implemented.phpt
index 82ddf24df88521e4c9c6be2ed29ece294c611ac0..a4d79704e1ef3f4ee252a7207a68d19a65a28393 100644 (file)
--- a/tests/classes/interface_must_be_implemented.phpt
+++ b/tests/classes/interface_must_be_implemented.phpt
@@ -6,7 +6,7 @@ ZE2 An interface must be implemented
 <?php
 
 interface if_a {
-       abstract function f_a();
+       function f_a();
 }
        
 class derived_a implements if_a {
@@ -14,4 +14,4 @@ class derived_a implements if_a {
 
 ?>
 --EXPECTF--
-Fatal error: Class derived_a contains 1 abstract methods and must therefore be declared abstract (if_a::f_a) in %s on line %d
+Fatal error: Class derived_a contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (if_a::f_a) in %s on line %d

diff --git a/tests/classes/interfaces_002.phpt b/tests/classes/interfaces_002.phpt
index 66d46f5d3608be39c5bea190657a8009c4c41f25..d26b5349bf5117a0952eabc0015266a0f9356792 100644 (file)
--- a/tests/classes/interfaces_002.phpt
+++ b/tests/classes/interfaces_002.phpt
@@ -20,10 +20,10 @@ class Exception_foo implements Throwable {
 
 // this should die -- Exception class must be abstract...
 $foo = new Exception_foo;
-echo $foo->getMessage() . "\n";
+echo "Message: " . $foo->getMessage() . "\n";
 
 ?>
+===DONE===
 --EXPECTF--
 
-Fatal error: Class Exception_foo contains 1 abstract methods and must therefore be declared abstract (Throwable::getErrno) in %s on line %d
-
+Fatal error: Class Exception_foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (Throwable::getErrno) in %s on line %d