Browse Source

Fix json manipulation fallback handling of empty objects, fixes #8600

Jordi Boggiano 5 years ago
parent
commit
850bfcddfa
1 changed files with 6 additions and 0 deletions
  1. 6 0
      src/Composer/Config/JsonConfigSource.php

+ 6 - 0
src/Composer/Config/JsonConfigSource.php

@@ -246,6 +246,12 @@ class JsonConfigSource implements ConfigSourceInterface
             $config = $this->file->read();
             $this->arrayUnshiftRef($args, $config);
             call_user_func_array($fallback, $args);
+            // avoid ending up with arrays for keys that should be objects
+            foreach (array('require', 'require-dev', 'conflict', 'provide', 'replace', 'suggest', 'config', 'autoload', 'autoload-dev') as $linkType) {
+                if (isset($config[$linkType]) && $config[$linkType] === array()) {
+                    $config[$linkType] = new \stdClass;
+                }
+            }
             $this->file->write($config);
         }