|
|
|
@ -85,7 +85,7 @@ class ComposerRepository extends ArrayRepository
|
|
|
|
|
$this->config = $config;
|
|
|
|
|
$this->options = $repoConfig['options'];
|
|
|
|
|
$this->url = $repoConfig['url'];
|
|
|
|
|
$this->baseUrl = rtrim(preg_replace('{^(.*)(?:/packages.json)?(?:[?#].*)?$}', '$1', $this->url), '/');
|
|
|
|
|
$this->baseUrl = rtrim(preg_replace('{^(.*)(?:/[^/\\]+.json)?(?:[?#].*)?$}', '$1', $this->url), '/');
|
|
|
|
|
$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->loader = new ArrayLoader();
|
|
|
|
@ -395,7 +395,7 @@ class ComposerRepository extends ArrayRepository
|
|
|
|
|
|
|
|
|
|
$jsonUrlParts = parse_url($this->url);
|
|
|
|
|
|
|
|
|
|
if (isset($jsonUrlParts['path']) && false !== strpos($jsonUrlParts['path'], '/packages.json')) {
|
|
|
|
|
if (isset($jsonUrlParts['path']) && false !== strpos($jsonUrlParts['path'], '.json')) {
|
|
|
|
|
$jsonUrl = $this->url;
|
|
|
|
|
} else {
|
|
|
|
|
$jsonUrl = $this->url . '/packages.json';
|
|
|
|
|