Spread our drush.services.yml files around to the directories they be…

…long in.
drush-ops · Apr 28, 2017 · 04e24f5 · 04e24f5
1 parent 5e77676
commit 04e24f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/drush.services.yml b/drush.services.yml
diff --git a/src/Drupal/DrupalKernel.php b/src/Drupal/DrupalKernel.php
@@ -72,9 +72,15 @@ public function discoverServiceProviders() {
     // Add those Drush service providers from Drush core that
     // need references to the Drupal DI container. This includes
     // Drush commands, and those services needed by those Drush
-    // commands. Note that these commands are not instantiated
-    // until Drupal is bootstrapped.
-    $this->addDrushServiceProvider("_drush", DRUSH_BASE_PATH . '/drush.services.yml');
+    // commands.
+    //
+    // Note that:
+    //  - We list all of the individual service files we use here.
+    //  - These commands are not available until Drupal is bootstrapped.
+    $this->addDrushServiceProvider("_drush", DRUSH_BASE_PATH . '/src/Drupal/Commands/config/drush.services.yml');
+    $this->addDrushServiceProvider("_drush", DRUSH_BASE_PATH . '/src/Drupal/Commands/core/drush.services.yml');
+    $this->addDrushServiceProvider("_drush", DRUSH_BASE_PATH . '/src/Drupal/Commands/pm/drush.services.yml');
+    $this->addDrushServiceProvider("_drush", DRUSH_BASE_PATH . '/src/Drupal/Commands/sql/drush.services.yml');
 
     // TODO: We could potentially also add service providers from:
     //  - DRUSH_BASE_PATH . '/drush/drush.services.yml');