From 234a6710a14d73103e0bea1ddaa4bfbc028f84a8 Mon Sep 17 00:00:00 2001 From: Henrique Moody Date: Tue, 17 Jan 2012 17:02:39 -0200 Subject: [PATCH] Correction at method parseVersion() of Composer\Repository\PearRepository. --- src/Composer/Repository/PearRepository.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Composer/Repository/PearRepository.php b/src/Composer/Repository/PearRepository.php index 9b1d98b93..06095e2fe 100644 --- a/src/Composer/Repository/PearRepository.php +++ b/src/Composer/Repository/PearRepository.php @@ -124,22 +124,24 @@ class PearRepository extends ArrayRepository } } } - + /** * @param array $data - * @return string + * @return string */ private function parseVersion(array $data) { + if (!isset($data['min']) && !isset($data['max'])) { + return '*'; + } + $versions = array(); if (isset($data['min'])) { - $version = '>=' . $data['min']; - } else { - $version = '>=0.0.0'; + $versions[] = '>=' . $data['min']; } if (isset($data['max'])) { - $version .= ',<=' . $data['max']; + $versions[] = '<=' . $data['max']; } - return $version; + return implode(',', $versions); } /** @@ -155,7 +157,7 @@ class PearRepository extends ArrayRepository $data[$name] = $this->parseVersion($options); } elseif ('package' == $name) { foreach ($options as $key => $value) { - $dataKey = $value['name']; + $dataKey = $value['name']; $data[$dataKey] = $this->parseVersion($value); } } elseif ('extension' == $name) { @@ -165,6 +167,7 @@ class PearRepository extends ArrayRepository } } } + var_dump($data);die; return $data; }