From e68b52697b73630df03a4e7706fc6e01f00d2120 Mon Sep 17 00:00:00 2001
From: TerryKern <56536101+terrykern@users.noreply.github.com>
Date: Tue, 20 Oct 2020 11:48:51 +0200
Subject: [PATCH 1/2] Improve readability of version info message

Instead of:

> You are already using composer version 1.10.15 (1 channel).

it shows:

> You are already using composer version 1.10.15 (1.x channel).
---
 src/Composer/Command/SelfUpdateCommand.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php
index 348451e76..4802afcd1 100644
--- a/src/Composer/Command/SelfUpdateCommand.php
+++ b/src/Composer/Command/SelfUpdateCommand.php
@@ -177,7 +177,17 @@ EOT
         }
 
         if (Composer::VERSION === $updateVersion) {
-            $io->writeError(sprintf('<info>You are already using composer version %s (%s channel).</info>', $updateVersion, $versionsUtil->getChannel()));
+            $channelString = $versionsUtil->getChannel();
+            if (is_numeric($channelString)) {
+                $channelString .= '.x';
+            }
+            $io->writeError(
+                sprintf(
+                    '<info>You are already using composer version %s (%s channel).</info>',
+                    $updateVersion,
+                    $channelString
+                )
+            );
 
             // remove all backups except for the most recent, if any
             if ($input->getOption('clean-backups')) {

From 0466add822feb1204e6526578614e72e130a8656 Mon Sep 17 00:00:00 2001
From: "terry.kern" <terry.kern@student.ibz.ch>
Date: Thu, 22 Oct 2020 14:41:16 +0200
Subject: [PATCH 2/2] 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(
                     '<info>You are already using composer version %s (%s channel).</info>',
@@ -208,7 +209,7 @@ EOT
 
         $updatingToTag = !preg_match('{^[0-9a-f]{40}$}', $updateVersion);
 
-        $io->write(sprintf("Updating to version <info>%s</info> (%s channel).", $updateVersion, $versionsUtil->getChannel()));
+        $io->write(sprintf("Updating to version <info>%s</info> (%s channel).", $updateVersion, $channelString));
         $remoteFilename = $baseUrl . ($updatingToTag ? "/download/{$updateVersion}/composer.phar" : '/composer.phar');
         $signature = $remoteFilesystem->getContents(self::HOMEPAGE, $remoteFilename.'.sig', false);
         $io->writeError('   ', false);