abstract classes must now be declared abstract

diff --git a/tests/classes/abstract.phpt b/tests/classes/abstract.phpt
index 4a2cfbaad2271e0ab152a1fb13f0a996aa770b2e..208b9bce115171d2386ac17cfe87dd2998956265 100644 (file)
--- 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 7507d46024d926d8d50817aed947c01b7c082719..97a2978430bca0b8a85548f621981688a0328dbc 100644 (file)
--- 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 2f33f85a056bda33a67f2e9f3b47d6c9c2a622a6..3f87e3ecdd3ae7d6476691b6ac06c8170de541a0 100644 (file)
--- 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 (file)
index 0000000..0c1178c
--- /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 f81445aaa03b1940ca620f9c56c37daaf86e0d23..fd1b9a6520df86363adca7f5997f7427ae510817 100644 (file)
--- 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();
 }