Browse Source

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

Jordi Boggiano 11 years ago
parent
commit
d9fe17443b
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/Composer/Config.php

+ 1 - 1
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'])) {