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

Fix config merging for arrays

pull/1410/head
Jordi Boggiano 2012-12-08 21:45:21 +01:00
parent 9b2e3766c0
commit 23d45f67c1
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Config.php
View File

@ -69,7 +69,13 @@ class Config
{
// override defaults with given config
if (!empty($config['config']) && is_array($config['config'])) {
$this->config = array_replace_recursive($this->config, $config['config']);
foreach ($config['config'] as $key => $val) {
if (in_array($key, array('github-oauth')) && isset($this->config[$key])) {
$this->config[$key] = array_merge($this->config[$key], $val);
} else {
$this->config[$key] = $val;
}
}
}
if (!empty($config['repositories']) && is_array($config['repositories'])) {

18
tests/Composer/Test/ConfigTest.php
View File

@ -99,4 +99,22 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
return $data;
}
public function testMergeGithubOauth()
{
$config = new Config();
$config->merge(array('config' => array('github-oauth' => array('foo' => 'bar'))));
$config->merge(array('config' => array('github-oauth' => array('bar' => 'baz'))));
$this->assertEquals(array('foo' => 'bar', 'bar' => 'baz'), $config->get('github-oauth'));
}
public function testOverrideGithubProtocols()
{
$config = new Config();
$config->merge(array('config' => array('github-protocols' => array('https', 'http'))));
$config->merge(array('config' => array('github-protocols' => array('http'))));
$this->assertEquals(array('http'), $config->get('github-oauth'));
}
}