From 0466add822feb1204e6526578614e72e130a8656 Mon Sep 17 00:00:00 2001 From: "terry.kern" Date: Thu, 22 Oct 2020 14:41:16 +0200 Subject: [PATCH] Also use channel string for update message https://github.com/composer/composer/pull/9305#issuecomment-714381153 --- src/Composer/Command/SelfUpdateCommand.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php index 4802afcd1..0f5fb16fb 100644 --- a/src/Composer/Command/SelfUpdateCommand.php +++ b/src/Composer/Command/SelfUpdateCommand.php @@ -176,11 +176,12 @@ EOT return 1; } + $channelString = $versionsUtil->getChannel(); + if (is_numeric($channelString)) { + $channelString .= '.x'; + } + if (Composer::VERSION === $updateVersion) { - $channelString = $versionsUtil->getChannel(); - if (is_numeric($channelString)) { - $channelString .= '.x'; - } $io->writeError( sprintf( 'You are already using composer version %s (%s channel).', @@ -208,7 +209,7 @@ EOT $updatingToTag = !preg_match('{^[0-9a-f]{40}$}', $updateVersion); - $io->write(sprintf("Updating to version %s (%s channel).", $updateVersion, $versionsUtil->getChannel())); + $io->write(sprintf("Updating to version %s (%s channel).", $updateVersion, $channelString)); $remoteFilename = $baseUrl . ($updatingToTag ? "/download/{$updateVersion}/composer.phar" : '/composer.phar'); $signature = $remoteFilesystem->getContents(self::HOMEPAGE, $remoteFilename.'.sig', false); $io->writeError(' ', false);