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

Processed PR feedback

pull/4846/head
Niels Keurentjes 2016-01-29 10:12:32 +01:00
parent d6589ac151
commit 1b97d07bca
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Composer/Command/SuggestsCommand.php
View File

@ -57,7 +57,7 @@ EOT
$filter = $input->getArgument('packages'); $filter = $input->getArgument('packages');
// First assemble list of packages that are installed, replaced or provided // First assemble lookup list of packages that are installed, replaced or provided
$installed = array(); $installed = array();
foreach($packages as $package) { foreach($packages as $package) {
$installed[] = $package['name']; $installed[] = $package['name'];
@ -70,19 +70,23 @@ EOT
$installed = array_merge($installed, array_keys($package['replace'])); $installed = array_merge($installed, array_keys($package['replace']));
} }
} }
sort($installed);
$installed = array_unique($installed); // Undub and sort the install list into a sorted lookup array
$installed = array_flip($installed);
ksort($installed);
// Next gather all suggestions that are not in that list // Next gather all suggestions that are not in that list
$suggesters = array(); $suggesters = array();
$suggested = array(); $suggested = array();
foreach ($packages as $package) { foreach ($packages as $package) {
if ((empty($filter) || in_array($package['name'], $filter)) && !empty($package['suggest'])) { $packageName = $package['name'];
foreach ($package['suggest'] as $suggestion => $reason) { if ((!empty($filter) && !in_array($packageName, $filter)) || empty($package['suggest'])) {
if (!in_array($suggestion, $installed)) { continue;
$suggesters[$package['name']][$suggestion] = $reason; }
$suggested[$suggestion][$package['name']] = $reason; foreach ($package['suggest'] as $suggestion => $reason) {
} if (!isset($installed[$suggestion])) {
$suggesters[$packageName][$suggestion] = $reason;
$suggested[$suggestion][$packageName] = $reason;
} }
} }
} }
@ -103,7 +107,7 @@ EOT
} }
// Simple mode // Simple mode
if ($mode == 0) { if ($mode === 0) {
foreach (array_keys($suggested) as $suggestion) { foreach (array_keys($suggested) as $suggestion) {
$io->write(sprintf('<info>%s</info>', $suggestion)); $io->write(sprintf('<info>%s</info>', $suggestion));
} }