public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix handling of true return value for loadRootServerFile, fixes #10675

pull/10678/head
Jordi Boggiano 2022-03-30 17:55:47 +02:00
parent c3484ea882
commit f1ff4553d3
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Composer/Repository/ComposerRepository.php
View File

@ -650,7 +650,10 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$this->loadRootServerFile(); $this->loadRootServerFile();
if (null === $this->providerListing) { if (null === $this->providerListing) {
$this->loadProviderListings($this->loadRootServerFile()); $data = $this->loadRootServerFile();
if (is_array($data)) {
$this->loadProviderListings($data);
}
} }
if ($this->lazyProvidersUrl) { if ($this->lazyProvidersUrl) {
@ -706,7 +709,10 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
} }
if (null === $this->providerListing) { if (null === $this->providerListing) {
$this->loadProviderListings($this->loadRootServerFile()); $data = $this->loadRootServerFile();
if (is_array($data)) {
$this->loadProviderListings($data);
}
} }
$useLastModifiedCheck = false; $useLastModifiedCheck = false;
@ -1013,9 +1019,9 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
/** /**
* @param int|null $rootMaxAge * @param int|null $rootMaxAge
* @return array<string, mixed> * @return array<'providers'|'provider-includes'|'packages'|'providers-url'|'notify-batch'|'search'|'mirrors'|'providers-lazy-url'|'metadata-url'|'available-packages'|'available-package-patterns', mixed>|true
*/ */
protected function loadRootServerFile(?int $rootMaxAge = null): array protected function loadRootServerFile(?int $rootMaxAge = null)
{ {
if (null !== $this->rootData) { if (null !== $this->rootData) {
return $this->rootData; return $this->rootData;
@ -1156,6 +1162,9 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
private function loadDataFromServer(): array private function loadDataFromServer(): array
{ {
$data = $this->loadRootServerFile(); $data = $this->loadRootServerFile();
if (true === $data) {
throw new \LogicException('loadRootServerFile should not return true during initialization');
}
return $this->loadIncludes($data); return $this->loadIncludes($data);
} }
@ -1572,6 +1581,9 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
private function initializePartialPackages(): void private function initializePartialPackages(): void
{ {
$rootData = $this->loadRootServerFile(); $rootData = $this->loadRootServerFile();
if ($rootData === true) {
return;
}
$this->partialPackagesByName = array(); $this->partialPackagesByName = array();
foreach ($rootData['packages'] as $package => $versions) { foreach ($rootData['packages'] as $package => $versions) {