Merge pull request #175 from webflo/fix-install

Fixes notices during module installation Signed-off-by: Jonathan Hedstrom <jhedstrom@gmail.com>
jhedstrom · May 29, 2015 · 613570f · 613570f
1 parent dd8a60d
commit 613570f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/fixtures/drupal8/modules/behat_test/config/install/field.storage.user.field_user_tags.yml b/fixtures/drupal8/modules/behat_test/config/install/field.storage.user.field_user_tags.yml
@@ -10,9 +10,7 @@ entity_type: user
 type: entity_reference
 settings:
   target_type: taxonomy_term
-  options_list_callback: null
-  target_bundle: null
-module: taxonomy
+module: entity_reference
 locked: false
 cardinality: -1
 translatable: true

diff --git a/fixtures/drupal8/modules/behat_test/src/Config/BehatTestExtensionInstallStorage.php b/fixtures/drupal8/modules/behat_test/src/Config/BehatTestExtensionInstallStorage.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Config\ExtensionInstallStorage;
 use Drupal\Core\Config\StorageInterface;
+use Drupal\Core\Extension\ExtensionDiscovery;
 
 class BehatTestExtensionInstallStorage extends ExtensionInstallStorage {
 
@@ -21,13 +22,14 @@ public function __construct(StorageInterface $config_storage, $directory = self:
     $this->directory = 'override_config';
   }
 
-
   /**
    * {@inheritdoc}
    */
   protected function getAllFolders() {
     if (!isset($this->folders)) {
-      $this->folders = $this->getComponentNames('module', array('behat_test'));
+      $listing = new ExtensionDiscovery(\Drupal::root());
+      $modules = $listing->scan('module');
+      $this->folders = $this->getComponentNames(array('behat_test' => $modules['behat_test']));
     }
     return $this->folders;
   }