Browse Source

Merge repos instead of replacing

Jordi Boggiano 13 years ago
parent
commit
488e794c9b
2 changed files with 10 additions and 2 deletions
  1. 10 1
      src/Composer/Config.php
  2. 0 1
      tests/Composer/Test/FactoryTest.php

+ 10 - 1
src/Composer/Config.php

@@ -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]);
+                }
+            }
         }
     }
 

+ 0 - 1
tests/Composer/Test/FactoryTest.php

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