fixed new calls in test cases according to PHP5 conventions

1 files changed, 33 insertions, 33 deletions

diff --git a/_test/lib/testmanager.php b/_test/lib/testmanager.php
index 96c9a57a2..06efd2694 100644
--- a/_test/lib/testmanager.php
+++ b/_test/lib/testmanager.php
@@ -51,9 +51,9 @@ class TestManager {
     }
 
     function runAllTests(&$reporter) {
-        $manager =& new TestManager();
+        $manager = new TestManager();
         $test_cases =& $manager->_getTestFileList();
-        $test =& new GroupTest('All Tests');
+        $test = new GroupTest('All Tests');
         foreach ($test_cases as $test_case) {
             $test->addTestFile($test_case);
         }
@@ -61,9 +61,9 @@ class TestManager {
     }
 
     function runAllPluginTests(&$reporter) {
-        $manager =& new TestManager();
+        $manager = new TestManager();
         $test_cases =& $manager->_getTestFileList(TEST_PLUGINS);
-        $test =& new GroupTest('All Plugin Tests');
+        $test = new GroupTest('All Plugin Tests');
         foreach ($test_cases as $test_case) {
             $test->addTestFile($test_case);
         }
@@ -72,7 +72,7 @@ class TestManager {
 
 
     function runTestCase($testcase_name, $test_case_directory, &$reporter) {
-        $manager =& new TestManager();
+        $manager = new TestManager();
         
         $testcase_name = preg_replace('/[^a-zA-Z0-9_:]/','',$testcase_name);
         $testcase_name = str_replace(':',DIRECTORY_SEPARATOR,$testcase_name);
@@ -85,26 +85,26 @@ class TestManager {
                           E_USER_ERROR);
         }
 
-        $test =& new GroupTest("Individual test case: " . $testcase_name);
+        $test = new GroupTest("Individual test case: " . $testcase_name);
         $test->addTestFile($testcase_file);
         $test->run($reporter);
     }
     
     function runTestFile($testcase_file, &$reporter) {
-        $manager =& new TestManager();
+        $manager = new TestManager();
         
         if (! file_exists($testcase_file)) {
             trigger_error("Test case {$testcase_file} cannot be found",
                           E_USER_ERROR);
         }
 
-        $test =& new GroupTest("Individual test case: " . $testcase_file);
+        $test = new GroupTest("Individual test case: " . $testcase_file);
         $test->addTestFile($testcase_file);
         $test->run($reporter);
     }
 
     function runGroupTest($group_test_name, $group_test_directory, &$reporter) {
-        $manager =& new TestManager();
+        $manager = new TestManager();
         $group_test_name = preg_replace('/[^a-zA-Z0-9_:]/','',$group_test_name);
         $group_test_name = str_replace(':',DIRECTORY_SEPARATOR,$group_test_name);
         $file_path = $group_test_directory . DIRECTORY_SEPARATOR .
@@ -116,7 +116,7 @@ class TestManager {
         }
 
         require_once $file_path;
-        $test =& new GroupTest($group_test_name . ' group test');
+        $test = new GroupTest($group_test_name . ' group test');
         foreach ($manager->_getGroupTestClassNames($file_path) as $group_test) {
             $test->addTestCase(new $group_test());
         }
@@ -124,7 +124,7 @@ class TestManager {
     }
 
     function addTestCasesFromDirectory(&$group_test, $directory = '.') {
-        $manager =& new TestManager();
+        $manager = new TestManager();
         $test_cases =& $manager->_getTestFileList($directory);
         foreach ($test_cases as $test_case) {
             $group_test->addTestFile($test_case);
@@ -132,7 +132,7 @@ class TestManager {
     }
 
     function &getTestCaseList($directory = '.') {
-        $manager =& new TestManager();
+        $manager = new TestManager();
         return $manager->_getTestCaseList($directory);
     }
 
@@ -155,17 +155,17 @@ class TestManager {
     }
 
     function &getPluginTestCaseList($directory = '.') {
-        $manager =& new TestManager();
+        $manager = new TestManager();
         return $manager->_getTestCaseList($directory);
     }
 
     function &getPluginGroupTestList($directory = '.') {
-        $manager =& new TestManager();
+        $manager = new TestManager();
         return $manager->_getTestGroupList($directory);
     }
 
     function &getGroupTestList($directory = '.') {
-        $manager =& new TestManager();
+        $manager = new TestManager();
         return $manager->_getTestGroupList($directory);
     }
 
@@ -244,7 +244,7 @@ class TestManager {
 */
 class CLITestManager extends TestManager {
     function &getGroupTestList($directory = '.') {
-        $manager =& new CLITestManager();
+        $manager = new CLITestManager();
         $group_tests =& $manager->_getTestGroupList($directory);
 
         $buffer = "Available grouptests:\n";
@@ -255,7 +255,7 @@ class CLITestManager extends TestManager {
     }
 
     function &getTestCaseList($directory = '.') {
-        $manager =& new CLITestManager();
+        $manager = new CLITestManager();
         $test_cases =& $manager->_getTestCaseList($directory);
 
         $buffer = "Available test cases:\n";
@@ -266,7 +266,7 @@ class CLITestManager extends TestManager {
     }
 
     function &getPluginTestCaseList($directory = '.') {
-        $manager =& new CLITestManager();
+        $manager = new CLITestManager();
         $test_cases =& $manager->_getTestCaseList($directory);
 
         $buffer = "Available test cases:\n";
@@ -277,7 +277,7 @@ class CLITestManager extends TestManager {
     }
 
     function &getPluginGroupTestList($directory = '.') {
-        $manager =& new CLITestManager();
+        $manager = new CLITestManager();
         $test_cases =& $manager->_getTestGroupList($directory);
 
         $buffer = "Available test cases:\n";
@@ -301,7 +301,7 @@ class HTMLTestManager extends TestManager {
     }
 
     function &getGroupTestList($directory = '.') {
-        $manager =& new HTMLTestManager();
+        $manager = new HTMLTestManager();
         $group_tests =& $manager->_getTestGroupList($directory);
         if (1 > count($group_tests)) {
             return "<p>No test groups set up!</p>";
@@ -318,7 +318,7 @@ class HTMLTestManager extends TestManager {
     }
 
     function &getTestCaseList($directory = '.') {
-        $manager =& new HTMLTestManager();
+        $manager = new HTMLTestManager();
         $testcases =& $manager->_getTestCaseList($directory);
 
         if (1 > count($testcases)) {
@@ -336,7 +336,7 @@ class HTMLTestManager extends TestManager {
     }
 
     function &getPluginTestCaseList($directory = '.') {
-        $manager =& new HTMLTestManager();
+        $manager = new HTMLTestManager();
         $testcases =& $manager->_getTestCaseList($directory);
 
         if (1 > count($testcases)) {
@@ -354,7 +354,7 @@ class HTMLTestManager extends TestManager {
     }
 
     function &getPluginGroupTestList($directory = '.') {
-        $manager =& new HTMLTestManager();
+        $manager = new HTMLTestManager();
         $group_tests =& $manager->_getTestGroupList($directory);
         if (1 > count($group_tests)) {
             return "<p>No plugin test groups set up!</p>";
@@ -383,7 +383,7 @@ class XMLTestManager extends HTMLTestManager {
 
     function &getGroupTestList($directory = '.') {
 
-        $manager =& new XMLTestManager();
+        $manager = new XMLTestManager();
         $group_tests =& $manager->_getTestGroupList($directory);
 
         $rss = & $manager->_getRssWriter();
@@ -418,7 +418,7 @@ class XMLTestManager extends HTMLTestManager {
 
     function &getTestCaseList($directory = '.') {
 
-        $manager =& new XMLTestManager();
+        $manager = new XMLTestManager();
         $testcases =& $manager->_getTestCaseList($directory);
 
         $rss = & $manager->_getRssWriter();
@@ -452,7 +452,7 @@ class XMLTestManager extends HTMLTestManager {
         require_once TEST_ROOT . '/lib/xml_writer_class.php';
         require_once TEST_ROOT . '/lib/rss_writer_class.php';
 
-        $rss_writer_object=& new rss_writer_class();
+        $rss_writer_object= new rss_writer_class();
         $rss_writer_object->specification="1.0";
         $rss_writer_object->about=$url."index.php?output=xml";
         $rss_writer_object->stylesheet=$url."rss2html.xsl";
@@ -496,13 +496,13 @@ class RemoteTestManager extends TestManager {
 
     function runAllTests(&$reporter, $url = FALSE) {
         $groups = RemoteTestManager::getGroupTestList($url);
-        $T = &new RemoteTestCase($groups['All Tests']);
+        $T = new RemoteTestCase($groups['All Tests']);
         $T->run($reporter);
     }
     
     function runTestUrl($case_url,& $reporter, $url = FALSE) {
         RemoteTestManager::_installSimpleTest();
-        $T = &new RemoteTestCase($case_url);
+        $T = new RemoteTestCase($case_url);
         $T->run($reporter);
     }
 
@@ -511,7 +511,7 @@ class RemoteTestManager extends TestManager {
         if ( !array_key_exists($case_id, $cases) ) {
             trigger_error("Unknown test id $case_id\n",E_USER_ERROR);
         }
-        $T = &new RemoteTestCase($cases[$case_id]);
+        $T = new RemoteTestCase($cases[$case_id]);
         $T->run($reporter);
     }
 
@@ -520,7 +520,7 @@ class RemoteTestManager extends TestManager {
         if ( !array_key_exists($group_name, $groups) ) {
             trigger_error("Unknown group $group_name\n",E_USER_ERROR);
         }
-        $T = &new RemoteTestCase($groups[$group_name]);
+        $T = new RemoteTestCase($groups[$group_name]);
         $T->run($reporter);
     }
 
@@ -532,7 +532,7 @@ class RemoteTestManager extends TestManager {
 
         $url .= '?output=xml';
         
-        $manager =& new RemoteTestManager();
+        $manager = new RemoteTestManager();
         $rss = & $manager->_getRssReader($url);
 
         $groupList = array();
@@ -550,7 +550,7 @@ class RemoteTestManager extends TestManager {
         }
 
         $url .= '?show=cases&output=xml';
-        $manager =& new RemoteTestManager();
+        $manager = new RemoteTestManager();
         $rss = & $manager->_getRssReader($url);
 
         $caseList = array();
@@ -565,7 +565,7 @@ class RemoteTestManager extends TestManager {
     function &_getRssReader($url) {
         require_once "XML/RSS.php";
 
-        $rss_reader =& new XML_RSS($url);
+        $rss_reader = new XML_RSS($url);
 
         $status = $rss_reader->parse();