Changes to usage of DrupalFinderComposerRuntime API in ScriptHandler

- Add sanity null-check for $drupalRoot
- Restore Path generator for config_sync_directory

Author: jnoordsij

Diff for: scripts/composer/ScriptHandler.php

@@ -11,9 +11,9 @@
 use Composer\Semver\Comparator;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Site\SettingsEditor;
-use DrupalFinder\DrupalFinder;
 use DrupalFinder\DrupalFinderComposerRuntime;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Filesystem\Path;
 
 class ScriptHandler {
 
@@ -22,6 +22,15 @@ public static function createRequiredFiles(Event $event) {
     $drupalFinder = new DrupalFinderComposerRuntime();
     $drupalRoot = $drupalFinder->getDrupalRoot();
 
+    // If Drupal root was not found, exit.
+    if (is_null($drupalRoot)) {
+      $io = $event->getIO();
+      $io->writeError(
+        '<error>Drupal root could not be detected.</error>',
+      );
+      exit(1);
+    }
+
     $dirs = [
       'modules',
       'profiles',
@@ -43,7 +52,7 @@ public static function createRequiredFiles(Event $event) {
       require_once $drupalRoot . '/core/includes/install.inc';
       new Settings([]);
       $settings['settings']['config_sync_directory'] = (object) [
-        'value' => '../config/sync',
+        'value' => Path::makeRelative($drupalFinder->getComposerRoot() . '/config/sync', $drupalRoot),
         'required' => TRUE,
       ];
       SettingsEditor::rewrite($drupalRoot . '/sites/default/settings.php', $settings);