Merge remote-tracking branch 'henriquemoody/master'

.gitignore

@@ -3,3 +3,4 @@
 /.buildpath
 /composer.phar
 /vendor
+/nbproject

src/Composer/Repository/PearRepository.php

@@ -31,7 +31,7 @@ class PearRepository extends ArrayRepository
             throw new \UnexpectedValueException('Invalid url given for PEAR repository: '.$config['url']);
         }
 
-        $this->url = $config['url'];
+        $this->url = rtrim($config['url'], '/');
     }
 
     protected function initialize()
@@ -51,13 +51,29 @@ class PearRepository extends ArrayRepository
         $categories = $categoryXML->getElementsByTagName("c");
 
         foreach ($categories as $category) {
-            $categoryLink = $category->getAttribute("xlink:href");
+            $link = $category->getAttribute("xlink:href");
-            $categoryLink = str_replace("info.xml", "packages.xml", $categoryLink);
+            try {
-            if ('/' !== substr($categoryLink, 0, 1)) {
+                $packagesLink = str_replace("info.xml", "packagesinfo.xml", $link);
-                $categoryLink = '/' . $categoryLink;
+                $this->fetchPear2Packages($this->url . '/' . $packagesLink);
+            } catch (\ErrorException $e) {
+                if (false === strpos($e->getMessage(), '404')) {
+                    throw $e;
+                }
+                $categoryLink = str_replace("info.xml", "packages.xml", $link);
+                $this->fetchPearPackages($this->url . '/' . $categoryLink);
             }
-            $packagesXML = $this->requestXml($this->url . $categoryLink);
 
+        }
+    }
+
+    /**
+     * @param   string $categoryLink
+     * @throws  ErrorException
+     * @throws  InvalidArgumentException
+     */
+    private function fetchPearPackages($categoryLink)
+    {
+        $packagesXML = $this->requestXml($categoryLink);
         $packages = $packagesXML->getElementsByTagName('p');
         $loader = new ArrayLoader();
         foreach ($packages as $package) {
@@ -79,7 +95,7 @@ class PearRepository extends ArrayRepository
             $releases = $releasesXML->getElementsByTagName('r');
 
             foreach ($releases as $release) {
-                    /* @var $release DOMElement */
+                /* @var $release \DOMElement */
                 $pearVersion = $release->getElementsByTagName('v')->item(0)->nodeValue;
 
                 $packageData = array(
@@ -98,36 +114,151 @@ class PearRepository extends ArrayRepository
                     throw $e;
                 }
 
+                $packageData += $this->parseDependencies($deps);
+
+                try {
+                    $this->addPackage($loader->load($packageData));
+                } catch (\UnexpectedValueException $e) {
+                    continue;
+                }
+            }
+        }
+    }
+
+    /**
+     * @param   array $data
+     * @return  string
+     */
+    private function parseVersion(array $data)
+    {
+        if (!isset($data['min']) && !isset($data['max'])) {
+            return '*';
+        }
+        $versions = array();
+        if (isset($data['min'])) {
+            $versions[] = '>=' . $data['min'];
+        }
+        if (isset($data['max'])) {
+            $versions[] = '<=' . $data['max'];
+        }
+        return implode(',', $versions);
+    }
+
+    /**
+     * @todo    Improve dependencies resolution of pear packages.
+     * @param   array $options
+     * @return  array
+     */
+    private function parseDependenciesOptions(array $depsOptions)
+    {
+        $data = array();
+        foreach ($depsOptions as $name => $options) {
+            if ('php' == $name) {
+                $data[$name] = $this->parseVersion($options);
+            } elseif ('package' == $name) {
+                foreach ($options as $key => $value) {
+                    if (is_array($value)) {
+                        $dataKey = $value['name'];
+                        $data[$dataKey] = $this->parseVersion($value);
+                    }
+                }
+            } elseif ('extension' == $name) {
+                foreach ($options as $key => $value) {
+                    $dataKey = 'ext-' . $value['name'];
+                    $data[$dataKey] = $this->parseVersion($value);
+                }
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * @param   string $deps
+     * @return  array
+     * @throws  InvalidArgumentException
+     */
+    private function parseDependencies($deps)
+    {
         if (preg_match('((O:([0-9])+:"([^"]+)"))', $deps, $matches)) {
             if (strlen($matches[3]) == $matches[2]) {
                 throw new \InvalidArgumentException("Invalid dependency data, it contains serialized objects.");
             }
         }
-                    $deps = unserialize($deps);
+        $deps = (array) @unserialize($deps);
-                    if (isset($deps['required']['package'])) {
+        unset($deps['required']['pearinstaller']);
+
+        $depsData = array();
+        if (isset($deps['required'])) {
+            $depsData['require'] = $this->parseDependenciesOptions($deps['required']);
+        }
 
-                        if (isset($deps['required']['package']['name'])) {
+        if (isset($deps['optional'])) {
-                            $deps['required']['package'] = array($deps['required']['package']);
+            $depsData['suggest'] = $this->parseDependenciesOptions($deps['optional']);
         }
 
-                        foreach ($deps['required']['package'] as $dependency) {
+        return $depsData;
-                            if (isset($dependency['min'])) {
+    }
-                                $packageData['require'][$dependency['name']] = '>='.$dependency['min'];
+
-                            } else {
+    /**
-                                $packageData['require'][$dependency['name']] = '>=0.0.0';
+     * @param   string $packagesLink
+     * @return  void
+     * @throws  InvalidArgumentException
+     */
+    private function fetchPear2Packages($packagesLink)
+    {
+        $loader = new ArrayLoader();
+        $packagesXml = $this->requestXml($packagesLink);
+        $informations = $packagesXml->getElementsByTagName('pi');
+        foreach ($informations as $information) {
+            $package = $information->getElementsByTagName('p')->item(0);
+
+            $packageName = $package->getElementsByTagName('n')->item(0)->nodeValue;
+            $packageData = array(
+                'name' => $packageName,
+                'type' => 'library'
+            );
+            $packageKeys = array('l' => 'license', 'd' => 'description');
+            foreach ($packageKeys as $pear => $composer) {
+                if ($package->getElementsByTagName($pear)->length > 0
+                        && ($pear = $package->getElementsByTagName($pear)->item(0)->nodeValue)) {
+                    $packageData[$composer] = $pear;
                 }
             }
+
+            $depsData = array();            
+            foreach ($information->getElementsByTagName('deps') as $depElement) {
+                $depsVersion = $depElement->getElementsByTagName('v')->item(0)->nodeValue;
+                $depsData[$depsVersion] = $this->parseDependencies(
+                    $depElement->getElementsByTagName('d')->item(0)->nodeValue
+                );
+            }
+
+            $revisions = $information->getElementsByTagName('a')->item(0);
+            $revisions = $revisions->getElementsByTagName('r');
+            $packageUrl = $this->url . '/get/' . $packageName;
+            foreach ($revisions as $revision) {
+                $version = $revision->getElementsByTagName('v')->item(0)->nodeValue;
+                $revisionData = array(
+                    'dist' => array(
+                        'type' => 'pear',
+                        'url' => $packageUrl . '-' . $version . '.tgz'
+                    ),
+                    'version' => $version
+                );
+                if (isset($depsData[$version])) {
+                    $revisionData += $depsData[$version];
                 }
 
                 try {
-                        $this->addPackage($loader->load($packageData));
+                    $this->addPackage(
+                        $loader->load($packageData + $revisionData)
+                    );
                 } catch (\UnexpectedValueException $e) {
                     continue;
                 }
             }
         }
     }
-    }
 
     /**
      * @param  string $url