* ws/folding

7 files changed, 98 insertions, 8 deletions

diff --git a/pear/PEAR/Command/Auth.php b/pear/PEAR/Command/Auth.php
index 47f0abf67f..5ce99bad29 100644
--- a/pear/PEAR/Command/Auth.php
+++ b/pear/PEAR/Command/Auth.php
@@ -28,6 +28,8 @@ require_once "PEAR/Config.php";
  */
 class PEAR_Command_Auth extends PEAR_Command_Common
 {
+    // {{{ properties
+
     var $commands = array(
         'login' => array(
             'summary' => 'Connects and authenticates to remote server',
@@ -55,6 +57,10 @@ password from your user configuration.',
 
         );
 
+    // }}}
+
+    // {{{ constructor
+
     /**
      * PEAR_Command_Auth constructor.
      *
@@ -65,6 +71,10 @@ password from your user configuration.',
         parent::PEAR_Command_Common($ui, $config);
     }
 
+    // }}}
+
+    // {{{ doLogin()
+
     /**
      * Execute the 'login' command.
      *
@@ -113,6 +123,9 @@ password from your user configuration.',
 
     }
 
+    // }}}
+    // {{{ doLogout()
+
     /**
      * Execute the 'logout' command.
      *
@@ -136,6 +149,7 @@ password from your user configuration.',
         $this->config->store();
     }
 
+    // }}}
 }
 
 ?>
\ No newline at end of file
diff --git a/pear/PEAR/Command/Build.php b/pear/PEAR/Command/Build.php
index 5b15d3c0cb..2e498f8aed 100644
--- a/pear/PEAR/Command/Build.php
+++ b/pear/PEAR/Command/Build.php
@@ -29,6 +29,8 @@ require_once "PEAR/Builder.php";
  */
 class PEAR_Command_Build extends PEAR_Command_Common
 {
+    // {{{ properties
+
     var $commands = array(
         'build' => array(
             'summary' => 'Build an Extension From C Source',
@@ -40,6 +42,10 @@ Builds one or more extensions contained in a package.'
             ),
         );
 
+    // }}}
+
+    // {{{ constructor
+
     /**
      * PEAR_Command_Build constructor.
      *
@@ -50,6 +56,10 @@ Builds one or more extensions contained in a package.'
         parent::PEAR_Command_Common($ui, $config);
     }
 
+    // }}}
+
+    // {{{ doBuild()
+
     function doBuild($command, $options, $params)
     {
         if (sizeof($params) < 1) {
@@ -64,6 +74,9 @@ Builds one or more extensions contained in a package.'
         return true;
     }
 
+    // }}}
+    // {{{ buildCallback()
+
     function buildCallback($what, $data)
     {
         if (($what == 'cmdoutput' && $this->verbose > 1) ||
@@ -71,4 +84,6 @@ Builds one or more extensions contained in a package.'
             $this->ui->outputData(rtrim($data), 'build');
         }
     }
+
+    // }}}
 }
diff --git a/pear/PEAR/Command/Config.php b/pear/PEAR/Command/Config.php
index 295f2086da..f01f033ecd 100644
--- a/pear/PEAR/Command/Config.php
+++ b/pear/PEAR/Command/Config.php
@@ -29,6 +29,8 @@ require_once "PEAR/Config.php";
  */
 class PEAR_Command_Config extends PEAR_Command_Common
 {
+    // {{{ properties
+
     var $commands = array(
         'config-show' => array(
             'summary' => 'Show All Settings',
@@ -81,6 +83,9 @@ displays help for all configuration parameters.
            ),
         );
 
+    // }}}
+    // {{{ constructor
+
     /**
      * PEAR_Command_Config constructor.
      *
@@ -91,6 +96,10 @@ displays help for all configuration parameters.
         parent::PEAR_Command_Common($ui, $config);
     }
 
+    // }}}
+
+    // {{{ doConfigShow()
+
     function doConfigShow($command, $options, $params)
     {
         // $params[0] -> the layer
@@ -117,6 +126,9 @@ displays help for all configuration parameters.
         return true;
     }
 
+    // }}}
+    // {{{ doConfigGet()
+
     function doConfigGet($command, $options, $params)
     {
         // $params[0] -> the parameter
@@ -135,6 +147,9 @@ displays help for all configuration parameters.
         return true;
     }
 
+    // }}}
+    // {{{ doConfigSet()
+
     function doConfigSet($command, $options, $params)
     {
         // $param[0] -> a parameter to set
@@ -161,6 +176,9 @@ displays help for all configuration parameters.
         return true;
     }
 
+    // }}}
+    // {{{ doConfigHelp()
+
     function doConfigHelp($command, $options, $params)
     {
         if (empty($params)) {
@@ -181,6 +199,9 @@ displays help for all configuration parameters.
         $this->ui->outputData($data, $command);
     }
 
+    // }}}
+    // {{{ _checkLayer()
+
     /**
      * Checks if a layer is defined or not
      *
@@ -198,6 +219,7 @@ displays help for all configuration parameters.
         return false;
     }
 
+    // }}}
 }
 
 ?>
\ No newline at end of file
diff --git a/pear/PEAR/Command/Install.php b/pear/PEAR/Command/Install.php
index 61014ede0e..119285d773 100644
--- a/pear/PEAR/Command/Install.php
+++ b/pear/PEAR/Command/Install.php
@@ -29,7 +29,7 @@ require_once "Console/Getopt.php";
  */
 class PEAR_Command_Install extends PEAR_Command_Common
 {
-    // {{{ command definitions
+    // {{{ properties
 
     var $commands = array(
         'install' => array(
@@ -214,6 +214,8 @@ specified at once.
 
     // }}}
 
+    // {{{ doInstall()
+
     function doInstall($command, $options, $params)
     {
         if (empty($this->installer)) {
@@ -271,6 +273,9 @@ specified at once.
         return true;
     }
 
+    // }}}
+    // {{{ doUninstall()
+
     function doUninstall($command, $options, $params)
     {
         if (empty($this->installer)) {
@@ -291,6 +296,7 @@ specified at once.
         return true;
     }
 
+    // }}}
 }
 
 ?>
diff --git a/pear/PEAR/Command/Package.php b/pear/PEAR/Command/Package.php
index f82bff2c34..cae5f9fd57 100644
--- a/pear/PEAR/Command/Package.php
+++ b/pear/PEAR/Command/Package.php
@@ -24,6 +24,8 @@ require_once 'PEAR/Command/Common.php';
 
 class PEAR_Command_Package extends PEAR_Command_Common
 {
+    // {{{ properties
+
     var $commands = array(
         'package' => array(
             'summary' => 'Build Package',
@@ -140,6 +142,9 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
 
     var $output;
 
+    // }}}
+    // {{{ constructor
+
     /**
      * PEAR_Command_Package constructor.
      *
@@ -150,6 +155,10 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
         parent::PEAR_Command_Common($ui, $config);
     }
 
+    // }}}
+
+    // {{{ _displayValidationResults()
+
     function _displayValidationResults($err, $warn, $strict = false)
     {
         foreach ($err as $e) {
@@ -167,6 +176,9 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
         return true;
     }
 
+    // }}}
+    // {{{ doPackage()
+
     function doPackage($command, $options, $params)
     {
         $this->output = '';
@@ -208,6 +220,9 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
         return true;
     }
 
+    // }}}
+    // {{{ doPackageValidate()
+
     function doPackageValidate($command, $options, $params)
     {
         $this->output = '';
@@ -235,6 +250,9 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
         return true;
     }
 
+    // }}}
+    // {{{ doCvsTag()
+
     function doCvsTag($command, $options, $params)
     {
         $this->output = '';
@@ -288,6 +306,9 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
         return true;
     }
 
+    // }}}
+    // {{{ doRunTests()
+
     function doRunTests($command, $options, $params)
     {
         $cwd = getcwd();
@@ -308,6 +329,9 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
         return true;
     }
 
+    // }}}
+    // {{{ doPackageDependencies()
+
     function doPackageDependencies($command, $options, $params)
     {
         // $params[0] -> the PEAR package to list its information
@@ -364,6 +388,9 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
         $this->ui->outputData("This package does not have any dependencies.", $command);
     }
 
+    // }}}
+    // {{{ doSign()
+
     function doSign($command, $options, $params)
     {
         // should move most of this code into PEAR_Packager
@@ -405,6 +432,9 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
         return true;
     }
 
+    // }}}
+    // {{{ doMakeRPM()
+
     function doMakeRPM($command, $options, $params)
     {
         if (sizeof($params) != 1) {
@@ -497,6 +527,8 @@ Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
         
         return true;
     }
+
+    // }}}
 }
 
 ?>
\ No newline at end of file
diff --git a/pear/PEAR/Command/Registry.php b/pear/PEAR/Command/Registry.php
index 870a3a6e55..7156319d06 100644
--- a/pear/PEAR/Command/Registry.php
+++ b/pear/PEAR/Command/Registry.php
@@ -25,7 +25,7 @@ require_once 'PEAR/Config.php';
 
 class PEAR_Command_Registry extends PEAR_Command_Common
 {
-    // {{{ command definitions
+    // {{{ properties
 
     var $commands = array(
         'list' => array(
@@ -76,6 +76,7 @@ installed package.'
     }
 
     // }}}
+
     // {{{ doList()
 
     function _sortinfo($a, $b)
diff --git a/pear/PEAR/Command/Remote.php b/pear/PEAR/Command/Remote.php
index 1af8902cf2..deb0139596 100644
--- a/pear/PEAR/Command/Remote.php
+++ b/pear/PEAR/Command/Remote.php
@@ -105,7 +105,7 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
 
     // }}}
 
-    // {{{ remote-info
+    // {{{ doRemoteInfo()
 
     function doRemoteInfo($command, $options, $params)
     {
@@ -128,7 +128,7 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
     }
 
     // }}}
-    // {{{ list-remote
+    // {{{ doRemoteList()
 
     function doRemoteList($command, $options, $params)
     {
@@ -157,7 +157,7 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
     }
 
     // }}}
-    // {{{ list-all
+    // {{{ doListAll()
 
     function doListAll($command, $options, $params)
     {
@@ -211,7 +211,7 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
     }
 
     // }}}
-    // {{{ search
+    // {{{ doSearch()
 
     function doSearch($command, $options, $params)
     {
@@ -262,7 +262,7 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
     }
 
     // }}}
-    // {{{ download
+    // {{{ doDownload()
 
     function doDownload($command, $options, $params)
     {
@@ -295,7 +295,7 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
     }
 
     // }}}
-    // {{{ list-upgrades
+    // {{{ doListUpgrades()
 
     function doListUpgrades($command, $options, $params)
     {