Merge pull request #26 from mateu-aguilo-bosch/23-drupal-root-detection

Use same Drupal root detection than drush.
e0ipso · Jul 1, 2015 · 4368d2b · 4368d2b
2 parents c90ecd8 + c74f7e5
commit 4368d2b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/src/Discovery/PathFinderCore.php b/src/Discovery/PathFinderCore.php
@@ -43,14 +43,14 @@ public function find($seed) {
    *   TRUE if the passed directory is the Drupal root.
    */
   protected function isDrupalRoot($directory) {
-    // Check if there is a COPYRIGHT.txt file in the directory.
-    $copyrightPath = $directory . DIRECTORY_SEPARATOR . 'COPYRIGHT.txt';
-    if (!$check = file_exists($copyrightPath)) {
-      return FALSE;
+    if (!empty($directory) && is_dir($directory) && file_exists($directory . DIRECTORY_SEPARATOR . '/index.php')) {
+      // Drupal 7 root.
+      // We check for the presence of 'modules/field/field.module' to differentiate this from a D6 site
+      return (file_exists($directory . DIRECTORY_SEPARATOR . 'includes/common.inc')
+        && file_exists($directory . DIRECTORY_SEPARATOR . 'misc/drupal.js')
+        && file_exists($directory . DIRECTORY_SEPARATOR . 'modules/field/field.module'));
     }
-    // Make sure that the COPYRIGHT.txt file corresponds to Drupal.
-    $line = fgets(fopen($copyrightPath, 'r'));
-    return strpos($line, 'All Drupal code is Copyright') === 0;
+    return FALSE;
   }
 
   /**

diff --git a/tests/data/docroot/COPYRIGHT.txt b/tests/data/docroot/COPYRIGHT.txt
diff --git a/tests/data/docroot/includes/common.inc b/tests/data/docroot/includes/common.inc
diff --git a/tests/data/docroot/index.php b/tests/data/docroot/index.php
diff --git a/tests/data/docroot/misc/drupal.js b/tests/data/docroot/misc/drupal.js
diff --git a/tests/data/docroot/modules/field/field.module b/tests/data/docroot/modules/field/field.module