#4194: drush config:status does not respect excluded modules (#4201)

* Update ConfigCommands.php * Update drush.services.yml
drush-ops · Oct 3, 2019 · 11cc24b · 11cc24b
1 parent 968890e
commit 11cc24b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/Drupal/Commands/config/ConfigCommands.php b/src/Drupal/Commands/config/ConfigCommands.php
@@ -32,6 +32,11 @@ class ConfigCommands extends DrushCommands implements StdinAwareInterface
      */
     protected $configFactory;
 
+    /**
+     * @var StorageInterface
+     */
+    protected $configStorageExport;
+
     /**
      * @return ConfigFactoryInterface
      */
@@ -44,11 +49,32 @@ public function getConfigFactory()
     /**
      * ConfigCommands constructor.
      * @param ConfigFactoryInterface $configFactory
+     * @param \Drupal\Core\Config\StorageInterface $configStorage
      */
-    public function __construct($configFactory)
+    public function __construct($configFactory, StorageInterface $configStorage)
     {
         parent::__construct();
         $this->configFactory = $configFactory;
+        $this->configStorage = $configStorage;
+    }
+
+    /**
+     * @param \Drupal\Core\Config\StorageInterface $exportStorage
+     */
+    public function setExportStorage(StorageInterface $exportStorage)
+    {
+        $this->configStorageExport = $exportStorage;
+    }
+
+    /**
+     * @return StorageInterface
+     */
+    public function getConfigStorageExport()
+    {
+        if (isset($this->configStorageExport)) {
+            return $this->configStorageExport;
+        }
+        return $this->configStorage;
     }
 
     /**
@@ -333,7 +359,7 @@ public static function getDirectory($label, $directory = null)
     public function getChanges($target_storage)
     {
         /** @var StorageInterface $active_storage */
-        $active_storage = \Drupal::service('config.storage');
+        $active_storage = $this->getConfigStorageExport();
 
         $config_comparer = new StorageComparer($active_storage, $target_storage, \Drupal::service('config.manager'));
 

diff --git a/src/Drupal/Commands/config/drush.services.yml b/src/Drupal/Commands/config/drush.services.yml
@@ -2,7 +2,9 @@
 services:
   config.commands:
     class: \Drush\Drupal\Commands\config\ConfigCommands
-    arguments: ['@config.factory']
+    arguments: ['@config.factory', '@config.storage']
+    calls:
+      - [setExportStorage, ['@?config.storage.export']]
     tags:
       -  { name: drush.command }
   config.export.commands: