Adapt this commands to the new config store mechanism and command params

diff --git a/pear/PEAR/Command/Config.php b/pear/PEAR/Command/Config.php
index 9664f57fe7565a6c24318d64f9b69ecc235f556d..06a331399f1cfcfdfeab081b181ba1e75a67434d 100644 (file)
--- a/pear/PEAR/Command/Config.php
+++ b/pear/PEAR/Command/Config.php
@@ -37,9 +37,9 @@ class PEAR_Command_Config extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Config($ui)
+    function PEAR_Command_Config(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui);
+        parent::PEAR_Command_Common($ui, $config);
     }
 
     // }}}
@@ -59,9 +59,9 @@ class PEAR_Command_Config extends PEAR_Command_Common
     // }}}
     // {{{ run()
 
-    function run($command, $options, $params)
+    function run($command, $params)
     {
-        $cf = $this->config;
+        $cf =& $this->config;
         $failmsg = '';
         switch ($command) {
             case 'config-show': {

diff --git a/pear/PEAR/Command/Login.php b/pear/PEAR/Command/Login.php
index b7e17323d13dcebf52efaf39d1ea7b81213aff48..cd958752fae2a4685bb57d2aac6eda0297c7818a 100644 (file)
--- a/pear/PEAR/Command/Login.php
+++ b/pear/PEAR/Command/Login.php
@@ -35,7 +35,7 @@ class PEAR_Command_Login extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Login($ui)
+    function PEAR_Command_Login(&$ui, &$config)
     {
         parent::PEAR_Command_Common($ui);
     }
@@ -70,7 +70,7 @@ class PEAR_Command_Login extends PEAR_Command_Common
      *
      * @access public
      */
-    function run($command, $options, $params)
+    function run($command, $params)
     {
         $cf = $this->config;
         $failmsg = '';
@@ -83,7 +83,7 @@ class PEAR_Command_Login extends PEAR_Command_Common
                 }
                 $this->ui->displayLine("Logging in to $server.");
                 $username = trim($this->ui->userDialog('Username', 'text', $username));
-                
+
                 $cf->set('username', $username);
                 $password = trim($this->ui->userDialog('Password', 'password'));
                 $cf->set('password', $password);