Merge pull request #40 from neos/6.0

MERGE: 6.0
neos · Apr 19, 2020 · a9afa47 · a9afa47
2 parents a7ee073 + 99821d5
commit a9afa47
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/TravisCi/ComposerManifestUpdater.php b/TravisCi/ComposerManifestUpdater.php
@@ -41,6 +41,12 @@
     exit(1);
 }
 
+// Merge dev requirements from dev-collection
+$buildComposerManifest = json_decode(file_get_contents('../../' . $travisRepoSlug . '/composer.json'), true);
+if (isset($buildComposerManifest['require-dev'])) {
+    $composerManifest['require-dev'] = array_merge($composerManifest['require-dev'], $buildComposerManifest['require-dev']);
+}
+
 $output = json_encode($composerManifest, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . PHP_EOL;
 print_r($output);
 file_put_contents('composer.json', $output);