From e09c632c146cf8553d4d8ebe35ca1cc824035d99 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 7 Mar 2017 14:26:24 +0100 Subject: [PATCH] Rename a few fields in json output, refs #6228 --- src/Composer/Command/ShowCommand.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php index 6a492fd80..36dab96c4 100644 --- a/src/Composer/Command/ShowCommand.php +++ b/src/Composer/Command/ShowCommand.php @@ -361,7 +361,7 @@ EOT } if ($writeLatest && $latestPackage) { $packageViewData['latest'] = $latestPackage->getFullPrettyVersion(); - $packageViewData['status'] = $this->getUpdateStatus($latestPackage, $package); + $packageViewData['latest-status'] = $this->getUpdateStatus($latestPackage, $package); } if ($writeDescription) { $packageViewData['description'] = $package->getDescription(); @@ -424,10 +424,10 @@ EOT } if (isset($package['latest']) && $writeLatest) { $latestVersion = $package['latest']; - $updateStatus = $package['status']; + $updateStatus = $package['latest-status']; $style = $this->updateStatusToVersionStyle($updateStatus); 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, ' ') . '', false); } @@ -770,9 +770,9 @@ EOT private function updateStatusToVersionStyle($updateStatus) { // 'up-to-date' is printed green - // 'update-recommended' is printed red - // 'upgrade-possible' is printed yellow - return str_replace(array('up-to-date', 'update-recommended', 'update-possible'), array('info', 'highlight', 'comment'), $updateStatus); + // 'semver-safe-update' is printed red + // 'update-possible' is printed yellow + return str_replace(array('up-to-date', 'semver-safe-update', 'update-possible'), array('info', 'highlight', 'comment'), $updateStatus); } private function getUpdateStatus(PackageInterface $latestPackage, PackageInterface $package) { @@ -786,7 +786,7 @@ EOT } if ($latestPackage->getVersion() && Semver::satisfies($latestPackage->getVersion(), $constraint)) { // 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