Fix composer.json conflict when merging

schmengler · schmengler · commit d3d4762ba513 · 2019-11-23T01:33:59.000+01:00
diff --git a/.travis/merge-dev.php b/.travis/merge-dev.php
@@ -17,7 +17,7 @@
     $fromJson['autoload-dev']['psr-4'][$key] = $pathPrefix . $value;
 }
 
-$toJson['require-dev'] = array_merge_recursive($toJson['require-dev'] ?? [], $fromJson['require-dev']);
+$toJson['require-dev'] = array_replace_recursive($toJson['require-dev'] ?? [], $fromJson['require-dev']);
 $toJson['autoload-dev'] = array_merge_recursive($toJson['autoload-dev'] ?? [], $fromJson['autoload-dev']);
 
 file_put_contents($toFile, json_encode($toJson, JSON_PRETTY_PRINT));

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`$fromJson['autoload-dev']['psr-4'][$key] = $pathPrefix . $value;`
`18`	`18`	`}`
`19`	`19`
`20`		`-$toJson['require-dev'] = array_merge_recursive($toJson['require-dev'] ?? [], $fromJson['require-dev']);`
	`20`	`+$toJson['require-dev'] = array_replace_recursive($toJson['require-dev'] ?? [], $fromJson['require-dev']);`
`21`	`21`	`$toJson['autoload-dev'] = array_merge_recursive($toJson['autoload-dev'] ?? [], $fromJson['autoload-dev']);`
`22`	`22`
`23`	`23`	`file_put_contents($toFile, json_encode($toJson, JSON_PRETTY_PRINT));`