From 8c5a1a03db773e7c155549d037e41cdca130fc72 Mon Sep 17 00:00:00 2001
From: foobar <sniper@php.net>
Date: Fri, 29 Mar 2002 15:15:16 +0000
Subject: [PATCH] - MFH fixes for these tests.

---
 .../tests/aggregation/aggregate.lib.php       | 65 -------------------
 ext/standard/tests/aggregation/aggregate.phpt |  2 +-
 .../tests/aggregation/aggregate_methods.phpt  |  2 +-
 .../aggregate_methods_by_list.phpt            |  2 +-
 .../aggregate_methods_by_regexp.phpt          |  2 +-
 .../aggregation/aggregate_properties.phpt     |  2 +-
 .../aggregate_properties_by_list.phpt         |  2 +-
 .../aggregate_properties_by_regexp.phpt       |  2 +-
 .../tests/aggregation/aggregation_info.phpt   |  2 +-
 .../tests/aggregation/deaggregate.phpt        |  2 +-
 10 files changed, 9 insertions(+), 74 deletions(-)
 delete mode 100644 ext/standard/tests/aggregation/aggregate.lib.php

diff --git a/ext/standard/tests/aggregation/aggregate.lib.php b/ext/standard/tests/aggregation/aggregate.lib.php
deleted file mode 100644
index 3799285f75..0000000000
--- 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 82afb16f70..161afcda68 100644
--- 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 6567db0069..523d5c72ee 100644
--- 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 fabea1e17f..192c438565 100644
--- 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 1074e02afb..a9fbe6a4ac 100644
--- 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 c035823799..cb7562bb6f 100644
--- 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 187588b29e..ae1def9349 100644
--- 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 d63f900202..0f4d52f645 100644
--- 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 f39b7aa373..cb2d9b8bb7 100644
--- 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 8e1f71eb22..f7fc2ad67d 100644
--- 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');
-- 
2.50.1