Allowed to push env vars into config arrays

hiqdev · Oct 24, 2019 · 7fa31d1 · 7fa31d1
1 parent d238de7
commit 7fa31d1
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/src/configs/Params.php b/src/configs/Params.php
@@ -26,14 +26,28 @@ protected function pushEnvVars($vars): array
     {
         $env = $this->builder->getConfig('dotenv')->getValues();
         if (!empty($vars)) {
-            foreach (array_keys($vars) as $key) {
-                $envKey = strtoupper(strtr($key, '.', '_'));
-                if (isset($env[$envKey])) {
-                    $vars[$key] = $env[$envKey];
+            foreach ($vars as $key => &$value) {
+                if (is_array($value)) {
+                    foreach (array_keys($value) as $subkey) {
+                        $envKey = $this->getEnvKey($key . '_' . $subkey);
+                        if (isset($env[$envKey])) {
+                            $value[$subkey] = $env[$envKey];
+                        }
+                    }
+                } else {
+                    $envKey = $this->getEnvKey($key);
+                    if (isset($env[$envKey])) {
+                        $vars[$key] = $env[$envKey];
+                    }
                 }
             }
         }
 
         return $vars;
     }
+
+    private function getEnvKey(string $key): string
+    {
+        return strtoupper(strtr($key, '.', '_'));
+    }
 }