public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Robustness fixes for new PEAR2 compat code

pull/294/merge
Jordi Boggiano 2012-02-13 23:07:18 +01:00
parent 7ce47bc64b
commit 416ae21a5a
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Composer/Repository/PearRepository.php
View File

@ -54,13 +54,13 @@ class PearRepository extends ArrayRepository
$link = $category->getAttribute("xlink:href"); $link = $category->getAttribute("xlink:href");
try { try {
$packagesLink = str_replace("info.xml", "packagesinfo.xml", $link); $packagesLink = str_replace("info.xml", "packagesinfo.xml", $link);
$this->fetchPear2Packages($this->url . '/' . $packagesLink); $this->fetchPear2Packages($this->url . $packagesLink);
} catch (\ErrorException $e) { } catch (\ErrorException $e) {
if (false === strpos($e->getMessage(), '404')) { if (false === strpos($e->getMessage(), '404')) {
throw $e; throw $e;
} }
$categoryLink = str_replace("info.xml", "packages.xml", $link); $categoryLink = str_replace("info.xml", "packages.xml", $link);
$this->fetchPearPackages($this->url . '/' . $categoryLink); $this->fetchPearPackages($this->url . $categoryLink);
} }
} }
@ -153,6 +153,10 @@ class PearRepository extends ArrayRepository
{ {
$data = array(); $data = array();
foreach ($depsOptions as $name => $options) { foreach ($depsOptions as $name => $options) {
// make sure single deps are wrapped in an array
if (isset($options['name'])) {
$options = array($options);
}
if ('php' == $name) { if ('php' == $name) {
$data[$name] = $this->parseVersion($options); $data[$name] = $this->parseVersion($options);
} elseif ('package' == $name) { } elseif ('package' == $name) {
@ -188,11 +192,11 @@ class PearRepository extends ArrayRepository
unset($deps['required']['pearinstaller']); unset($deps['required']['pearinstaller']);
$depsData = array(); $depsData = array();
if (isset($deps['required'])) { if (!empty($deps['required'])) {
$depsData['require'] = $this->parseDependenciesOptions($deps['required']); $depsData['require'] = $this->parseDependenciesOptions($deps['required']);
} }
if (isset($deps['optional'])) { if (!empty($deps['optional'])) {
$depsData['suggest'] = $this->parseDependenciesOptions($deps['optional']); $depsData['suggest'] = $this->parseDependenciesOptions($deps['optional']);
} }
@ -233,12 +237,16 @@ class PearRepository extends ArrayRepository
); );
} }
$revisions = $information->getElementsByTagName('a')->item(0); $releases = $information->getElementsByTagName('a')->item(0);
$revisions = $revisions->getElementsByTagName('r'); if (!$releases) {
continue;
}
$releases = $releases->getElementsByTagName('r');
$packageUrl = $this->url . '/get/' . $packageName; $packageUrl = $this->url . '/get/' . $packageName;
foreach ($revisions as $revision) { foreach ($releases as $release) {
$version = $revision->getElementsByTagName('v')->item(0)->nodeValue; $version = $release->getElementsByTagName('v')->item(0)->nodeValue;
$revisionData = array( $releaseData = array(
'dist' => array( 'dist' => array(
'type' => 'pear', 'type' => 'pear',
'url' => $packageUrl . '-' . $version . '.tgz' 'url' => $packageUrl . '-' . $version . '.tgz'
@ -246,12 +254,12 @@ class PearRepository extends ArrayRepository
'version' => $version 'version' => $version
); );
if (isset($depsData[$version])) { if (isset($depsData[$version])) {
$revisionData += $depsData[$version]; $releaseData += $depsData[$version];
} }
try { try {
$this->addPackage( $this->addPackage(
$loader->load($packageData + $revisionData) $loader->load($packageData + $releaseData)
); );
} catch (\UnexpectedValueException $e) { } catch (\UnexpectedValueException $e) {
continue; continue;