cvs: php4(PHP_4_2_0) /ext/standard/tests/aggregation aggregate.lib aggregate.lib.php aggregate.phpt aggregate_methods.phpt
aggregate_methods_by_list.phpt aggregate_methods_by_regexp.phpt aggregate_properties.phpt aggregate_properties_by_list.phpt
aggregate_properties_by_regexp.phpt aggregation_info.phpt deaggregate.phpt

sniper Fri Mar 29 10:15:16 2002 EDT Added files: (Branch: PHP_4_2_0) /php4/ext/standard/tests/aggregation aggregate.lib Removed files: /php4/ext/standard/tests/aggregation aggregate.lib.php Modified files: /php4/ext/standard/tests/aggregation aggregate.phpt aggregate_methods.phpt aggregate_methods_by_list.phpt aggregate_methods_by_regexp.phpt aggregate_properties.phpt aggregate_properties_by_list.phpt aggregate_properties_by_regexp.phpt aggregation_info.phpt deaggregate.phpt Log: - MFH fixes for these tests. Index: php4/ext/standard/tests/aggregation/aggregate.phpt diff -u php4/ext/standard/tests/aggregation/aggregate.phpt:1.2 php4/ext/standard/tests/aggregation/aggregate.phpt:1.2.2.1 --- php4/ext/standard/tests/aggregation/aggregate.phpt:1.2 Tue Mar 5 04:00:53 2002 +++ php4/ext/standard/tests/aggregation/aggregate.phpt Fri Mar 29 10:15:16 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./ext/standard/tests/aggregation/aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib"; $obj = new simple(); aggregate($obj, 'helper'); Index: php4/ext/standard/tests/aggregation/aggregate_methods.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_methods.phpt:1.2 php4/ext/standard/tests/aggregation/aggregate_methods.phpt:1.2.2.1 --- php4/ext/standard/tests/aggregation/aggregate_methods.phpt:1.2 Tue Mar 5 04:00:53 2002 +++ php4/ext/standard/tests/aggregation/aggregate_methods.phpt Fri Mar 29 10:15:16 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./ext/standard/tests/aggregation/aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib"; $obj = new simple(); aggregate_methods($obj, 'mixin'); Index: php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt:1.2 php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt:1.2.2.1 --- php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt:1.2 Tue Mar 5 04:00:53 2002 +++ php4/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt Fri Mar 29 10:15:16 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./ext/standard/tests/aggregation/aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib"; $obj = new simple(); aggregate_methods_by_list($obj, 'helper', array('just_another_method')); Index: php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt:1.2 php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt:1.2.2.1 --- php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt:1.2 Tue Mar 5 04:00:53 2002 +++ php4/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt Fri Mar 29 10:15:16 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./ext/standard/tests/aggregation/aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib"; $obj = new simple(); aggregate_methods_by_regexp($obj, 'helper', '/^do/'); Index: php4/ext/standard/tests/aggregation/aggregate_properties.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_properties.phpt:1.2 php4/ext/standard/tests/aggregation/aggregate_properties.phpt:1.2.2.1 --- php4/ext/standard/tests/aggregation/aggregate_properties.phpt:1.2 Tue Mar 5 04:00:53 2002 +++ php4/ext/standard/tests/aggregation/aggregate_properties.phpt Fri Mar 29 10:15:16 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./ext/standard/tests/aggregation/aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib"; $obj = new simple(); aggregate_properties($obj, 'mixin'); Index: php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt:1.2 php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt:1.2.2.1 --- php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt:1.2 Tue Mar 5 04:00:53 2002 +++ php4/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt Fri Mar 29 10:15:16 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./ext/standard/tests/aggregation/aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib"; $obj = new simple(); aggregate_properties_by_list($obj, 'helper', array('my_prop', 'our_prop')); Index: php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt diff -u php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt:1.2 php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt:1.2.2.1 --- php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt:1.2 Tue Mar 5 04:00:53 2002 +++ php4/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt Fri Mar 29 10:15:16 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./ext/standard/tests/aggregation/aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib"; $obj = new simple(); aggregate_properties_by_regexp($obj, 'helper', '/^my/'); Index: php4/ext/standard/tests/aggregation/aggregation_info.phpt diff -u php4/ext/standard/tests/aggregation/aggregation_info.phpt:1.2 php4/ext/standard/tests/aggregation/aggregation_info.phpt:1.2.2.1 --- php4/ext/standard/tests/aggregation/aggregation_info.phpt:1.2 Tue Mar 5 04:00:53 2002 +++ php4/ext/standard/tests/aggregation/aggregation_info.phpt Fri Mar 29 10:15:16 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./ext/standard/tests/aggregation/aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib"; $obj = new simple(); aggregate($obj, 'mixin'); Index: php4/ext/standard/tests/aggregation/deaggregate.phpt diff -u php4/ext/standard/tests/aggregation/deaggregate.phpt:1.2 php4/ext/standard/tests/aggregation/deaggregate.phpt:1.2.2.1 --- php4/ext/standard/tests/aggregation/deaggregate.phpt:1.2 Tue Mar 5 04:00:53 2002 +++ php4/ext/standard/tests/aggregation/deaggregate.phpt Fri Mar 29 10:15:16 2002 @@ -4,7 +4,7 @@ --GET-- --FILE-- <?php -include "./ext/standard/tests/aggregation/aggregate.lib.php"; +include "./ext/standard/tests/aggregation/aggregate.lib"; $obj = new simple(); aggregate($obj, 'helper'); Index: php4/ext/standard/tests/aggregation/aggregate.lib +++ php4/ext/standard/tests/aggregation/aggregate.lib <?php class simple { var $simple_prop = 100; function simple() { print "I'm alive!\n"; } } class helper { var $my_prop = 5; var $your_prop = array('init' => PHP_VERSION); var $our_prop = '****'; var $_priv_prop = null; function helper() { print "just trying to help\n"; } function do_this() { print "I'm helping!\n"; } function do_that() { print "I'm aggregating!\n"; } function just_another_method() { print "yep, that's me\n"; } function _private() { print "Don't touch me!\n"; } function __wakeup() { } } class mixin { var $simple_prop = true; var $mix = true; function mix_it() { print "mixing\n"; } } class moby { function mix_it() { print "I'm redundant!\n"; } } ?>