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

Avoid some error paths, refs #6678

pull/6734/merge
Jordi Boggiano 2017-11-03 16:32:35 +01:00
parent b94d55d1a9
commit 7c7c91344a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Composer/Command/InitCommand.php
View File

@ -644,6 +644,7 @@ EOT
'Could not find package %s at any version matching your PHP version %s', $name, $phpVersion 'Could not find package %s at any version matching your PHP version %s', $name, $phpVersion
)); ));
} }
$similar = $this->findSimilar($name); $similar = $this->findSimilar($name);
if ($similar) { if ($similar) {
throw new \InvalidArgumentException(sprintf( throw new \InvalidArgumentException(sprintf(
@ -652,6 +653,7 @@ EOT
implode("\n ", $similar) implode("\n ", $similar)
)); ));
} }
throw new \InvalidArgumentException(sprintf( throw new \InvalidArgumentException(sprintf(
'Could not find package %s at any version for your minimum-stability (%s). Check the package spelling or your minimum-stability', 'Could not find package %s at any version for your minimum-stability (%s). Check the package spelling or your minimum-stability',
$name, $name,
@ -664,11 +666,19 @@ EOT
private function findSimilar($package) private function findSimilar($package)
{ {
$results = $this->repos->search($package); try {
$results = $this->repos->search($package);
} catch (\Exception $e) {
// ignore search errors
return array();
}
$similarPackages = array();
foreach ($results as $result) { foreach ($results as $result) {
$similarPackages[$result['name']] = levenshtein($package, $result['name']); $similarPackages[$result['name']] = levenshtein($package, $result['name']);
} }
asort($similarPackages); asort($similarPackages);
return array_keys(array_slice($similarPackages, 0, 5)); return array_keys(array_slice($similarPackages, 0, 5));
} }
} }