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

Merge pull request #7574 from seferov/patch-1 

Remove github API request retries as it is not needed anymore
pull/7454/head
Jordi Boggiano 2018-08-27 09:56:31 +02:00 committed by GitHub
parent bcf615ddc7 4014c914ab
commit 734735c691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Composer/Repository/Vcs/GitHubDriver.php
View File

@ -183,30 +183,13 @@ class GitHubDriver extends VcsDriver
return $this->gitDriver->getFileContent($file, $identifier); return $this->gitDriver->getFileContent($file, $identifier);
} }
$notFoundRetries = 2; $resource = $this->getApiUrl() . '/repos/'.$this->owner.'/'.$this->repository.'/contents/' . $file . '?ref='.urlencode($identifier);
while ($notFoundRetries) { $resource = JsonFile::parseJson($this->getContents($resource));
try { if (empty($resource['content']) || $resource['encoding'] !== 'base64' || !($content = base64_decode($resource['content']))) {
$resource = $this->getApiUrl() . '/repos/'.$this->owner.'/'.$this->repository.'/contents/' . $file . '?ref='.urlencode($identifier); throw new \RuntimeException('Could not retrieve ' . $file . ' for '.$identifier);
$resource = JsonFile::parseJson($this->getContents($resource));
if (empty($resource['content']) || $resource['encoding'] !== 'base64' || !($content = base64_decode($resource['content']))) {
throw new \RuntimeException('Could not retrieve ' . $file . ' for '.$identifier);
}
return $content;
} catch (TransportException $e) {
if (404 !== $e->getCode()) {
throw $e;
}
// TODO should be removed when possible
// retry fetching if github returns a 404 since they happen randomly
$notFoundRetries--;
return null;
}
} }
return null; return $content;
} }
/** /**