From 09a7d5bb2f302e37a6c622a6ef648a07d45c3691 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 5 Mar 2004 12:18:16 +0000 Subject: [PATCH] Test files were fixed acording to new constructor redeclaration semantic --- tests/classes/ctor_dtor.phpt | 10 +--------- tests/classes/inheritance_002.phpt | 8 -------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/tests/classes/ctor_dtor.phpt b/tests/classes/ctor_dtor.phpt index fce1c19907..ea6813cc96 100644 --- a/tests/classes/ctor_dtor.phpt +++ b/tests/classes/ctor_dtor.phpt @@ -9,9 +9,6 @@ class early { function early() { echo __CLASS__ . "::" . __FUNCTION__ . "\n"; } - function __construct() { - echo __CLASS__ . "::" . __FUNCTION__ . "\n"; - } function __destruct() { echo __CLASS__ . "::" . __FUNCTION__ . "\n"; } @@ -21,9 +18,6 @@ class late { function __construct() { echo __CLASS__ . "::" . __FUNCTION__ . "\n"; } - function late() { - echo __CLASS__ . "::" . __FUNCTION__ . "\n"; - } function __destruct() { echo __CLASS__ . "::" . __FUNCTION__ . "\n"; } @@ -33,16 +27,14 @@ $t = new early(); $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 diff --git a/tests/classes/inheritance_002.phpt b/tests/classes/inheritance_002.phpt index a5688bba56..cca528e29c 100755 --- a/tests/classes/inheritance_002.phpt +++ b/tests/classes/inheritance_002.phpt @@ -21,22 +21,14 @@ class Base_php5 { 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() { -- 2.40.0