From b1759d92769c5406d8b98785c092383692367f49 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Sun, 28 Jan 2018 21:05:02 -0600
Subject: [PATCH] read a config.php file from root #156

---
 .gitignore                           |  1 +
 app/Providers/AppServiceProvider.php | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1afd6663..bd6dd62e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,7 @@ phpvms_next.iml
 public/info.php
 
 local.conf.php
+config.php
 
 # Error Logs
 error_log
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index b25c1c3a..ff8b58ce 100755
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -31,13 +31,15 @@ class AppServiceProvider extends ServiceProvider
         }
 
         # if there's a local.conf.php in the root, then merge that in
-        if(file_exists(base_path('local.conf.php'))) {
-            $local_conf = include base_path('local.conf.php');
-            $config = $this->app['config']->get('phpvms', []);
-            $this->app['config']->set(
-                'phpvms',
-                array_merge($config, $local_conf)
-            );
+        if(file_exists(base_path('config.php'))) {
+            $local_conf = include base_path('config.php');
+            foreach($local_conf as $namespace => $override_config) {
+                $config = $this->app['config']->get($namespace, []);
+                $this->app['config']->set(
+                    $namespace,
+                    array_merge($config, $override_config)
+                );
+            }
         }
     }