Use SAs from drupal/drupal for drupal/core

webflo · webflo · commit 46dc7a4790bb · 2018-03-08T09:34:37.000+01:00
diff --git a/build/build-composer-json.php b/build/build-composer-json.php
@@ -123,6 +123,12 @@ public static function isValid($version) {
     $composer['conflict'][$package] = implode(',', $constraints);
   }
 
+  // drupal/core is a subtree split for drupal/drupal and has no own SAs.
+  // @see https://github.com/drush-ops/drush/issues/3448
+  if (isset($composer['conflict']['drupal/drupal']) && !isset($composer['conflict']['drupal/core'])) {
+    $composer['conflict']['drupal/core'] = $composer['conflict']['drupal/drupal'];
+  }
+
   ksort($composer['conflict']);
   file_put_contents(__DIR__ . '/' . $target[$core] . '/composer.json', json_encode($composer, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) . "\n");
 }

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,12 @@ public static function isValid($version) {`
`123`	`123`	`$composer['conflict'][$package] = implode(',', $constraints);`
`124`	`124`	`}`
`125`	`125`
	`126`	`+ // drupal/core is a subtree split for drupal/drupal and has no own SAs.`
	`127`	`+ // @see https://github.com/drush-ops/drush/issues/3448`
	`128`	`+ if (isset($composer['conflict']['drupal/drupal']) && !isset($composer['conflict']['drupal/core'])) {`
	`129`	`+ $composer['conflict']['drupal/core'] = $composer['conflict']['drupal/drupal'];`
	`130`	`+ }`
	`131`	`+`
`126`	`132`	`ksort($composer['conflict']);`
`127`	`133`	`file_put_contents(__DIR__ . '/' . $target[$core] . '/composer.json', json_encode($composer, JSON_UNESCAPED_SLASHES \| JSON_PRETTY_PRINT \| JSON_UNESCAPED_UNICODE) . "\n");`
`128`	`134`	`}`