Modified: pear/pear-core/trunk/tests/PEAR_Channelfile/test_addmirror.phpt
===================================================================
--- pear/pear-core/trunk/tests/PEAR_Channelfile/test_addmirror.phpt	2011-07-04 23:21:39 UTC (rev 312917)
+++ pear/pear-core/trunk/tests/PEAR_Channelfile/test_addmirror.phpt	2011-07-04 23:22:24 UTC (rev 312918)
@@ -8,9 +8,9 @@
 ?>
 --FILE--
 <?php
-
 error_reporting(1803);
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'setup.php.inc';
+
 $chf->fromXmlString($first = '<?xml version="1.0" encoding="ISO-8859-1" ?>
 <channel version="1.0" xmlns="http://pear.php.net/channel-1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -35,7 +35,7 @@
 </channel>');
 $phpt->assertTrue($chf->validate(), 'initial setup');
 $phpt->assertEquals(array (
-  'attribs' =>
+  'attribs' =>
   array (
     'version' => '1.0',
     'xmlns' => 'http://pear.php.net/channel-1.0',
@@ -45,73 +45,73 @@
   'name' => 'pear.php.net',
   'suggestedalias' => 'pear',
   'summary' => 'PHP Extension and Application Repository',
-  'validatepackage' =>
+  'validatepackage' =>
   array (
-    'attribs' =>
+    'attribs' =>
     array (
       'version' => '1.0',
     ),
     '_content' => 'PEAR_Validate',
   ),
-  'servers' =>
+  'servers' =>
   array (
-    'primary' =>
+    'primary' =>
     array (
-      'xmlrpc' =>
+      'xmlrpc' =>
       array (
-        'function' =>
+        'function' =>
         array (
-          0 =>
+          0 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'logintest',
           ),
-          1 =>
+          1 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.listLatestReleases',
           ),
-          2 =>
+          2 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.listAll',
           ),
-          3 =>
+          3 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.info',
           ),
-          4 =>
+          4 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.getDownloadURL',
           ),
-          5 =>
+          5 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'channel.listAll',
           ),
-          6 =>
+          6 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
@@ -125,7 +125,7 @@
 $chf->addMirror('mirror.php.net');
 $phpt->assertTrue($chf->validate(), 'after add mirror');
 $phpt->assertEquals(array (
-  'attribs' =>
+  'attribs' =>
   array (
     'version' => '1.0',
     'xmlns' => 'http://pear.php.net/channel-1.0',
@@ -135,73 +135,73 @@
   'name' => 'pear.php.net',
   'suggestedalias' => 'pear',
   'summary' => 'PHP Extension and Application Repository',
-  'validatepackage' =>
+  'validatepackage' =>
   array (
-    'attribs' =>
+    'attribs' =>
     array (
       'version' => '1.0',
     ),
     '_content' => 'PEAR_Validate',
   ),
-  'servers' =>
+  'servers' =>
   array (
-    'primary' =>
+    'primary' =>
     array (
-      'xmlrpc' =>
+      'xmlrpc' =>
       array (
-        'function' =>
+        'function' =>
         array (
-          0 =>
+          0 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'logintest',
           ),
-          1 =>
+          1 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.listLatestReleases',
           ),
-          2 =>
+          2 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.listAll',
           ),
-          3 =>
+          3 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.info',
           ),
-          4 =>
+          4 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.getDownloadURL',
           ),
-          5 =>
+          5 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'channel.listAll',
           ),
-          6 =>
+          6 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
@@ -210,9 +210,9 @@
         ),
       ),
     ),
-    'mirror' =>
+    'mirror' =>
     array (
-      'attribs' =>
+      'attribs' =>
       array (
         'host' => 'mirror.php.net',
       ),
@@ -222,7 +222,7 @@
 $chf->addMirror('mirror.php2.net', 7900);
 $phpt->assertTrue($chf->validate(), 'after add mirror 2');
 $phpt->assertEquals(array (
-  'attribs' =>
+  'attribs' =>
   array (
     'version' => '1.0',
     'xmlns' => 'http://pear.php.net/channel-1.0',
@@ -232,73 +232,73 @@
   'name' => 'pear.php.net',
   'suggestedalias' => 'pear',
   'summary' => 'PHP Extension and Application Repository',
-  'validatepackage' =>
+  'validatepackage' =>
   array (
-    'attribs' =>
+    'attribs' =>
     array (
       'version' => '1.0',
     ),
     '_content' => 'PEAR_Validate',
   ),
-  'servers' =>
+  'servers' =>
   array (
-    'primary' =>
+    'primary' =>
     array (
-      'xmlrpc' =>
+      'xmlrpc' =>
       array (
-        'function' =>
+        'function' =>
         array (
-          0 =>
+          0 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'logintest',
           ),
-          1 =>
+          1 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.listLatestReleases',
           ),
-          2 =>
+          2 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.listAll',
           ),
-          3 =>
+          3 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.info',
           ),
-          4 =>
+          4 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'package.getDownloadURL',
           ),
-          5 =>
+          5 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
             '_content' => 'channel.listAll',
           ),
-          6 =>
+          6 =>
           array (
-            'attribs' =>
+            'attribs' =>
             array (
               'version' => '1.0',
             ),
@@ -307,18 +307,18 @@
         ),
       ),
     ),
-    'mirror' =>
+    'mirror' =>
     array (
-      0 =>
+      0 =>
       array (
-        'attribs' =>
+        'attribs' =>
         array (
           'host' => 'mirror.php.net',
         ),
       ),
-      1 =>
+      1 =>
       array (
-        'attribs' =>
+        'attribs' =>
         array (
           'host' => 'mirror.php2.net',
           'port' => 7900,

Modified: pear/pear-core/trunk/tests/PEAR_Command_Channels/channel-discover/test.phpt
===================================================================
--- pear/pear-core/trunk/tests/PEAR_Command_Channels/channel-discover/test.phpt	2011-07-04 23:21:39 UTC (rev 312917)
+++ pear/pear-core/trunk/tests/PEAR_Command_Channels/channel-discover/test.phpt	2011-07-04 23:22:24 UTC (rev 312918)
@@ -10,21 +10,21 @@
 <?php
 error_reporting(1803);
 require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'setup.php.inc';
-$pathtochannelxml = dirname(__FILE__)  . DIRECTORY_SEPARATOR .
-    'files'. DIRECTORY_SEPARATOR . 'channel.xml';
+$pathtochannelxml = dirname(__FILE__)  . DIRECTORY_SEPARATOR . 'files'. DIRECTORY_SEPARATOR . 'channel.xml';
 $GLOBALS['pearweb']->addHtmlConfig('http://zornk.php.net/channel.xml', $pathtochannelxml);
+
 $e = $command->run('channel-discover', array(), array('zornk.php.net'));
 $phpunit->assertNoErrors('after');
 $phpunit->assertEquals(array (
   0 =>
   array (
     'info' => 'Adding Channel "zornk.php.net" succeeded',
-    'cmd' => 'channel-discover',
+    'cmd' => 'channel-discover',
   ),
   1 =>
   array (
     'info' => 'Discovery of channel "zornk.php.net" succeeded',
-    'cmd' => 'channel-discover',
+    'cmd' => 'channel-discover',
   ),
 ), $fakelog->getLog(), 'log');

@@ -33,6 +33,7 @@
 $phpunit->assertIsA('PEAR_ChannelFile', $chan, 'updated ok?');
 $phpunit->assertEquals('zornk.php.net', $chan->getName(), 'name ok?');
 $phpunit->assertEquals('foo', $chan->getSummary(), 'summary ok?');
+
 echo 'tests done';
 ?>
 --CLEAN--

Modified: pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/bug18581.phpt
===================================================================
--- pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/bug18581.phpt	2011-07-04 23:21:39 UTC (rev 312917)
+++ pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/bug18581.phpt	2011-07-04 23:22:24 UTC (rev 312918)
@@ -58,4 +58,13 @@
     'info' => $temp_path . DIRECTORY_SEPARATOR . 'test',
     'cmd'  => 'config-get',
   ),
-), $fakelog->getLog(), 'Alias channel name config-get');
\ No newline at end of file
+), $fakelog->getLog(), 'Alias channel name config-get');
+
+echo 'tests done';
+?>
+--CLEAN--
+<?php
+require_once dirname(dirname(__FILE__)) . '/teardown.php.inc';
+?>
+--EXPECT--
+tests done
\ No newline at end of file

Modified: pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test.phpt
===================================================================
--- pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test.phpt	2011-07-04 23:21:39 UTC (rev 312917)
+++ pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test.phpt	2011-07-04 23:22:24 UTC (rev 312918)
@@ -10,34 +10,39 @@
 <?php
 error_reporting(1803);
 require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'setup.php.inc';
+
 $config->set('verbose', 34, 'user');
 $config->set('verbose', 45, 'system');
 $config->set('verbose', 56, 'user', '__uri');
 $config->set('verbose', 67, 'system', '__uri');
+
 $e = $command->run('config-get', array(), array('verbose'));
 $phpunit->assertEquals(array (
-  0 =>
+  0 =>
   array (
     'info' => 34,
     'cmd' => 'config-get',
   ),
 ), $fakelog->getLog(), 'verbose');
+
 $e = $command->run('config-get', array(), array('verbose', 'user'));
 $phpunit->assertEquals(array (
-  0 =>
+  0 =>
   array (
     'info' => 34,
     'cmd' => 'config-get',
   ),
 ), $fakelog->getLog(), 'verbose user');
+
 $e = $command->run('config-get', array(), array('verbose', 'system'));
 $phpunit->assertEquals(array (
-  0 =>
+  0 =>
   array (
     'info' => 45,
     'cmd' => 'config-get',
   ),
 ), $fakelog->getLog(), 'verbose system');
+
 echo 'tests done';
 ?>
 --CLEAN--

