Make PEAR_Dependency2::_getExtraString() static

Also make calls to it static (not strictly necessary) and drop an
object instantiation that becomes unnecessary due to that.

Author: nikic

PEAR/Command/Package.php

@@ -872,7 +872,6 @@ function doPackageDependencies($command, $options, $params)
                 $deps = $info->getDependencies();
                 $reg = &$this->config->getRegistry();
                 if (is_array($deps)) {
-                    $d = new PEAR_Dependency2($this->config, array(), '');
                     $data = array(
                         'caption' => 'Dependencies for ' . $info->getPackage(),
                         'border' => true,
@@ -929,7 +928,7 @@ function doPackageDependencies($command, $options, $params)
                                     if (isset($inf['conflicts'])) {
                                         $ver = 'conflicts';
                                     } else {
-                                        $ver = $d->_getExtraString($inf);
+                                        $ver = PEAR_Dependency2::_getExtraString($inf);
                                     }
 
                                     $data['data'][] = array($req, ucfirst($deptype), $name,

PEAR/Dependency2.php

@@ -110,7 +110,7 @@ function __construct(&$config, $installoptions, $package,
         $this->_currentPackage = $package;
     }
 
-    function _getExtraString($dep)
+    static function _getExtraString($dep)
     {
         $extra = ' (';
         if (isset($dep['uri'])) {
@@ -337,7 +337,7 @@ function validateExtensionDependency($dep, $required = true)
         }
 
         $loaded = $this->extension_loaded($dep['name']);
-        $extra  = $this->_getExtraString($dep);
+        $extra  = self::_getExtraString($dep);
         if (isset($dep['exclude'])) {
             if (!is_array($dep['exclude'])) {
                 $dep['exclude'] = array($dep['exclude']);
@@ -486,7 +486,7 @@ function validatePhpDependency($dep)
         }
 
         $version = $this->phpversion();
-        $extra   = $this->_getExtraString($dep);
+        $extra   = self::_getExtraString($dep);
         if (isset($dep['exclude'])) {
             if (!is_array($dep['exclude'])) {
                 $dep['exclude'] = array($dep['exclude']);
@@ -546,7 +546,7 @@ function getPEARVersion()
     function validatePearinstallerDependency($dep)
     {
         $pearversion = $this->getPEARVersion();
-        $extra = $this->_getExtraString($dep);
+        $extra = self::_getExtraString($dep);
         if (isset($dep['exclude'])) {
             if (!is_array($dep['exclude'])) {
                 $dep['exclude'] = array($dep['exclude']);
@@ -700,7 +700,7 @@ function _validatePackageDownload($dep, $required, $params, $depv1 = false)
             }
         }
 
-        $extra = $this->_getExtraString($dep);
+        $extra = self::_getExtraString($dep);
         if (isset($dep['exclude']) && !is_array($dep['exclude'])) {
             $dep['exclude'] = array($dep['exclude']);
         }
@@ -1098,7 +1098,7 @@ function _validatePackageUninstall($dep, $required, $dl)
             return true;
         }
 
-        $extra = $this->_getExtraString($dep);
+        $extra = self::_getExtraString($dep);
         if (isset($dep['exclude']) && !is_array($dep['exclude'])) {
             $dep['exclude'] = array($dep['exclude']);
         }