WebSVN – Applications.gtt – Diff – /trunk/bibliotheque/pear/PEAR/Command/Registry.php

 /**
  * PEAR_Command_Registry (list, list-files, shell-test, info commands)
+ *
  * PHP versions 4 and 5
+ *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
  * @category   pear
  * @package    PEAR
  * @author     Stig Bakken <ssb@php.net>
  * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
+ * @copyright  1997-2009 The Authors
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Registry.php,v 1.75 2006/11/19 23:50:09 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
+ *
  * @category   pear
  * @package    PEAR
  * @author     Stig Bakken <ssb@php.net>
  * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
+ * @copyright  1997-2009 The Authors
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.5.1
+ * @version    Release: 1.10.1
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
 class PEAR_Command_Registry extends PEAR_Command_Common
+{
-    // {{{ properties
     var $commands = array(
         'list' => array(
             'summary' => 'List Installed Packages In The Default Channel',
             'function' => 'doList',
             'shortcut' => 'l',
                     ),
                 'allchannels' => array(
                     'shortopt' => 'a',
                     'doc' => 'list installed packages from all channels',
                     ),
+                'channelinfo' => array(
+                    'shortopt' => 'i',
+                    'doc' => 'output fully channel-aware data, even on failure',
+                    ),
                 ),
             'doc' => '<package>
 If invoked without parameters, this command lists the PEAR packages
 installed in your php_dir ({config php_dir}).  With a parameter, it
 lists the files in a package.
 local package file, an URL to a package file, or the name of an
 installed package.'
+            )
         );
-    // }}}
-    // {{{ constructor
     /**
      * PEAR_Command_Registry constructor.
+     *
      * @access public
      */
-    function PEAR_Command_Registry(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
-    }
-    // }}}
     // {{{ doList()
     function _sortinfo($a, $b)
+    {
         $apackage = isset($a['package']) ? $a['package'] : $a['name'];
         $bpackage = isset($b['package']) ? $b['package'] : $b['name'];
         return strcmp($apackage, $bpackage);
+    }
+    function doList($command, $options, $params)
+    {
-    function doList($command, $options, $params)
+        $reg = &$this->config->getRegistry();
         $channelinfo = isset($options['channelinfo']);
+        if (isset($options['allchannels']) && !$channelinfo) {
+            return $this->doListAll($command, array(), $params);
+        }
-        if (isset($options['allchannels'])) {
+        if (isset($options['allchannels']) && $channelinfo) {
+            // allchannels with $channelinfo
+            unset($options['allchannels']);
+            $channels = $reg->getChannels();
+            $errors = array();
+            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
+            foreach ($channels as $channel) {
+                $options['channel'] = $channel->getName();
+                $ret = $this->doList($command, $options, $params);
+                if (PEAR::isError($ret)) {
+                    $errors[] = $ret;
+                }
+            }
+            PEAR::staticPopErrorHandling();
+            if (count($errors)) {
+                // for now, only give first error
+                return PEAR::raiseError($errors[0]);
+            }
-            return $this->doListAll($command, array(), $params);
+            return true;
+        }
         $reg = &$this->config->getRegistry();
+        if (count($params) === 1) {
-        if (count($params) == 1) {
+            return $this->doFileList($command, $options, $params);
-            return $this->doFileList($command, $options, $params);
+        }
-        }
-        if (isset($options['channel'])) {
             if ($reg->channelExists($options['channel'])) {
-                $channel = $reg->channelName($options['channel']);
+        if (isset($options['channel'])) {
+            if (!$reg->channelExists($options['channel'])) {
+                return $this->raiseError('Channel "' . $options['channel'] .'" does not exist');
             } else {
                 return $this->raiseError('Channel "' . $options['channel'] .'" does not exist');
             $channel = $reg->channelName($options['channel']);
+        } else {
-        } else {
+            $channel = $this->config->get('default_channel');
             $channel = $this->config->get('default_channel');
-        }
         $installed = $reg->packageInfo(null, null, $channel);
         usort($installed, array(&$this, '_sortinfo'));
         $i = $j = 0;
         $data = array(
             'caption' => 'Installed packages, channel ' .
+                $channel . ':',
-                $channel . ':',
+            'border' => true,
+            'headline' => array('Package', 'Version', 'State'),
+            'channel' => $channel,
+            );
+        if ($channelinfo) {
+            $data['headline'] = array('Channel', 'Package', 'Version', 'State');
+        }
+        if (count($installed) && !isset($data['data'])) {
-            'border' => true,
+            $data['data'] = array();
             'headline' => array('Package', 'Version', 'State')
             );
+        foreach ($installed as $package) {
+            $pobj = $reg->getPackage(isset($package['package']) ?
+                                        $package['package'] : $package['name'], $channel);
+            if ($channelinfo) {
-        foreach ($installed as $package) {
+                $packageinfo = array($pobj->getChannel(), $pobj->getPackage(), $pobj->getVersion(),
-            $pobj = $reg->getPackage(isset($package['package']) ?
+                                    $pobj->getState() ? $pobj->getState() : null);
+            } else {
+                $packageinfo = array($pobj->getPackage(), $pobj->getVersion(),
-                                        $package['package'] : $package['name'], $channel);
+                                    $pobj->getState() ? $pobj->getState() : null);
+            }
-            $data['data'][] = array($pobj->getPackage(), $pobj->getVersion(),
+            $data['data'][] = $packageinfo;
+        }
-                                    $pobj->getState() ? $pobj->getState() : null);
+        if (count($installed) === 0) {
+            if (!$channelinfo) {
+                $data = '(no packages installed from channel ' . $channel . ')';
+            } else {
+                $data = array(
+                    'caption' => 'Installed packages, channel ' .
+                        $channel . ':',
+                    'border' => true,
+                    'channel' => $channel,
                     'data' => array(array('(no packages installed)')),
+                );
         if (count($installed)==0) {
             $data = '(no packages installed from channel ' . $channel . ')';
         $this->ui->outputData($data, $command);
         return true;
+    }
+    function doListAll($command, $options, $params)
+    {
         // This duplicate code is deprecated over
-    function doListAll($command, $options, $params)
+        // list --channelinfo, which gives identical
         // output for list and list --allchannels.
         $reg = &$this->config->getRegistry();
-        $installed = $reg->packageInfo(null, null, null);
-        foreach ($installed as $channel => $packages) {
+        $installed = $reg->packageInfo(null, null, null);
-            usort($packages, array($this, '_sortinfo'));
+        foreach ($installed as $channel => $packages) {
-            $i = $j = 0;
+            usort($packages, array($this, '_sortinfo'));
             $data = array(
+                'caption'  => 'Installed packages, channel ' . $channel . ':',
-                'caption' => 'Installed packages, channel ' . $channel . ':',
+                'border'   => true,
+                'headline' => array('Package', 'Version', 'State'),
-                'border' => true,
+                'channel'  => $channel
-                'headline' => array('Package', 'Version', 'State')
+            );
-                );
             foreach ($packages as $package) {
-                $pobj = $reg->getPackage(isset($package['package']) ?
+                $p = isset($package['package']) ? $package['package'] : $package['name'];
-                                            $package['package'] : $package['name'], $channel);
+                $pobj = $reg->getPackage($p, $channel);
+                $data['data'][] = array($pobj->getPackage(), $pobj->getVersion(),
+                                        $pobj->getState() ? $pobj->getState() : null);
+            }
-                $data['data'][] = array($pobj->getPackage(), $pobj->getVersion(),
+            // Adds a blank line after each section
-                                        $pobj->getState() ? $pobj->getState() : null);
+            $data['data'][] = array();
-            if (count($packages)==0) {
+            if (count($packages) === 0) {
                 $data = array(
+                    'caption' => 'Installed packages, channel ' . $channel . ':',
-                    'caption' => 'Installed packages, channel ' . $channel . ':',
+                    'border' => true,
-                    'border' => true,
+                    'data' => array(array('(no packages installed)'), array()),
-                    'data' => array(array('(no packages installed)')),
+                    'channel' => $channel
                     );
+            }
             $this->ui->outputData($data, $command);
         }
         return true;
+    }
     function doFileList($command, $options, $params)
+    {
+        if (count($params) !== 1) {
-        if (count($params) != 1) {
+            return $this->raiseError('list-files expects 1 parameter');
             return $this->raiseError('list-files expects 1 parameter');
-        }
-        $reg = &$this->config->getRegistry();
-        $fp = false;
+        $reg = &$this->config->getRegistry();
-        if (!is_dir($params[0]) && (file_exists($params[0]) || $fp = @fopen($params[0],
+        $fp = false;
-              'r'))) {
+        if (!is_dir($params[0]) && (file_exists($params[0]) || $fp = @fopen($params[0], 'r'))) {
+            if ($fp) {
-            if ($fp) {
+                fclose($fp);
                 fclose($fp);
+            if (!class_exists('PEAR_PackageFile')) {
-            if (!class_exists('PEAR_PackageFile')) {
+                require_once 'PEAR/PackageFile.php';
                 require_once 'PEAR/PackageFile.php';
-            $pkg = &new PEAR_PackageFile($this->config, $this->_debug);
+            $pkg = new PEAR_PackageFile($this->config, $this->_debug);
             PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
             $info = &$pkg->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
             $parsed = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
             PEAR::staticPopErrorHandling();
             if (PEAR::isError($parsed)) {
                 return $this->raiseError($parsed);
+            }
             $info = &$reg->getPackage($parsed['package'], $parsed['channel']);
             $headings = array('Type', 'Install Path');
             $installed = true;
+        }
         if (PEAR::isError($info)) {
             return $this->raiseError($info);
+        }
         if ($info === null) {
             return $this->raiseError("`$params[0]' not installed");
+        }
         $list = ($info->getPackagexmlVersion() == '1.0' || $installed) ?
             $info->getFilelist() : $info->getContents();
         if ($installed) {
             $caption = 'Installed Files For ' . $params[0];
         } else {
             $caption = 'Contents of ' . basename($params[0]);
+        }
         $data = array(
             'caption' => $caption,
             'border' => true,
             'headline' => $headings);
         if ($info->getPackagexmlVersion() == '1.0' || $installed) {
+            }
         } else { // package.xml 2.0, not installed
             if (!isset($list['dir']['file'][0])) {
                 $list['dir']['file'] = array($list['dir']['file']);
+            }
             foreach ($list['dir']['file'] as $att) {
                 $att = $att['attribs'];
                 $file = $att['name'];
                 $role = &PEAR_Installer_Role::factory($info, $att['role'], $this->config);
                 $role->setup($this, $info, $att, $file);
+                    }
+                }
                 $data['data'][] = array($file, $dest);
+            }
+        }
         $this->ui->outputData($data, $command);
         return true;
+    }
-    // }}}
-    // {{{ doShellTest()
     function doShellTest($command, $options, $params)
+    {
         if (count($params) < 1) {
             return PEAR::raiseError('ERROR, usage: pear shell-test packagename [[relation] version]');
+        }
         PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
         $reg = &$this->config->getRegistry();
         $info = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
         if (PEAR::isError($info)) {
             exit(1); // invalid package name
+        }
         $package = $info['package'];
         $channel = $info['channel'];
         // "pear shell-test Foo"
         if (!$reg->packageExists($package, $channel)) {
             if ($channel == 'pecl.php.net') {
                 if ($reg->packageExists($package, 'pear.php.net')) {
                     $channel = 'pear.php.net'; // magically change channels for extensions
+                }
+            }
+        }
-        }
-        if (sizeof($params) == 1) {
+        if (count($params) === 1) {
             if (!$reg->packageExists($package, $channel)) {
                 exit(1);
+            }
             // "pear shell-test Foo 1.0"
-        } elseif (sizeof($params) == 2) {
+        } elseif (count($params) === 2) {
             $v = $reg->packageInfo($package, 'version', $channel);
             if (!$v || !version_compare("$v", "{$params[1]}", "ge")) {
                 exit(1);
+            }
             // "pear shell-test Foo ge 1.0"
-        } elseif (sizeof($params) == 3) {
+        } elseif (count($params) === 3) {
             $v = $reg->packageInfo($package, 'version', $channel);
             if (!$v || !version_compare("$v", "{$params[2]}", $params[1])) {
                 exit(1);
+            }
             $this->raiseError("$command: expects 1 to 3 parameters");
             exit(1);
+        }
+    }
-    // }}}
-    // {{{ doInfo
     function doInfo($command, $options, $params)
     {
-        if (count($params) != 1) {
+        if (count($params) !== 1) {
             return $this->raiseError('pear info expects 1 parameter');
+        }
         $info = $fp = false;
+        $reg = &$this->config->getRegistry();
-        $reg = &$this->config->getRegistry();
+        if (is_file($params[0]) && !is_dir($params[0]) &&
+            (file_exists($params[0]) || $fp = @fopen($params[0], 'r'))
-        if ((file_exists($params[0]) && is_file($params[0]) && !is_dir($params[0])) || $fp = @fopen($params[0], 'r')) {
+        ) {
             if ($fp) {
                 fclose($fp);
+            }
             if (!class_exists('PEAR_PackageFile')) {
                 require_once 'PEAR/PackageFile.php';
+            }
-            }
-            $pkg = &new PEAR_PackageFile($this->config, $this->_debug);
+            $pkg = new PEAR_PackageFile($this->config, $this->_debug);
             PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
             $obj = &$pkg->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
             PEAR::staticPopErrorHandling();
             if (PEAR::isError($obj)) {
                             $message = $message['message'];
+                        }
                         $this->ui->outputData($message);
+                    }
+                }
                 return $this->raiseError($obj);
+            }
-            if ($obj->getPackagexmlVersion() == '1.0') {
+            if ($obj->getPackagexmlVersion() != '1.0') {
-                $info = $obj->toArray();
-            } else {
                 return $this->_doInfo2($command, $options, $params, $obj, false);
+            }
+            $info = $obj->toArray();
         } else {
             $parsed = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
             if (PEAR::isError($parsed)) {
                 return $this->raiseError($parsed);
+            }
             $package = $parsed['package'];
             $channel = $parsed['channel'];
             $info = $reg->packageInfo($package, null, $channel);
             if (isset($info['old'])) {
                 $obj = $reg->getPackage($package, $channel);
                 return $this->_doInfo2($command, $options, $params, $obj, true);
+            }
+        }
         if (PEAR::isError($info)) {
             return $info;
+        }
         if (empty($info)) {
             $this->raiseError("No information found for `$params[0]'");
             return;
+        }
         unset($info['filelist']);
         unset($info['dirtree']);
         unset($info['changelog']);
         if (isset($info['xsdversion'])) {
             $info['package.xml version'] = $info['xsdversion'];
             unset($info['xsdversion']);
+        }
         if (isset($info['packagerversion'])) {
             $info['packaged with PEAR version'] = $info['packagerversion'];
             unset($info['packagerversion']);
+        }
         $keys = array_keys($info);
         $longtext = array('description', 'summary');
         foreach ($keys as $key) {
             if (is_array($info[$key])) {
                 switch ($key) {
                         $info[$key] = implode(", ", $info[$key]);
                         break;
+                    }
+                }
+            }
             if ($key == '_lastmodified') {
                 $hdate = date('Y-m-d', $info[$key]);
                 unset($info[$key]);
                 $info['Last Modified'] = $hdate;
             } elseif ($key == '_lastversion') {
                 if (in_array($key, $longtext)) {
                     $info[$key] = preg_replace('/  +/', ' ', $info[$key]);
+                }
+            }
+        }
         $caption = 'About ' . $info['package'] . '-' . $info['version'];
         $data = array(
             'caption' => $caption,
             'border' => true);
         foreach ($info as $key => $value) {
         $data['raw'] = $info;
         $this->ui->outputData($data, 'package-info');
-    }
     // }}}
     /**
      * @access private
      */
         $extends = $extends ?
             $obj->getPackage() . ' (extends ' . $extends . ')' : $obj->getPackage();
         if ($src = $obj->getSourcePackage()) {
             $extends .= ' (source package ' . $src['channel'] . '/' . $src['package'] . ')';
+        }
         $info = array(
             'Release Type' => $release,
             'Name' => $extends,
             'Channel' => $obj->getChannel(),
             'Summary' => preg_replace('/  +/', ' ', $obj->getSummary()),
         foreach (array('lead', 'developer', 'contributor', 'helper') as $role) {
             $leads = $obj->{"get{$role}s"}();
             if (!$leads) {
                 continue;
+            }
             if (isset($leads['active'])) {
                 $leads = array($leads);
+            }
             foreach ($leads as $lead) {
                 if (!empty($info['Maintainers'])) {
                     $info['Maintainers'] .= "\n";
+                }
+                $active = $lead['active'] == 'no' ? ', inactive' : '';
                 $info['Maintainers'] .= $lead['name'] . ' <';
-                $info['Maintainers'] .= $lead['email'] . "> ($role)";
+                $info['Maintainers'] .= $lead['email'] . "> ($role$active)";
+            }
+        }
         $info['Release Date'] = $obj->getDate();
         if ($time = $obj->getTime()) {
             $info['Release Date'] .= ' ' . $time;
+        }
         $info['Release Version'] = $obj->getVersion() . ' (' . $obj->getState() . ')';
         $info['API Version'] = $obj->getVersion('api') . ' (' . $obj->getState('api') . ')';
         $info['License'] = $obj->getLicense();
         $uri = $obj->getLicenseLocation();
         if ($uri) {
                 if ($extra) {
                     $info['License'] .= ' (' . $uri['filesource'] . ')';
+                }
+            }
+        }
         $info['Release Notes'] = $obj->getNotes();
         if ($compat = $obj->getCompatible()) {
+            if (!isset($compat[0])) {
+                $compat = array($compat);
+            }
             $info['Compatible with'] = '';
             foreach ($compat as $package) {
-                $info['Compatible with'] .= $package['channel'] . '/' . $package['package'] .
+                $info['Compatible with'] .= $package['channel'] . '/' . $package['name'] .
                     "\nVersions >= " . $package['min'] . ', <= ' . $package['max'];
                 if (isset($package['exclude'])) {
                     if (is_array($package['exclude'])) {
                         $package['exclude'] = implode(', ', $package['exclude']);
+                    }
                     if (!isset($info['Not Compatible with'])) {
                         $info['Not Compatible with'] = '';
                     } else {
                         $info['Not Compatible with'] .= "\n";
+                    }
                     $info['Not Compatible with'] .= $package['channel'] . '/' .
-                        $package['package'] . "\nVersions " . $package['exclude'];
+                        $package['name'] . "\nVersions " . $package['exclude'];
+                }
+            }
+        }
         $usesrole = $obj->getUsesrole();
         if ($usesrole) {
             if (!isset($usesrole[0])) {
                 $usesrole = array($usesrole);
+            }
             foreach ($usesrole as $roledata) {
                 if (isset($info['Uses Custom Roles'])) {
                     $info['Uses Custom Roles'] .= "\n";
                 } else {
                     $info['Uses Custom Roles'] = '';
+                }
                 if (isset($roledata['package'])) {
                     $rolepackage = $reg->parsedPackageNameToString($roledata, true);
                 } else {
                     $rolepackage = $roledata['uri'];
+                }
                 $info['Uses Custom Roles'] .= $roledata['role'] . ' (' . $rolepackage . ')';
+            }
+        }
         $usestask = $obj->getUsestask();
         if ($usestask) {
             if (!isset($usestask[0])) {
                 $usestask = array($usestask);
+            }
             foreach ($usestask as $taskdata) {
                 if (isset($info['Uses Custom Tasks'])) {
                     $info['Uses Custom Tasks'] .= "\n";
                 } else {
                     $info['Uses Custom Tasks'] = '';
+                }
                 if (isset($taskdata['package'])) {
                     $taskpackage = $reg->parsedPackageNameToString($taskdata, true);
                 } else {
                     $taskpackage = $taskdata['uri'];
+                }
                 $info['Uses Custom Tasks'] .= $taskdata['task'] . ' (' . $taskpackage . ')';
+            }
+        }
         $deps = $obj->getDependencies();
         $info['Required Dependencies'] = 'PHP version ' . $deps['required']['php']['min'];
         if (isset($deps['required']['php']['max'])) {
             $info['Required Dependencies'] .= '-' . $deps['required']['php']['max'] . "\n";
         } else {
             $info['Required Dependencies'] .= "\n";
+        }
         if (isset($deps['required']['php']['exclude'])) {
             if (!isset($info['Not Compatible with'])) {
                 $info['Not Compatible with'] = '';
             } else {
                 $info['Not Compatible with'] .= "\n";
+            }
             if (is_array($deps['required']['php']['exclude'])) {
                 $deps['required']['php']['exclude'] =
                     implode(', ', $deps['required']['php']['exclude']);
+            }
             $info['Not Compatible with'] .= "PHP versions\n  " .
                 $deps['required']['php']['exclude'];
+        }
         $info['Required Dependencies'] .= 'PEAR installer version';
         if (isset($deps['required']['pearinstaller']['max'])) {
             $info['Required Dependencies'] .= 's ' .
                 $deps['required']['pearinstaller']['min'] . '-' .
                 $deps['required']['pearinstaller']['max'];
         } else {
             $info['Required Dependencies'] .= ' ' .
                 $deps['required']['pearinstaller']['min'] . ' or newer';
+        }
         if (isset($deps['required']['pearinstaller']['exclude'])) {
             if (!isset($info['Not Compatible with'])) {
                 $info['Not Compatible with'] = '';
             } else {
                 $info['Not Compatible with'] .= "\n";
+            }
             if (is_array($deps['required']['pearinstaller']['exclude'])) {
                 $deps['required']['pearinstaller']['exclude'] =
                     implode(', ', $deps['required']['pearinstaller']['exclude']);
+            }
             $info['Not Compatible with'] .= "PEAR installer\n  Versions " .
                 $deps['required']['pearinstaller']['exclude'];
+        }
         foreach (array('Package', 'Extension') as $type) {
             $index = strtolower($type);
             if (isset($deps['required'][$index])) {
                 if (isset($deps['required'][$index]['name'])) {
                     $deps['required'][$index] = array($deps['required'][$index]);
+                }
                 foreach ($deps['required'][$index] as $package) {
                     if (isset($package['conflicts'])) {
                         $infoindex = 'Not Compatible with';
                         if (!isset($info['Not Compatible with'])) {
                             $info['Not Compatible with'] = '';
+                        }
                     } else {
                         $infoindex = 'Required Dependencies';
                         $info[$infoindex] .= "\n";
+                    }
                     if ($index == 'extension') {
                         $name = $package['name'];
                     } else {
                         if (isset($package['channel'])) {
                             $name = $package['channel'] . '/' . $package['name'];
                         } else {
                             $name = '__uri/' . $package['name'] . ' (static URI)';
+                        }
+                    }
                     $info[$infoindex] .= "$type $name";
                     if (isset($package['uri'])) {
                         $info[$infoindex] .= "\n  Download URI: $package[uri]";
                         continue;
+                    }
                     if (isset($package['max']) && isset($package['min'])) {
                         $info[$infoindex] .= " \n  Versions " .
                             $package['min'] . '-' . $package['max'];
                     } elseif (isset($package['min'])) {
                         $info[$infoindex] .= " \n  Version " .
                             $package['min'] . ' or newer';
                     } elseif (isset($package['max'])) {
                         $info[$infoindex] .= " \n  Version " .
                             $package['max'] . ' or older';
+                    }
                     if (isset($package['recommended'])) {
                         $info[$infoindex] .= "\n  Recommended version: $package[recommended]";
+                    }
                     if (isset($package['exclude'])) {
                         if (!isset($info['Not Compatible with'])) {
                             $info['Not Compatible with'] = '';
                         } else {
                             $info['Not Compatible with'] .= "\n";
+                        }
                         if (is_array($package['exclude'])) {
                             $package['exclude'] = implode(', ', $package['exclude']);
+                        }
                         $package['package'] = $package['name']; // for parsedPackageNameToString
                          if (isset($package['conflicts'])) {
                             $info['Not Compatible with'] .= '=> except ';
+                        }
                        $info['Not Compatible with'] .= 'Package ' .
                         $info['Not Compatible with'] .= "\n  Versions " . $package['exclude'];
+                    }
+                }
+            }
+        }
         if (isset($deps['required']['os'])) {
             if (isset($deps['required']['os']['name'])) {
                 $dep['required']['os']['name'] = array($dep['required']['os']['name']);
+            }
             foreach ($dep['required']['os'] as $os) {
                 if (isset($os['conflicts']) && $os['conflicts'] == 'yes') {
                     if (!isset($info['Not Compatible with'])) {
                         $info['Not Compatible with'] = '';
                     } else {
                     $info['Required Dependencies'] .= "\n";
                     $info['Required Dependencies'] .= "$os[name] Operating System";
+                }
+            }
+        }
         if (isset($deps['required']['arch'])) {
             if (isset($deps['required']['arch']['pattern'])) {
                 $dep['required']['arch']['pattern'] = array($dep['required']['os']['pattern']);
+            }
             foreach ($dep['required']['arch'] as $os) {
                 if (isset($os['conflicts']) && $os['conflicts'] == 'yes') {
                     if (!isset($info['Not Compatible with'])) {
                         $info['Not Compatible with'] = '';
                     } else {
                     $info['Required Dependencies'] .= "\n";
                     $info['Required Dependencies'] .= "OS/Arch matching pattern '/$os[pattern]/'";
+                }
+            }
+        }
         if (isset($deps['optional'])) {
             foreach (array('Package', 'Extension') as $type) {
                 $index = strtolower($type);
                 if (isset($deps['optional'][$index])) {
                     if (isset($deps['optional'][$index]['name'])) {
                         $deps['optional'][$index] = array($deps['optional'][$index]);
+                    }
                     foreach ($deps['optional'][$index] as $package) {
                         if (isset($package['conflicts']) && $package['conflicts'] == 'yes') {
                             $infoindex = 'Not Compatible with';
                             if (!isset($info['Not Compatible with'])) {
                                 $info['Not Compatible with'] = '';
                                 $info['Optional Dependencies'] = '';
                             } else {
                                 $info['Optional Dependencies'] .= "\n";
+                            }
+                        }
                         if ($index == 'extension') {
                             $name = $package['name'];
                         } else {
                             if (isset($package['channel'])) {
                                 $name = $package['channel'] . '/' . $package['name'];
                             } else {
                                 $name = '__uri/' . $package['name'] . ' (static URI)';
+                            }
+                        }
                         $info[$infoindex] .= "$type $name";
                         if (isset($package['uri'])) {
                             $info[$infoindex] .= "\n  Download URI: $package[uri]";
                             continue;
+                        }
                         if ($infoindex == 'Not Compatible with') {
                             // conflicts is only used to say that all versions conflict
                             continue;
+                        }
                         if (isset($package['max']) && isset($package['min'])) {
                             $info[$infoindex] .= " \n  Versions " .
                                 $package['min'] . '-' . $package['max'];
                         } elseif (isset($package['min'])) {
                             $info[$infoindex] .= " \n  Version " .
                                 $package['min'] . ' or newer';
                         } elseif (isset($package['max'])) {
                             $info[$infoindex] .= " \n  Version " .
                                 $package['min'] . ' or older';
+                        }
                         if (isset($package['recommended'])) {
                             $info[$infoindex] .= "\n  Recommended version: $package[recommended]";
+                        }
                         if (isset($package['exclude'])) {
                             if (!isset($info['Not Compatible with'])) {
                                 $info['Not Compatible with'] = '';
                             } else {
                                 $info['Not Compatible with'] .= "\n";
+                            }
                             if (is_array($package['exclude'])) {
                                 $package['exclude'] = implode(', ', $package['exclude']);
+                            }
                             $info['Not Compatible with'] .= "Package $package\n  Versions " .
                                 $package['exclude'];
+                        }
+                    }
+                }
+            }
+        }
         if (isset($deps['group'])) {
             if (!isset($deps['group'][0])) {
                 $deps['group'] = array($deps['group']);
+            }
             foreach ($deps['group'] as $group) {
                 $info['Dependency Group ' . $group['attribs']['name']] = $group['attribs']['hint'];
                 $groupindex = $group['attribs']['name'] . ' Contents';
                 $info[$groupindex] = '';
                 foreach (array('Package', 'Extension') as $type) {
                     $index = strtolower($type);
                     if (isset($group[$index])) {
                         if (isset($group[$index]['name'])) {
                             $group[$index] = array($group[$index]);
+                        }
                         foreach ($group[$index] as $package) {
                             if (!empty($info[$groupindex])) {
                                 $info[$groupindex] .= "\n";
+                            }
                             if ($index == 'extension') {
                                 $name = $package['name'];
                             } else {
                                 if (isset($package['channel'])) {
                                     $name = $package['channel'] . '/' . $package['name'];
                                 } else {
                                     $name = '__uri/' . $package['name'] . ' (static URI)';
+                                }
+                            }
                             if (isset($package['uri'])) {
                                 if (isset($package['conflicts']) && $package['conflicts'] == 'yes') {
                                     $info[$groupindex] .= "Not Compatible with $type $name";
                                 } else {
                                     $info[$groupindex] .= "$type $name";
+                                }
                                 $info[$groupindex] .= "\n  Download URI: $package[uri]";
                                 continue;
+                            }
                             if (isset($package['conflicts']) && $package['conflicts'] == 'yes') {
                                 $info[$groupindex] .= "Not Compatible with $type $name";
                                 continue;
+                            }
                             $info[$groupindex] .= "$type $name";
                             if (isset($package['max']) && isset($package['min'])) {
                                 $info[$groupindex] .= " \n  Versions " .
                                     $package['min'] . '-' . $package['max'];
                             } elseif (isset($package['min'])) {
                                     $package['min'] . ' or newer';
                             } elseif (isset($package['max'])) {
                                 $info[$groupindex] .= " \n  Version " .
                                     $package['min'] . ' or older';
+                            }
                             if (isset($package['recommended'])) {
                                 $info[$groupindex] .= "\n  Recommended version: $package[recommended]";
+                            }
                             if (isset($package['exclude'])) {
                                 if (!isset($info['Not Compatible with'])) {
                                     $info['Not Compatible with'] = '';
                                 } else {
                                     $info[$groupindex] .= "Not Compatible with\n";
+                                }
                                 if (is_array($package['exclude'])) {
                                     $package['exclude'] = implode(', ', $package['exclude']);
+                                }
                                 $info[$groupindex] .= "  Package $package\n  Versions " .
                                     $package['exclude'];
+                        }
+                    }
+                }
+            }
+        }
         if ($obj->getPackageType() == 'bundle') {
             $info['Bundled Packages'] = '';
             foreach ($obj->getBundledPackages() as $package) {
                 if (!empty($info['Bundled Packages'])) {
                     $info['Bundled Packages'] .= "\n";
+                }
                 if (isset($package['uri'])) {
                     $info['Bundled Packages'] .= '__uri/' . $package['name'];
                     $info['Bundled Packages'] .= "\n  (URI: $package[uri]";
                 } else {
                     $info['Bundled Packages'] .= $package['channel'] . '/' . $package['name'];
+                }
+            }
+        }
         $info['package.xml version'] = '2.0';
         if ($installed) {
             if ($obj->getLastModified()) {
                 $info['Last Modified'] = date('Y-m-d H:i', $obj->getLastModified());
+            }
             $v = $obj->getLastInstalledVersion();
             $info['Previous Installed Version'] = $v ? $v : '- None -';
+        }
         foreach ($info as $key => $value) {
             $data['data'][] = array($key, $value);
+        }
-        $data['raw'] = $obj->getArray(); // no validation needed
         $data['raw'] = $obj->getArray(); // no validation needed
         $this->ui->outputData($data, 'package-info');
+    }
-}

Subversion Repositories Applications.gtt

(root)/trunk/bibliotheque/pear/PEAR/Command/Registry.php – Rev 94 → 187