public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-11 01:22:54 +00:00
Code Activity

Minor fixes and updated the rest of the code/tests to use HttpDownloader

Browse source
This commit is contained in:
Jordi Boggiano 2018-10-31 12:44:54 +01:00
parent 56805ecafe
commit 713bc4de1d
51 changed files with 461 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Composer/Repository/ComposerRepository.php
View file

@ -102,7 +102,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$this->versionParser = new VersionParser();
$this->loader = new ArrayLoader($this->versionParser);
if ($httpDownloader && $this->options) {
// TODO solve this somehow - should be sent a request time not on the instance
// TODO solve this somehow - should be sent at request time not on the instance
$httpDownloader = clone $httpDownloader;
$httpDownloader->setOptions($this->options);
}
@ -543,6 +543,10 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$response = $contents;
}
if (!isset($response['packages'][$name])) {
return;
}
$uniqKeys = array('version', 'version_normalized', 'source', 'dist', 'time');
foreach ($response['packages'][$name] as $version) {
if (isset($version['versions'])) {
@ -566,6 +570,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
}, function ($e) {
// TODO use ->done() above instead with react/promise 2.0
var_dump('Uncaught Ex', $e->getMessage());
throw $e;
});
}
}
@ -644,6 +649,11 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$this->hasProviders = true;
}
// TODO this is for testing only, remove once packagist reports v2 protocol support
if (preg_match('{^https?://repo\.packagist\.org/?$}i', $this->url)) {
$this->repoConfig['force-lazy-providers'] = true;
}
// force values for packagist
if (preg_match('{^https?://repo\.packagist\.org/?$}i', $this->url) && !empty($this->repoConfig['force-lazy-providers'])) {
$this->url = 'https://repo.packagist.org';
@ -927,6 +937,11 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$degradedMode =& $this->degradedMode;
$accept = function ($response) use ($io, $url, $cache, $cacheKey) {
// package not found is acceptable for a v2 protocol repository
if ($response->getStatusCode() === 404) {
return array('packages' => array());
}
$json = $response->getBody();
if ($json === '' && $response->getStatusCode() === 304) {
return true;