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

Forward repo options correctly to the RemoteFilesystem even if we get one injected, fixes #4786

pull/4790/head
Jordi Boggiano 2016-01-18 10:47:48 +00:00
parent 22d8b5dff4
commit 876f143418
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$this->io = $io; $this->io = $io;
$this->cache = new Cache($io, $config->get('cache-repo-dir').'/'.preg_replace('{[^a-z0-9.]}i', '-', $this->url), 'a-z0-9.$'); $this->cache = new Cache($io, $config->get('cache-repo-dir').'/'.preg_replace('{[^a-z0-9.]}i', '-', $this->url), 'a-z0-9.$');
$this->loader = new ArrayLoader(); $this->loader = new ArrayLoader();
$this->rfs = $rfs ?: Factory::createRemoteFilesystem($this->io, $this->config, $this->options); $this->rfs = $rfs ?: Factory::createRemoteFilesystem($this->io, $this->config);
$this->eventDispatcher = $eventDispatcher; $this->eventDispatcher = $eventDispatcher;
$this->repoConfig = $repoConfig; $this->repoConfig = $repoConfig;
} }
@ -190,7 +190,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$url = str_replace('%query%', $query, $this->searchUrl); $url = str_replace('%query%', $query, $this->searchUrl);
$hostname = parse_url($url, PHP_URL_HOST) ?: $url; $hostname = parse_url($url, PHP_URL_HOST) ?: $url;
$json = $this->rfs->getContents($hostname, $url, false); $json = $this->rfs->getContents($hostname, $url, false, $this->options);
$results = JsonFile::parseJson($json, $url); $results = JsonFile::parseJson($json, $url);
return $results['results']; return $results['results'];
@ -607,7 +607,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
} }
$hostname = parse_url($filename, PHP_URL_HOST) ?: $filename; $hostname = parse_url($filename, PHP_URL_HOST) ?: $filename;
$json = $preFileDownloadEvent->getRemoteFilesystem()->getContents($hostname, $filename, false); $json = $preFileDownloadEvent->getRemoteFilesystem()->getContents($hostname, $filename, false, $this->options);
if ($sha256 && $sha256 !== hash('sha256', $json)) { if ($sha256 && $sha256 !== hash('sha256', $json)) {
if ($retries) { if ($retries) {
usleep(100000); usleep(100000);