Pull request #8.

Merge branch 'marcingy-master' Signed-off-by: Jonathan Hedstrom <[email protected]>
jhedstrom · Feb 13, 2015 · 37fb2c7 · 37fb2c7
1 parent 377912e
commit 37fb2c7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/src/Drupal/Driver/Cores/CoreInterface.php b/src/Drupal/Driver/Cores/CoreInterface.php
@@ -31,6 +31,11 @@ public function getRandom();
    */
   public function bootstrap();
 
+  /**
+   * Get module list.
+   */
+  public function getModuleList();
+
   /**
    * Clear caches.
    */

diff --git a/src/Drupal/Driver/Cores/Drupal7.php b/src/Drupal/Driver/Cores/Drupal7.php
@@ -464,4 +464,11 @@ protected function getAllPermissions() {
     return $permissions;
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  public function getModuleList() {
+    return module_list();
+  }
+
 }
diff --git a/src/Drupal/Driver/Cores/Drupal8.php b/src/Drupal/Driver/Cores/Drupal8.php
@@ -341,4 +341,11 @@ public function termDelete(\stdClass $term) {
     $term->delete();
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  public function getModuleList() {
+    return \Drupal::moduleHandler()->getModuleList();
+  }
+
 }
diff --git a/src/Drupal/Driver/DrupalDriver.php b/src/Drupal/Driver/DrupalDriver.php
@@ -131,7 +131,7 @@ public function getSubDriverPaths() {
     }
 
     // Get enabled modules.
-    $modules = \module_list();
+    $modules = $this->getCore()->getModuleList();
     $paths = array();
     foreach ($modules as $module) {
       $paths[] = $this->drupalRoot . DIRECTORY_SEPARATOR . \drupal_get_path('module', $module);