- Force params to version_compare() to be strings, otherwise some

  comparations will fail (ex. 0.9 will be equal to 0.90)
- Other minor cleanup's

9 files changed, 30 insertions, 22 deletions

diff --git a/pear/PEAR/Command/Install.php b/pear/PEAR/Command/Install.php
index 6c24be19ad..36c0b80cd3 100644
--- a/pear/PEAR/Command/Install.php
+++ b/pear/PEAR/Command/Install.php
@@ -182,13 +182,16 @@ specified at once.
         if (empty($this->installer)) {
             $this->installer = &new PEAR_Installer($this->ui);
         }
+        if (sizeof($params) < 1) {
+            return $this->raiseError("Please supply the package(s) you want to uninstall");
+        }
         foreach ($params as $pkg) {
             if ($this->installer->uninstall($pkg, $options)) {
                 if ($this->config->get('verbose') > 0) {
-                    $this->ui->outputData("uninstall ok", $command);
+                    $this->ui->outputData("uninstall $pkg ok", $command);
                 }
             } else {
-                return $this->raiseError("uninstall failed");
+                return $this->raiseError("uninstall $pkg failed");
             }
         }
         return true;
diff --git a/pear/PEAR/Command/Registry.php b/pear/PEAR/Command/Registry.php
index 57bc616544..95650befbb 100644
--- a/pear/PEAR/Command/Registry.php
+++ b/pear/PEAR/Command/Registry.php
@@ -189,13 +189,13 @@ installed package.'
             // "pear shell-test Foo 1.0"
         } elseif (sizeof($params) == 2) {
             $v = $reg->packageInfo($params[0], 'version');
-            if (!$v || !version_compare($v, $params[1], "ge")) {
+            if (!$v || !version_compare("$v", "{$params[1]}", "ge")) {
                 exit(1);
             }
             // "pear shell-test Foo ge 1.0"
         } elseif (sizeof($params) == 3) {
             $v = $reg->packageInfo($params[0], 'version');
-            if (!$v || !version_compare($v, $params[2], $params[1])) {
+            if (!$v || !version_compare("$v", "{$params[2]}", $params[1])) {
                 exit(1);
             }
         } else {
diff --git a/pear/PEAR/Command/Remote.php b/pear/PEAR/Command/Remote.php
index c92d6e36cc..e373abb50a 100644
--- a/pear/PEAR/Command/Remote.php
+++ b/pear/PEAR/Command/Remote.php
@@ -125,7 +125,7 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
         $info['installed'] = $installed['version'] ? $installed['version'] : '- no -';
 
         $this->ui->outputData($info, $command);
-        
+
         return true;
     }
 
@@ -190,7 +190,7 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
                     continue;
                 if ($options['mode'] == 'notinstalled' && isset($installed['version']))
                     continue;
-                if ($options['mode'] == 'upgrades' 
+                if ($options['mode'] == 'upgrades'
                     && (!isset($installed['version']) || $installed['version'] == $info['stable']))
                 {
                     continue;
@@ -329,7 +329,7 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
             }
             extract($info);
             $inst_version = $reg->packageInfo($package, 'version');
-            if (version_compare($version, $inst_version, "le")) {
+            if (version_compare("$version", "$inst_version", "le")) {
                 // installed version is up-to-date
                 continue;
             }
@@ -344,7 +344,11 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
             }
             $data['data'][] = array($package, $version, $fs);
         }
-        $this->ui->outputData($data, $command);
+        if (empty($data['data'])) {
+            $this->ui->outputData('No upgrades avaible');
+        } else {
+            $this->ui->outputData($data, $command);
+        }
         return true;
     }
 
diff --git a/pear/PEAR/Common.php b/pear/PEAR/Common.php
index efd76f497a..ca06a96fb1 100644
--- a/pear/PEAR/Common.php
+++ b/pear/PEAR/Common.php
@@ -974,11 +974,11 @@ class PEAR_Common extends PEAR
     function validatePackageInfo($info, &$errors, &$warnings)
     {
         global $_PEAR_Common_maintainer_roles,
-            $_PEAR_Common_release_states,
-            $_PEAR_Common_dependency_types,
-            $_PEAR_Common_dependency_relations,
-            $_PEAR_Common_file_roles,
-            $_PEAR_Common_replacement_types;
+               $_PEAR_Common_release_states,
+               $_PEAR_Common_dependency_types,
+               $_PEAR_Common_dependency_relations,
+               $_PEAR_Common_file_roles,
+               $_PEAR_Common_replacement_types;
         if (PEAR::isError($info = $this->infoFromAny($info))) {
             return $this->raiseError($info);
         }
diff --git a/pear/PEAR/Config.php b/pear/PEAR/Config.php
index e62914041c..321a2c5977 100644
--- a/pear/PEAR/Config.php
+++ b/pear/PEAR/Config.php
@@ -453,7 +453,7 @@ class PEAR_Config extends PEAR
             $version = $matches[1];
             $contents = substr($contents, strlen($matches[0]));
         }
-        if (version_compare($version, '1', '<')) {
+        if (version_compare("$version", '1', '<')) {
             $data = unserialize($contents);
             if (!is_array($data)) {
                 if (strlen(trim($contents)) > 0) {
@@ -601,7 +601,7 @@ class PEAR_Config extends PEAR
         }
         extract($this->configuration_info[$key]);
         switch ($type) {
-            case 'integer': 
+            case 'integer':
                 $value = (int)$value;
                 break;
             case 'set': {
diff --git a/pear/PEAR/Dependency.php b/pear/PEAR/Dependency.php
index 38d2eb762e..53b32c67e2 100644
--- a/pear/PEAR/Dependency.php
+++ b/pear/PEAR/Dependency.php
@@ -112,7 +112,7 @@ class PEAR_Dependency
             case 'gt':
                 $version = $this->registry->packageInfo($name, 'version');
                 if (!$this->registry->packageExists($name)
-                    || !version_compare($version, $req, $relation))
+                    || !version_compare("$version", "$req", $relation))
                 {
                     return "requires package `$name' " .
                            $this->signOperator($relation) . " $req";
@@ -143,7 +143,8 @@ class PEAR_Dependency
         if (substr($relation, 0, 2) == 'v.') {
             $ext_ver = phpversion($name);
             $operator = substr($relation, 2);
-            if (!version_compare($ext_ver, $req, $operator)) {
+            // Force params to be strings, otherwise the comparation will fail (ex. 0.9==0.90)
+            if (!version_compare("$ext_ver", "$req", $operator)) {
                 return "'$name' PHP extension version " .
                         $this->signOperator($operator) . " $req is required";
             }
@@ -183,7 +184,7 @@ class PEAR_Dependency
         if (substr($relation, 0, 2) == 'v.') {
             $php_ver = phpversion();
             $operator = substr($relation, 2);
-            if (!version_compare($php_ver, $req, $operator)) {
+            if (!version_compare("$php_ver", "$req", $operator)) {
                 return "PHP version " . $this->signOperator($operator) .
                        " $req is required";
             }
diff --git a/pear/PEAR/Frontend/CLI.php b/pear/PEAR/Frontend/CLI.php
index 3366138714..9a59ed7519 100644
--- a/pear/PEAR/Frontend/CLI.php
+++ b/pear/PEAR/Frontend/CLI.php
@@ -422,7 +422,7 @@ class PEAR_Frontend_CLI extends PEAR
                     $count = count($data['data'][0]);
                     if ($count == 2) {
                         $opts = array(0 => array('wrap' => 25),
-                                      1 => array('wrap' => 50)
+                                      1 => array('wrap' => 48)
                         );
                     } elseif ($count == 3) {
                         $opts = array(0 => array('wrap' => 20),
diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php
index 2b6e43e2cb..f1351c9473 100644
--- a/pear/PEAR/Installer.php
+++ b/pear/PEAR/Installer.php
@@ -427,8 +427,8 @@ class PEAR_Installer extends PEAR_Common
             }
             $v1 = $this->registry->packageInfo($pkgname, 'version');
             $v2 = $pkginfo['version'];
-            $cmp = version_compare($v1, $v2, 'gt');
-            if (empty($options['force']) && !version_compare($v2, $v1, 'gt')) {
+            $cmp = version_compare("$v1", "$v2", 'gt');
+            if (empty($options['force']) && !version_compare("$v2", "$v1", 'gt')) {
                 return $this->raiseError("upgrade to a newer version ($v2 is not newer than $v1)");
             }
             if (empty($options['register-only'])) {
diff --git a/pear/PEAR/Registry.php b/pear/PEAR/Registry.php
index 2d3028c69f..af222b8645 100644
--- a/pear/PEAR/Registry.php
+++ b/pear/PEAR/Registry.php
@@ -561,7 +561,7 @@ class PEAR_Registry extends PEAR
                 // XXX (cox) Possible problem with changes in the way
                 // PEAR_Dependency::checkPackage() works
                 if ($relation != 'has') {
-                    if (!version_compare($new_version, $require, $relation)) {
+                    if (!version_compare("$new_version", "$require", $relation)) {
                         $fails[] = $dep;
                     }
                 }