Processing configuration files recursively.

drush-ops · Jan 3, 2018 · 89aef5c · 89aef5c
1 parent 5fbd8f3
commit 89aef5c
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/Config/ConfigLocator.php b/src/Config/ConfigLocator.php
@@ -43,6 +43,8 @@ class ConfigLocator
 
     protected $configFilePaths = [];
 
+    protected $processedConfigPaths = [];
+
     /*
      * From context.inc:
      *
@@ -308,6 +310,15 @@ public function addConfigPaths($contextName, $paths)
         $this->addToSources($processor->sources());
         $context->import($processor->export($reference));
         $this->config->addContext($contextName, $context);
+        $this->processedConfigPaths = array_merge($this->processedConfigPaths, $paths);
+
+        // Recursive case.
+        if ($context->has('drush.paths.config')) {
+            $new_config_paths = array_diff((array) $context->get('drush.paths.config'), $this->processedConfigPaths);
+            if ($new_config_paths) {
+                $this->addConfigPaths($contextName, $new_config_paths);
+            }
+        }
 
         return $this;
     }