Remove ScriptHandler::getDrupalRoot retrieve the data from composer metadata (via DrupalFinder)

webflo · webflo · commit 2d09cf7be3f8 · 2017-03-23T11:51:48.000+01:00
diff --git a/composer.json b/composer.json
@@ -21,7 +21,9 @@
         "drupal-composer/drupal-scaffold": "^2.2",
         "drupal/console": "~1.0",
         "drupal/core": "~8.0",
-        "drush/drush": "~8.0"
+        "drush/drush": "~8.0",
+        "webflo/drupal-finder": "^0.2.1",
+        "webmozart/path-util": "^2.3"
     },
     "require-dev": {
         "behat/mink": "~1.7",
diff --git a/scripts/composer/ScriptHandler.php b/scripts/composer/ScriptHandler.php
@@ -9,19 +9,17 @@
 
 use Composer\Script\Event;
 use Composer\Semver\Comparator;
+use DrupalFinder\DrupalFinder;
 use Symfony\Component\Filesystem\Filesystem;
 use Webmozart\PathUtil\Path;
 
 class ScriptHandler {
 
-  protected static function getDrupalRoot($project_root) {
-    return $project_root . '/web';
-  }
-
   public static function createRequiredFiles(Event $event) {
     $fs = new Filesystem();
-    $projectRoot = getcwd();
-    $drupalRoot = static::getDrupalRoot($projectRoot);
+    $drupalFinder = new DrupalFinder();
+    $drupalFinder->locateRoot(getcwd());
+    $drupalRoot = $drupalFinder->getDrupalRoot();
 
     $dirs = [
       'modules',
@@ -44,7 +42,7 @@ public static function createRequiredFiles(Event $event) {
       require_once $drupalRoot . '/core/includes/install.inc';
       $settings['config_directories'] = [
         CONFIG_SYNC_DIRECTORY => (object) [
-          'value' => Path::makeRelative($projectRoot . '/config/sync', $drupalRoot),
+          'value' => Path::makeRelative($drupalFinder->getComposerRoot() . '/config/sync', $drupalRoot),
           'required' => TRUE,
         ],
       ];
