Merge repos instead of replacing
parent
3ac11b932c
commit
488e794c9b
|
@ -51,7 +51,16 @@ class Config
|
|||
}
|
||||
|
||||
if (!empty($config['repositories']) && is_array($config['repositories'])) {
|
||||
$this->repositories = $config['repositories'];
|
||||
$this->repositories = array_reverse($this->repositories, true);
|
||||
$this->repositories = array_merge($this->repositories, $config['repositories']);
|
||||
$this->repositories = array_reverse($this->repositories, true);
|
||||
|
||||
// filter out disabled ones
|
||||
foreach ($this->repositories as $name => $url) {
|
||||
if (false === $url) {
|
||||
unset($this->repositories[$name]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -68,7 +68,6 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
$multirepo = array(
|
||||
'example.com' => 'http://example.com',
|
||||
'packagist' => 'http://packagist.org',
|
||||
);
|
||||
|
||||
$data[] = array(
|
||||
|
|
Loading…
Reference in New Issue