[PHP-CVS] cvs: php4 /tests/classes abstract.phpt abstract_class.phpt abstract_inherit.phpt abstract_not_declared.phpt abstract_static.phpt

[Marcus Boerger]

helly           Thu Mar  6 19:01:10 2003 EDT

  Added files:                 
    /php4/tests/classes abstract_not_declared.phpt 

  Modified files:              
    /php4/tests/classes abstract.phpt abstract_class.phpt 
                        abstract_inherit.phpt abstract_static.phpt 
  Log:
  abstract classes must now be declared abstract
  
Index: php4/tests/classes/abstract.phpt
diff -u php4/tests/classes/abstract.phpt:1.5 php4/tests/classes/abstract.phpt:1.6
--- php4/tests/classes/abstract.phpt:1.5        Tue Dec 10 06:21:30 2002
+++ php4/tests/classes/abstract.phpt    Thu Mar  6 19:01:05 2003
@@ -5,7 +5,7 @@
 --FILE--
 <?php
 
-class fail {
+abstract class fail {
        abstract function show();
 }
 
Index: php4/tests/classes/abstract_class.phpt
diff -u php4/tests/classes/abstract_class.phpt:1.4 
php4/tests/classes/abstract_class.phpt:1.5
--- php4/tests/classes/abstract_class.phpt:1.4  Thu Mar  6 11:55:00 2003
+++ php4/tests/classes/abstract_class.phpt      Thu Mar  6 19:01:07 2003
@@ -5,7 +5,7 @@
 --FILE--
 <?php
 
-class fail {
+abstract class fail {
        abstract function show();
 }
 
Index: php4/tests/classes/abstract_inherit.phpt
diff -u php4/tests/classes/abstract_inherit.phpt:1.2 
php4/tests/classes/abstract_inherit.phpt:1.3
--- php4/tests/classes/abstract_inherit.phpt:1.2        Thu Mar  6 11:20:08 2003
+++ php4/tests/classes/abstract_inherit.phpt    Thu Mar  6 19:01:07 2003
@@ -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();
Index: php4/tests/classes/abstract_static.phpt
diff -u php4/tests/classes/abstract_static.phpt:1.1 
php4/tests/classes/abstract_static.phpt:1.2
--- php4/tests/classes/abstract_static.phpt:1.1 Mon Mar  3 06:13:56 2003
+++ php4/tests/classes/abstract_static.phpt     Thu Mar  6 19:01:08 2003
@@ -5,7 +5,7 @@
 --FILE--
 <?php
 
-class fail {
+abstract class fail {
        abstract static function show();
 }
 

Index: php4/tests/classes/abstract_not_declared.phpt
+++ php4/tests/classes/abstract_not_declared.phpt
--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



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php