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

various fixes for composer interaction with pear repositories: 

- corrected pear repository base url from channel.xml is now used instead of a hardcoded host/rest/* endpoin
t
- XML is now parsed with LIBXML_NOERROR to accomondate pear repositories with slightly invalid XML (e.g. components.ez.no)
- instead of following links in the returned xml files the pear api structure is now hardcoded so that pear repositories with invalid links also work (again components.ez.no). additional benefit: this removes the need for some str_replace calls
- for pear packages with a packages.json file: 'pear-'.$channelName is not added to package names if this is already part of the package name (see pear.phpunit.de)
pull/585/head
Bastian Hofmann 2012-04-16 16:54:44 +01:00
parent 5a3827cefb
commit a86ea59742
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ class PearRepository extends ArrayRepository
private static $channelNames = array(); private static $channelNames = array();
private $url; private $url;
private $baseUrl;
private $channel; private $channel;
private $io; private $io;
private $rfs; private $rfs;
@ -68,7 +69,9 @@ class PearRepository extends ArrayRepository
$loader = new ArrayLoader(); $loader = new ArrayLoader();
foreach ($packages as $data) { foreach ($packages as $data) {
foreach ($data['versions'] as $rev) { foreach ($data['versions'] as $rev) {
if (strpos($rev['name'], 'pear-'.$this->channel) !== 0) {
$rev['name'] = 'pear-'.$this->channel.'/'.$rev['name']; $rev['name'] = 'pear-'.$this->channel.'/'.$rev['name'];
}
$this->addPackage($loader->load($rev)); $this->addPackage($loader->load($rev));
} }
} }
@ -87,26 +90,31 @@ class PearRepository extends ArrayRepository
$this->channel = $channelXML->getElementsByTagName("suggestedalias")->item(0)->nodeValue $this->channel = $channelXML->getElementsByTagName("suggestedalias")->item(0)->nodeValue
?: $channelXML->getElementsByTagName("name")->item(0)->nodeValue; ?: $channelXML->getElementsByTagName("name")->item(0)->nodeValue;
} }
if (!$this->baseUrl) {
$this->baseUrl = $channelXML->getElementsByTagName("baseurl")->item(0)->nodeValue
? trim($channelXML->getElementsByTagName("baseurl")->item(0)->nodeValue, '/')
: $this->url . '/rest';
}
self::$channelNames[$channelXML->getElementsByTagName("name")->item(0)->nodeValue] = $this->channel; self::$channelNames[$channelXML->getElementsByTagName("name")->item(0)->nodeValue] = $this->channel;
} }
protected function fetchFromServer() protected function fetchFromServer()
{ {
$categoryXML = $this->requestXml($this->url . "/rest/c/categories.xml"); $categoryXML = $this->requestXml($this->baseUrl . "/c/categories.xml");
$categories = $categoryXML->getElementsByTagName("c"); $categories = $categoryXML->getElementsByTagName("c");
foreach ($categories as $category) { foreach ($categories as $category) {
$link = '/' . ltrim($category->getAttribute("xlink:href"), '/'); $link = $this->baseUrl . '/c/' . $category->nodeValue;
try { try {
$packagesLink = str_replace("info.xml", "packagesinfo.xml", $link); $packagesLink = $link . "/packagesinfo.xml";
$this->fetchPear2Packages($this->url . $packagesLink); $this->fetchPear2Packages($packagesLink);
} catch (TransportException $e) { } catch (TransportException $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 = $link . "/packages.xml";
$this->fetchPearPackages($this->url . $categoryLink); $this->fetchPearPackages($categoryLink);
} }
} }
@ -126,8 +134,7 @@ class PearRepository extends ArrayRepository
$packageName = $package->nodeValue; $packageName = $package->nodeValue;
$fullName = 'pear-'.$this->channel.'/'.$packageName; $fullName = 'pear-'.$this->channel.'/'.$packageName;
$packageLink = $package->getAttribute('xlink:href'); $releaseLink = $this->baseUrl . "/r/" . $packageName;
$releaseLink = $this->url . str_replace("/rest/p/", "/rest/r/", $packageLink);
$allReleasesLink = $releaseLink . "/allreleases2.xml"; $allReleasesLink = $releaseLink . "/allreleases2.xml";
try { try {
@ -357,7 +364,7 @@ class PearRepository extends ArrayRepository
throw new \UnexpectedValueException('The PEAR channel at '.$url.' did not respond.'); throw new \UnexpectedValueException('The PEAR channel at '.$url.' did not respond.');
} }
$dom = new \DOMDocument('1.0', 'UTF-8'); $dom = new \DOMDocument('1.0', 'UTF-8');
$dom->loadXML($content); $dom->loadXML($content, LIBXML_NOERROR);
return $dom; return $dom;
} }