From 670553880623916d89162c00e5e4173a44490736 Mon Sep 17 00:00:00 2001
From: fluffycondor <62219548+fluffycondor@users.noreply.github.com>
Date: Mon, 4 Jul 2022 17:39:11 +0300
Subject: [PATCH 1/4] Fix deprecation notice

Deprecation Notice: trim(): Passing null to parameter #1 ($string) of type string is deprecated in phar:///usr/bin/composer/src/Composer/Util/GitHub.php:103
---
 src/Composer/Util/GitHub.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Composer/Util/GitHub.php b/src/Composer/Util/GitHub.php
index 2dd53e3506c6..c32bd4964084 100644
--- a/src/Composer/Util/GitHub.php
+++ b/src/Composer/Util/GitHub.php
@@ -101,7 +101,7 @@ public function authorizeOAuthInteractively($originUrl, $message = null)
         $this->io->writeError(sprintf('Tokens will be stored in plain text in "%s" for future use by Composer.', $this->config->getAuthConfigSource()->getName()));
         $this->io->writeError('For additional information, check https://getcomposer.org/doc/articles/authentication-for-private-packages.md#github-oauth');
 
-        $token = trim($this->io->askAndHideAnswer('Token (hidden): '));
+        $token = trim($this->io->askAndHideAnswer('Token (hidden): ') ?? '');
 
         if (!$token) {
             $this->io->writeError('<warning>No token given, aborting.</warning>');

From 4209bf18a8dfa773b61c2c22585129d20c9c39f2 Mon Sep 17 00:00:00 2001
From: fluffycondor <62219548+fluffycondor@users.noreply.github.com>
Date: Mon, 4 Jul 2022 17:45:23 +0300
Subject: [PATCH 2/4] Fix syntax for PHP 5

---
 src/Composer/Util/GitHub.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Composer/Util/GitHub.php b/src/Composer/Util/GitHub.php
index c32bd4964084..a8199f320295 100644
--- a/src/Composer/Util/GitHub.php
+++ b/src/Composer/Util/GitHub.php
@@ -101,7 +101,7 @@ public function authorizeOAuthInteractively($originUrl, $message = null)
         $this->io->writeError(sprintf('Tokens will be stored in plain text in "%s" for future use by Composer.', $this->config->getAuthConfigSource()->getName()));
         $this->io->writeError('For additional information, check https://getcomposer.org/doc/articles/authentication-for-private-packages.md#github-oauth');
 
-        $token = trim($this->io->askAndHideAnswer('Token (hidden): ') ?? '');
+        $token = $this->io->askAndHideAnswer('Token (hidden): ');
 
         if (!$token) {
             $this->io->writeError('<warning>No token given, aborting.</warning>');
@@ -109,6 +109,8 @@ public function authorizeOAuthInteractively($originUrl, $message = null)
 
             return false;
         }
+        
+        $token = trim($token);
 
         $this->io->setAuthentication($originUrl, $token, 'x-oauth-basic');
 

From c61f419f1ea0ad800ef1a8750adc4d93e546c800 Mon Sep 17 00:00:00 2001
From: fluffycondor <62219548+fluffycondor@users.noreply.github.com>
Date: Mon, 4 Jul 2022 17:51:28 +0300
Subject: [PATCH 3/4] Fix possibly empty token

---
 src/Composer/Util/GitHub.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Composer/Util/GitHub.php b/src/Composer/Util/GitHub.php
index a8199f320295..e990a889638a 100644
--- a/src/Composer/Util/GitHub.php
+++ b/src/Composer/Util/GitHub.php
@@ -102,15 +102,14 @@ public function authorizeOAuthInteractively($originUrl, $message = null)
         $this->io->writeError('For additional information, check https://getcomposer.org/doc/articles/authentication-for-private-packages.md#github-oauth');
 
         $token = $this->io->askAndHideAnswer('Token (hidden): ');
+        $token = is_string($token) ? trim($token) : '';
 
-        if (!$token) {
+        if ($token === '') {
             $this->io->writeError('<warning>No token given, aborting.</warning>');
             $this->io->writeError('You can also add it manually later by using "composer config --global --auth github-oauth.github.com <token>"');
 
             return false;
         }
-        
-        $token = trim($token);
 
         $this->io->setAuthentication($originUrl, $token, 'x-oauth-basic');
 

From 9db51ecbe5314eb78a8d0e2413cbc5d737b8802d Mon Sep 17 00:00:00 2001
From: fluffycondor <62219548+fluffycondor@users.noreply.github.com>
Date: Tue, 5 Jul 2022 15:50:12 +0300
Subject: [PATCH 4/4] Cast null to an empty string

Co-authored-by: Jordi Boggiano <j.boggiano@seld.be>
---
 src/Composer/Util/GitHub.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Composer/Util/GitHub.php b/src/Composer/Util/GitHub.php
index e990a889638a..84ca062fe6cd 100644
--- a/src/Composer/Util/GitHub.php
+++ b/src/Composer/Util/GitHub.php
@@ -101,8 +101,7 @@ public function authorizeOAuthInteractively($originUrl, $message = null)
         $this->io->writeError(sprintf('Tokens will be stored in plain text in "%s" for future use by Composer.', $this->config->getAuthConfigSource()->getName()));
         $this->io->writeError('For additional information, check https://getcomposer.org/doc/articles/authentication-for-private-packages.md#github-oauth');
 
-        $token = $this->io->askAndHideAnswer('Token (hidden): ');
-        $token = is_string($token) ? trim($token) : '';
+        $token = trim((string) $this->io->askAndHideAnswer('Token (hidden): '));
 
         if ($token === '') {
             $this->io->writeError('<warning>No token given, aborting.</warning>');