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

Merge remote-tracking branch 'digitalkaoz/issue_366'

pull/398/merge
Jordi Boggiano 2012-03-10 00:17:14 +01:00
parent 950003bfc3 38f866f1dd
commit 4f61ec6600
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Composer/Command/SearchCommand.php
View File

@ -56,26 +56,31 @@ EOT
} }
$tokens = array_map('strtolower', $input->getArgument('tokens')); $tokens = array_map('strtolower', $input->getArgument('tokens'));
$packages = array();
foreach ($repos->getPackages() as $package) { foreach ($repos->getPackages() as $package) {
foreach ($tokens as $token) { foreach ($tokens as $token) {
if (false === ($pos = strpos($package->getName(), $token))) { if (false === ($pos = strpos($package->getName(), $token)) && (false === strpos(join(',',$package->getKeywords() ?: array()), $token))) {
continue; continue;
} }
if ($platformRepo->hasPackage($package)) { if (false !== ($pos = strpos($package->getName(), $token))) {
$type = '<info>platform: </info> '; $name = substr($package->getPrettyName(), 0, $pos)
} elseif ($installedRepo->hasPackage($package)) { . '<highlight>' . substr($package->getPrettyName(), $pos, strlen($token)) . '</highlight>'
$type = '<info>installed:</info> '; . substr($package->getPrettyName(), $pos + strlen($token));
} else { } else {
$type = '<comment>available:</comment> '; $name = $package->getPrettyName();
} }
$name = substr($package->getPrettyName(), 0, $pos) $version = $installedRepo->hasPackage($package) ? '<info>'.$package->getPrettyVersion().'</info>' : $package->getPrettyVersion();
. '<highlight>' . substr($package->getPrettyName(), $pos, strlen($token)) . '</highlight>'
. substr($package->getPrettyName(), $pos + strlen($token)); $packages[$name][$package->getPrettyVersion()] = $version;
$output->writeln($type . ': ' . $name . ' <comment>' . $package->getPrettyVersion() . '</comment>');
continue 2; continue 2;
} }
} }
foreach ($packages as $name => $versions) {
$output->writeln($name .' <comment>:</comment> '. join(', ', $versions));
}
} }
} }