Merge remote-tracking branch 'henriquemoody/master'

main
Jordi Boggiano 13 years ago
commit 7ce47bc64b

3
.gitignore vendored

@ -2,4 +2,5 @@
/.project /.project
/.buildpath /.buildpath
/composer.phar /composer.phar
/vendor /vendor
/nbproject

@ -31,7 +31,7 @@ class PearRepository extends ArrayRepository
throw new \UnexpectedValueException('Invalid url given for PEAR repository: '.$config['url']); throw new \UnexpectedValueException('Invalid url given for PEAR repository: '.$config['url']);
} }
$this->url = $config['url']; $this->url = rtrim($config['url'], '/');
} }
protected function initialize() protected function initialize()
@ -51,24 +51,62 @@ class PearRepository extends ArrayRepository
$categories = $categoryXML->getElementsByTagName("c"); $categories = $categoryXML->getElementsByTagName("c");
foreach ($categories as $category) { 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);
}
}
}
/**
* @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) {
$packageName = $package->nodeValue;
$packageLink = $package->getAttribute('xlink:href');
$releaseLink = $this->url . str_replace("/rest/p/", "/rest/r/", $packageLink);
$allReleasesLink = $releaseLink . "/allreleases2.xml";
try {
$releasesXML = $this->requestXml($allReleasesLink);
} catch (\ErrorException $e) {
if (strpos($e->getMessage(), '404')) {
continue;
}
throw $e;
} }
$packagesXML = $this->requestXml($this->url . $categoryLink);
$packages = $packagesXML->getElementsByTagName('p'); $releases = $releasesXML->getElementsByTagName('r');
$loader = new ArrayLoader();
foreach ($packages as $package) { foreach ($releases as $release) {
$packageName = $package->nodeValue; /* @var $release \DOMElement */
$pearVersion = $release->getElementsByTagName('v')->item(0)->nodeValue;
$packageLink = $package->getAttribute('xlink:href'); $packageData = array(
$releaseLink = $this->url . str_replace("/rest/p/", "/rest/r/", $packageLink); 'name' => $packageName,
$allReleasesLink = $releaseLink . "/allreleases2.xml"; 'type' => 'library',
'dist' => array('type' => 'pear', 'url' => $this->url.'/get/'.$packageName.'-'.$pearVersion.".tgz"),
'version' => $pearVersion,
);
try { try {
$releasesXML = $this->requestXml($allReleasesLink); $deps = file_get_contents($releaseLink . "/deps.".$pearVersion.".txt");
} catch (\ErrorException $e) { } catch (\ErrorException $e) {
if (strpos($e->getMessage(), '404')) { if (strpos($e->getMessage(), '404')) {
continue; continue;
@ -76,54 +114,147 @@ class PearRepository extends ArrayRepository
throw $e; throw $e;
} }
$releases = $releasesXML->getElementsByTagName('r'); $packageData += $this->parseDependencies($deps);
foreach ($releases as $release) { try {
/* @var $release DOMElement */ $this->addPackage($loader->load($packageData));
$pearVersion = $release->getElementsByTagName('v')->item(0)->nodeValue; } catch (\UnexpectedValueException $e) {
continue;
}
}
}
}
$packageData = array( /**
'name' => $packageName, * @param array $data
'type' => 'library', * @return string
'dist' => array('type' => 'pear', 'url' => $this->url.'/get/'.$packageName.'-'.$pearVersion.".tgz"), */
'version' => $pearVersion, 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);
}
try { /**
$deps = file_get_contents($releaseLink . "/deps.".$pearVersion.".txt"); * @todo Improve dependencies resolution of pear packages.
} catch (\ErrorException $e) { * @param array $options
if (strpos($e->getMessage(), '404')) { * @return array
continue; */
} private function parseDependenciesOptions(array $depsOptions)
throw $e; {
$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;
}
if (preg_match('((O:([0-9])+:"([^"]+)"))', $deps, $matches)) { /**
if (strlen($matches[3]) == $matches[2]) { * @param string $deps
throw new \InvalidArgumentException("Invalid dependency data, it contains serialized objects."); * @return array
} * @throws InvalidArgumentException
} */
$deps = unserialize($deps); private function parseDependencies($deps)
if (isset($deps['required']['package'])) { {
if (preg_match('((O:([0-9])+:"([^"]+)"))', $deps, $matches)) {
if (isset($deps['required']['package']['name'])) { if (strlen($matches[3]) == $matches[2]) {
$deps['required']['package'] = array($deps['required']['package']); throw new \InvalidArgumentException("Invalid dependency data, it contains serialized objects.");
} }
}
foreach ($deps['required']['package'] as $dependency) { $deps = (array) @unserialize($deps);
if (isset($dependency['min'])) { unset($deps['required']['pearinstaller']);
$packageData['require'][$dependency['name']] = '>='.$dependency['min'];
} else {
$packageData['require'][$dependency['name']] = '>=0.0.0';
}
}
}
try { $depsData = array();
$this->addPackage($loader->load($packageData)); if (isset($deps['required'])) {
} catch (\UnexpectedValueException $e) { $depsData['require'] = $this->parseDependenciesOptions($deps['required']);
continue; }
}
if (isset($deps['optional'])) {
$depsData['suggest'] = $this->parseDependenciesOptions($deps['optional']);
}
return $depsData;
}
/**
* @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 + $revisionData)
);
} catch (\UnexpectedValueException $e) {
continue;
} }
} }
} }
@ -144,4 +275,4 @@ class PearRepository extends ArrayRepository
return $dom; return $dom;
} }
} }
Loading…
Cancel
Save