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

2014-06-29 13:11:27 +02:00 · 2014-06-29 13:11:27 +02:00 · d9fe17443b
parent f79b34c1df
commit d9fe17443b
1 changed files with 1 additions and 1 deletions
--- a/src/Composer/Config.php
+++ b/src/Composer/Config.php
@ -90,7 +90,7 @@ class Config
     *
     * @param array $config
     */
-    public function merge(array $config)
+    public function merge($config)
    {
        // override defaults with given config
        if (!empty($config['config']) && is_array($config['config'])) {