Modified: pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test_default_channel.phpt
===================================================================
--- pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test_default_channel.phpt	2011-07-04 23:21:39 UTC (rev 312917)
+++ pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test_default_channel.phpt	2011-07-04 23:22:24 UTC (rev 312918)
@@ -10,35 +10,40 @@
 <?php
 error_reporting(1803);
 require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'setup.php.inc';
+
 $config->set('verbose', 34, 'user');
 $config->set('verbose', 45, 'system');
 $config->set('verbose', 56, 'user', '__uri');
 $config->set('verbose', 67, 'system', '__uri');
 $config->set('default_channel', '__uri');
+
 $e = $command->run('config-get', array(), array('verbose'));
 $phpunit->assertEquals(array (
-  0 =>
+  0 =>
   array (
     'info' => 56,
     'cmd' => 'config-get',
   ),
 ), $fakelog->getLog(), 'verbose');
+
 $e = $command->run('config-get', array(), array('verbose', 'user'));
 $phpunit->assertEquals(array (
-  0 =>
+  0 =>
   array (
     'info' => 56,
     'cmd' => 'config-get',
   ),
 ), $fakelog->getLog(), 'verbose user');
+
 $e = $command->run('config-get', array(), array('verbose', 'system'));
 $phpunit->assertEquals(array (
-  0 =>
+  0 =>
   array (
     'info' => 67,
     'cmd' => 'config-get',
   ),
 ), $fakelog->getLog(), 'verbose system');
+
 echo 'tests done';
 ?>
 --CLEAN--

Modified: pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test_fail.phpt
===================================================================
--- pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test_fail.phpt	2011-07-04 23:21:39 UTC (rev 312917)
+++ pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test_fail.phpt	2011-07-04 23:22:24 UTC (rev 312918)
@@ -10,22 +10,39 @@
 <?php
 error_reporting(1803);
 require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'setup.php.inc';
+
 $e = $command->run('config-get', array(), array());
 $phpunit->assertErrors(array(
-    array('package' => 'PEAR_Error', 'message' => 'config-get expects 1 or 2 parameters'),
+    array(
+        'package' => 'PEAR_Error',
+        'message' => 'config-get expects 1 or 2 parameters'
+    ),
 ), 'no params');
+
 $e = $command->run('config-get', array(), array('default_channel', 'user', 'hoo'));
 $phpunit->assertErrors(array(
-    array('package' => 'PEAR_Error', 'message' => 'config-get expects 1 or 2 parameters'),
+    array(
+        'package' => 'PEAR_Error',
+        'message' => 'config-get expects 1 or 2 parameters'
+    ),
 ), '1 params');
+
 $e = $command->run('config-get', array(), array('default_channel', 'gronk'));
 $phpunit->assertErrors(array(
-    array('package' => 'PEAR_Error', 'message' => 'config-get: only the layers: "user" or "system" are supported'),
+    array(
+        'package' => 'PEAR_Error',
+        'message' => 'config-get: only the layers: "user" or "system" are supported'
+    ),
 ), 'unknown layer');
+
 $e = $command->run('config-get', array('channel' => 'gronk'), array('php_dir'));
 $phpunit->assertErrors(array(
-    array('package' => 'PEAR_Error', 'message' => 'Channel "gronk" does not exist'),
+    array(
+        'package' => 'PEAR_Error',
+        'message' => 'Channel "gronk" does not exist'
+    ),
 ), 'unknown channel as option');
+
 echo 'tests done';
 ?>
 --CLEAN--

Modified: pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test_opt.phpt
===================================================================
--- pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test_opt.phpt	2011-07-04 23:21:39 UTC (rev 312917)
+++ pear/pear-core/trunk/tests/PEAR_Command_Config/config-get/test_opt.phpt	2011-07-04 23:22:24 UTC (rev 312918)
@@ -10,34 +10,39 @@
 <?php
 error_reporting(1803);
 require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'setup.php.inc';
+
 $config->set('verbose', 34, 'user');
 $config->set('verbose', 45, 'system');
 $config->set('verbose', 56, 'user', '__uri');
 $config->set('verbose', 67, 'system', '__uri');
+
 $e = $command->run('config-get', array('channel' => '__uri'), array('verbose'));
 $phpunit->assertEquals(array (
-  0 =>
+  0 =>
   array (
     'info' => 56,
     'cmd' => 'config-get',
   ),
 ), $fakelog->getLog(), 'verbose');
+
 $e = $command->run('config-get', array('channel' => '__uri'), array('verbose', 'user'));
 $phpunit->assertEquals(array (
-  0 =>
+  0 =>
   array (
     'info' => 56,
     'cmd' => 'config-get',
   ),
 ), $fakelog->getLog(), 'verbose user');
+
 $e = $command->run('config-get', array('channel' => '__uri'), array('verbose', 'system'));
 $phpunit->assertEquals(array (
-  0 =>
+  0 =>
   array (
     'info' => 67,
     'cmd' => 'config-get',
   ),
 ), $fakelog->getLog(), 'verbose system');
+
 echo 'tests done';
 ?>
 --CLEAN--