bug #817 Use default endpoints as fallbacks if Composer endpoint is specified as string (emodric)

nicolas-grekas · nicolas-grekas · commit 658f638119ec · 2021-10-05T11:47:42.000+02:00
This PR was merged into the 1.16-dev branch. Discussion ---------- Use default endpoints as fallbacks if Composer endpoint is specified as string Fixes #816 Commits ------- 92daa9c Use default endopoints as fallbacks if Composer endpoint is specified as a string
diff --git a/src/Downloader.php b/src/Downloader.php
@@ -65,6 +65,9 @@ public function __construct(Composer $composer, IoInterface $io, $rfs)
             }
         } elseif (\is_array($endpoint) || false !== strpos($endpoint, '.json') || 'flex://defaults' === $endpoint) {
             $this->endpoints = array_values((array) $endpoint);
+            if (\is_string($endpoint) && false !== strpos($endpoint, '.json')) {
+                $this->endpoints[] = 'flex://defaults';
+            }
         } else {
             $this->legacyEndpoint = rtrim($endpoint, '/');
         }

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,9 @@ public function __construct(Composer $composer, IoInterface $io, $rfs)`
`65`	`65`	`}`
`66`	`66`	`} elseif (\is_array($endpoint) \|\| false !== strpos($endpoint, '.json') \|\| 'flex://defaults' === $endpoint) {`
`67`	`67`	`$this->endpoints = array_values((array) $endpoint);`
	`68`	`+ if (\is_string($endpoint) && false !== strpos($endpoint, '.json')) {`
	`69`	`+ $this->endpoints[] = 'flex://defaults';`
	`70`	`+ }`
`68`	`71`	`} else {`
`69`	`72`	`$this->legacyEndpoint = rtrim($endpoint, '/');`
`70`	`73`	`}`