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

Rename a few fields in json output, refs #6228

pull/6093/merge
Jordi Boggiano 2017-03-07 14:26:24 +01:00
parent a286c39f20
commit e09c632c14
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Composer/Command/ShowCommand.php
View File

@ -361,7 +361,7 @@ EOT
} }
if ($writeLatest && $latestPackage) { if ($writeLatest && $latestPackage) {
$packageViewData['latest'] = $latestPackage->getFullPrettyVersion(); $packageViewData['latest'] = $latestPackage->getFullPrettyVersion();
$packageViewData['status'] = $this->getUpdateStatus($latestPackage, $package); $packageViewData['latest-status'] = $this->getUpdateStatus($latestPackage, $package);
} }
if ($writeDescription) { if ($writeDescription) {
$packageViewData['description'] = $package->getDescription(); $packageViewData['description'] = $package->getDescription();
@ -424,10 +424,10 @@ EOT
} }
if (isset($package['latest']) && $writeLatest) { if (isset($package['latest']) && $writeLatest) {
$latestVersion = $package['latest']; $latestVersion = $package['latest'];
$updateStatus = $package['status']; $updateStatus = $package['latest-status'];
$style = $this->updateStatusToVersionStyle($updateStatus); $style = $this->updateStatusToVersionStyle($updateStatus);
if (!$io->isDecorated()) { if (!$io->isDecorated()) {
$latestVersion = str_replace(array('up-to-date', 'update-recommended', 'update-possible'), array('=', '!', '~'), $updateStatus) . ' ' . $latestVersion; $latestVersion = str_replace(array('up-to-date', 'semver-safe-update', 'update-possible'), array('=', '!', '~'), $updateStatus) . ' ' . $latestVersion;
} }
$io->write(' <' . $style . '>' . str_pad($latestVersion, $latestLength, ' ') . '</' . $style . '>', false); $io->write(' <' . $style . '>' . str_pad($latestVersion, $latestLength, ' ') . '</' . $style . '>', false);
} }
@ -770,9 +770,9 @@ EOT
private function updateStatusToVersionStyle($updateStatus) private function updateStatusToVersionStyle($updateStatus)
{ {
// 'up-to-date' is printed green // 'up-to-date' is printed green
// 'update-recommended' is printed red // 'semver-safe-update' is printed red
// 'upgrade-possible' is printed yellow // 'update-possible' is printed yellow
return str_replace(array('up-to-date', 'update-recommended', 'update-possible'), array('info', 'highlight', 'comment'), $updateStatus); return str_replace(array('up-to-date', 'semver-safe-update', 'update-possible'), array('info', 'highlight', 'comment'), $updateStatus);
} }
private function getUpdateStatus(PackageInterface $latestPackage, PackageInterface $package) { private function getUpdateStatus(PackageInterface $latestPackage, PackageInterface $package) {
@ -786,7 +786,7 @@ EOT
} }
if ($latestPackage->getVersion() && Semver::satisfies($latestPackage->getVersion(), $constraint)) { if ($latestPackage->getVersion() && Semver::satisfies($latestPackage->getVersion(), $constraint)) {
// it needs an immediate semver-compliant upgrade // it needs an immediate semver-compliant upgrade
return 'update-recommended'; return 'semver-safe-update';
} }
// it needs an upgrade but has potential BC breaks so is not urgent // it needs an upgrade but has potential BC breaks so is not urgent