abstract classes must now be declared abstract

5 files changed, 21 insertions, 6 deletions

diff --git a/tests/classes/abstract.phpt b/tests/classes/abstract.phpt
index 4a2cfbaad2..208b9bce11 100644
--- a/tests/classes/abstract.phpt
+++ b/tests/classes/abstract.phpt
@@ -5,7 +5,7 @@ An abstract method may not be called
 --FILE--
 <?php
 
-class fail {
+abstract class fail {
 	abstract function show();
 }
 
diff --git a/tests/classes/abstract_class.phpt b/tests/classes/abstract_class.phpt
index 7507d46024..97a2978430 100644
--- a/tests/classes/abstract_class.phpt
+++ b/tests/classes/abstract_class.phpt
@@ -5,7 +5,7 @@ An abstract class cannot be instantiated
 --FILE--
 <?php
 
-class fail {
+abstract class fail {
 	abstract function show();
 }
 
diff --git a/tests/classes/abstract_inherit.phpt b/tests/classes/abstract_inherit.phpt
index 2f33f85a05..3f87e3ecdd 100644
--- a/tests/classes/abstract_inherit.phpt
+++ b/tests/classes/abstract_inherit.phpt
@@ -1,15 +1,15 @@
 --TEST--
-A class that inherits a abstract method is abstract
+A class that inherits an abstract method is abstract
 --SKIPIF--
 <?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
 
-class pass {
+abstract class pass {
 	abstract function show();
 }
 
-class fail extends pass {
+abstract class fail extends pass {
 }
 
 $t = new fail();
diff --git a/tests/classes/abstract_not_declared.phpt b/tests/classes/abstract_not_declared.phpt
new file mode 100644
index 0000000000..0c1178ceff
--- /dev/null
+++ b/tests/classes/abstract_not_declared.phpt
@@ -0,0 +1,15 @@
+--TEST--
+An abstract class must be declared abstract
+--SKIPIF--
+<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
+--FILE--
+<?php
+
+class fail {
+	abstract function show();
+}
+
+echo "Done\n"; // shouldn't be displayed
+?>
+--EXPECTF--
+Fatal error: Class fail contains abstract methods and must be declared abstract in %s on line %d
diff --git a/tests/classes/abstract_static.phpt b/tests/classes/abstract_static.phpt
index f81445aaa0..fd1b9a6520 100644
--- a/tests/classes/abstract_static.phpt
+++ b/tests/classes/abstract_static.phpt
@@ -5,7 +5,7 @@ A static abstrcat method may not be called
 --FILE--
 <?php
 
-class fail {
+abstract class fail {
 	abstract static function show();
 }