Make URL extraction more robust, add php 5.3 support

composer · Jan 8, 2022 · 2644a11 · 2644a11
1 parent fc479c7
commit 2644a11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Composer/Util/AuthHelper.php b/src/Composer/Util/AuthHelper.php
@@ -105,7 +105,8 @@ public function promptAuthIfNeeded($url, $origin, $statusCode, $reason = null, $
                     throw new TransportException('Could not authenticate against ' . $origin, 403);
                 }
                 $this->io->ask('After authorizing your token, confirm that you would like to retry the request');
-                return ['retry' => TRUE, 'storeAuth' => $storeAuth];
+
+                return array('retry' => true, 'storeAuth' => $storeAuth);
             }
 
             if ($rateLimited) {

diff --git a/src/Composer/Util/GitHub.php b/src/Composer/Util/GitHub.php
@@ -182,11 +182,12 @@ public function getSsoUrl(array $headers)
     {
         foreach ($headers as $header) {
             $header = trim($header);
-            if (false === strpos($header, 'x-github-sso: required')) {
+            if (false === stripos($header, 'x-github-sso: required')) {
                 continue;
             }
-            list(, $url) = explode('=', $header, 2);
-            return $url;
+            if (Preg::isMatch('{\burl=(?P<url>[^\s;]+)}', $header, $match)) {
+                return $match['url'];
+            }
         }
 
         return null;