dmitry Fri Mar 5 07:18:22 2004 EDT
Modified files:
/php-src/tests/classes ctor_dtor.phpt inheritance_002.phpt
Log:
Test files were fixed acording to new constructor redeclaration semantic
http://cvs.php.net/diff.php/php-src/tests/classes/ctor_dtor.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/tests/classes/ctor_dtor.phpt
diff -u php-src/tests/classes/ctor_dtor.phpt:1.2
php-src/tests/classes/ctor_dtor.phpt:1.3
--- php-src/tests/classes/ctor_dtor.phpt:1.2 Sat Aug 9 10:48:47 2003
+++ php-src/tests/classes/ctor_dtor.phpt Fri Mar 5 07:18:16 2004
@@ -9,9 +9,6 @@
function early() {
echo __CLASS__ . "::" . __FUNCTION__ . "\n";
}
- function __construct() {
- echo __CLASS__ . "::" . __FUNCTION__ . "\n";
- }
function __destruct() {
echo __CLASS__ . "::" . __FUNCTION__ . "\n";
}
@@ -21,9 +18,6 @@
function __construct() {
echo __CLASS__ . "::" . __FUNCTION__ . "\n";
}
- function late() {
- echo __CLASS__ . "::" . __FUNCTION__ . "\n";
- }
function __destruct() {
echo __CLASS__ . "::" . __FUNCTION__ . "\n";
}
@@ -33,16 +27,14 @@
$t->early();
unset($t);
$t = new late();
-$t->late();
//unset($t); delay to end of script
echo "Done\n";
?>
--EXPECTF--
-early::__construct
+early::early
early::early
early::__destruct
late::__construct
-late::late
Done
late::__destruct
http://cvs.php.net/diff.php/php-src/tests/classes/inheritance_002.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/tests/classes/inheritance_002.phpt
diff -u php-src/tests/classes/inheritance_002.phpt:1.5
php-src/tests/classes/inheritance_002.phpt:1.6
--- php-src/tests/classes/inheritance_002.phpt:1.5 Sat Jan 17 08:00:21 2004
+++ php-src/tests/classes/inheritance_002.phpt Fri Mar 5 07:18:16 2004
@@ -21,22 +21,14 @@
function __construct() {
var_dump('Base constructor');
}
-
- function Base_php5() {
- var_dump('I should not be called');
}
-}
class Child_php5 extends Base_php5 {
function __construct() {
var_dump('Child constructor');
parent::__construct();
}
-
- function Child_php5() {
- var_dump('I should not be called');
}
-}
class Child_mx1 extends Base_php4 {
function __construct() {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
