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

Merge repos instead of replacing

pull/824/merge
Jordi Boggiano 2012-06-23 13:04:23 +02:00
parent 3ac11b932c
commit 488e794c9b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Composer/Config.php
View File

@ -51,7 +51,16 @@ class Config
} }
if (!empty($config['repositories']) && is_array($config['repositories'])) { 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]);
}
}
} }
} }

1
tests/Composer/Test/FactoryTest.php
View File

@ -68,7 +68,6 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
$multirepo = array( $multirepo = array(
'example.com' => 'http://example.com', 'example.com' => 'http://example.com',
'packagist' => 'http://packagist.org',
); );
$data[] = array( $data[] = array(