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

Allow empty json files to be merged into a config, fixes #3055

pull/2415/merge
Jordi Boggiano 2014-06-29 13:11:27 +02:00
parent f79b34c1df
commit d9fe17443b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Config.php
View File

@ -90,7 +90,7 @@ class Config
* *
* @param array $config * @param array $config
*/ */
public function merge(array $config) public function merge($config)
{ {
// override defaults with given config // override defaults with given config
if (!empty($config['config']) && is_array($config['config'])) { if (!empty($config['config']) && is_array($config['config'])) {