Skip to content
Snippets Groups Projects
Commit ec2fc7c2 authored by jurgenhaas's avatar jurgenhaas
Browse files

Optimize json file merge

parent 7ed07c01
No related branches found
No related tags found
No related merge requests found
......@@ -50,15 +50,17 @@ class Handler {
$projectRoot = getcwd();
// Append DrupalSpoon related components to composer.json.
$jsonFile = new JsonFile($projectRoot . '/composer.disabled.json');
$content = [];
if ($jsonFile->exists()) {
$content = $jsonFile->read();
foreach (['composer.disabled.json', 'composer.json'] as $file) {
$jsonFile = new JsonFile($projectRoot . '/' . $file);
if ($jsonFile->exists()) {
$content = array_merge_recursive($content, $jsonFile->read());
$fs->remove($projectRoot . '/' . $file);
}
}
$content = array_merge_recursive($content, $options);
$jsonFile = new JsonFile($projectRoot . '/composer.json');
$jsonFile->write($content);
$fs->remove($projectRoot . '/composer.json');
$fs->rename($projectRoot . '/composer.disabled.json', $projectRoot . '/composer.json');
}
/**
......@@ -105,7 +107,7 @@ class Handler {
'url' => 'https://packages.drupal.org/8',
],
],
'require_dev' => [
'require-dev' => [
'lakedrops/drupal-spoons' => 'dev-master',
'composer/installers' => '^1',
'drupal/core-composer-scaffold' => '^8.8',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment