- MFH fixes for these tests.

diff --git a/ext/standard/tests/aggregation/aggregate.lib.php b/ext/standard/tests/aggregation/aggregate.lib.php
deleted file mode 100644 (file)
index 3799285..0000000
--- a/ext/standard/tests/aggregation/aggregate.lib.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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";
-       }
-}
-
-?>

diff --git a/ext/standard/tests/aggregation/aggregate.phpt b/ext/standard/tests/aggregation/aggregate.phpt
index 82afb16f7090ee2379fc2d61b42f31b479d13239..161afcda68c70248718c2d78960775338adadacf 100644 (file)
--- a/ext/standard/tests/aggregation/aggregate.phpt
+++ b/ext/standard/tests/aggregation/aggregate.phpt
@@ -4,7 +4,7 @@ aggregating everything
 --GET--
 --FILE--
 <?php
-include "./ext/standard/tests/aggregation/aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib";
 
 $obj = new simple();
 aggregate($obj, 'helper');

diff --git a/ext/standard/tests/aggregation/aggregate_methods.phpt b/ext/standard/tests/aggregation/aggregate_methods.phpt
index 6567db0069c153cf1d74e4d27dc0f62e6d7770a2..523d5c72ee96e4a68d412dee705c679d6287a24f 100644 (file)
--- a/ext/standard/tests/aggregation/aggregate_methods.phpt
+++ b/ext/standard/tests/aggregation/aggregate_methods.phpt
@@ -4,7 +4,7 @@ aggregating all methods
 --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');

diff --git a/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt b/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt
index fabea1e17f5429fb2df09072605afe98df40567e..192c43856534c7438832e02cf74ea7c8db91e8a0 100644 (file)
--- a/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt
+++ b/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt
@@ -4,7 +4,7 @@ aggregating methods specified in the list
 --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'));

diff --git a/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt b/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt
index 1074e02afb9e65efd136b0af1acef4c3fdaca020..a9fbe6a4acab31e1d3febf508c99bd816f869fec 100644 (file)
--- a/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt
+++ b/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt
@@ -4,7 +4,7 @@ aggregating methods matching regular expression
 --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/');

diff --git a/ext/standard/tests/aggregation/aggregate_properties.phpt b/ext/standard/tests/aggregation/aggregate_properties.phpt
index c035823799ff2a47c1b60f7d8475fb41ba133da6..cb7562bb6f2d56db94a7ca1234d846b9b71934ac 100644 (file)
--- a/ext/standard/tests/aggregation/aggregate_properties.phpt
+++ b/ext/standard/tests/aggregation/aggregate_properties.phpt
@@ -4,7 +4,7 @@ aggregating all default properties
 --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');

diff --git a/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt b/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt
index 187588b29ed70669a53d45bdbb8210affbb8c3b7..ae1def93492fea2d12bd3ea79b5301b8cca74093 100644 (file)
--- a/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt
+++ b/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt
@@ -4,7 +4,7 @@ aggregating default properties specified in the list
 --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'));

diff --git a/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt b/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt
index d63f9002026111015f4265925abfc82943e67a60..0f4d52f645d93c1287997cb4c66d054018a60526 100644 (file)
--- a/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt
+++ b/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt
@@ -4,7 +4,7 @@ aggregating default properties matching regular expression
 --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/');

diff --git a/ext/standard/tests/aggregation/aggregation_info.phpt b/ext/standard/tests/aggregation/aggregation_info.phpt
index f39b7aa373f3c1e24f9478c4429da93f39679d14..cb2d9b8bb7278dacb3265f4c47c008a6c48aa089 100644 (file)
--- a/ext/standard/tests/aggregation/aggregation_info.phpt
+++ b/ext/standard/tests/aggregation/aggregation_info.phpt
@@ -4,7 +4,7 @@ retrieving aggregation info
 --GET--
 --FILE--
 <?php
-include "./ext/standard/tests/aggregation/aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib";
 
 $obj = new simple();
 aggregate($obj, 'mixin');

diff --git a/ext/standard/tests/aggregation/deaggregate.phpt b/ext/standard/tests/aggregation/deaggregate.phpt
index 8e1f71eb22ca2023f0ac609c9615ef772da3db9d..f7fc2ad67dbb97800c2b0b83a5f040cdcce532cb 100644 (file)
--- a/ext/standard/tests/aggregation/deaggregate.phpt
+++ b/ext/standard/tests/aggregation/deaggregate.phpt
@@ -4,7 +4,7 @@ deaggreating
 --GET--
 --FILE--
 <?php
-include "./ext/standard/tests/aggregation/aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib";
 
 $obj = new simple();
 aggregate($obj, 'helper');