added pushing env vars into params with pushEnvVars

hiqdev · Oct 17, 2017 · 05fff11 · 05fff11
1 parent 35823f1
commit 05fff11
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/Builder.php b/src/Builder.php
@@ -163,9 +163,25 @@ public function buildConfig($name, array $configs, $defines = [])
             ]);
         }
         $this->vars[$name] = call_user_func_array([Helper::className(), 'mergeConfig'], $configs);
+        if ($name === 'params') {
+            $this->vars[$name] = $this->pushEnvVars($this->vars[$name]);
+        }
         $this->writeConfig($name, (array) $this->vars[$name], $defines);
     }
 
+    protected function pushEnvVars($vars)
+    {
+        $env = $this->vars['dotenv'];
+        foreach (array_keys($vars) as $key) {
+            $envKey = strtoupper(strtr($key, '.', '_'));
+            if (isset($env[$envKey])) {
+                $vars[$key] = $env[$envKey];
+            }
+        }
+
+        return $vars;
+    }
+
     protected function isSpecialConfig($name)
     {
         return in_array($name, ['dotenv', 'defines', 'params'], true);