From d243090fea52b68a5ad5d55a5927ca95b5bf8bb1 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Fri, 10 Aug 2018 15:02:07 +0200
Subject: config: allow renaming of config.default.php to config.php

Closes #444 (Problems after installation)
---
 src/Config/ConfigServiceProvider.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'src/Config/ConfigServiceProvider.php')

diff --git a/src/Config/ConfigServiceProvider.php b/src/Config/ConfigServiceProvider.php
index 01b648df..9fbccd68 100644
--- a/src/Config/ConfigServiceProvider.php
+++ b/src/Config/ConfigServiceProvider.php
@@ -3,24 +3,33 @@
 namespace Engelsystem\Config;
 
 use Engelsystem\Container\ServiceProvider;
+use Exception;
 
 class ConfigServiceProvider extends ServiceProvider
 {
+    /** @var array */
+    protected $configFiles = ['config.default.php', 'config.php'];
+
     public function register()
     {
-        $defaultConfigFile = config_path('config.default.php');
-        $configFile = config_path('config.php');
-
         $config = $this->app->make(Config::class);
         $this->app->instance('config', $config);
 
-        $config->set(require $defaultConfigFile);
+        foreach ($this->configFiles as $file) {
+            $file = config_path($file);
+
+            if (!file_exists($file)) {
+                continue;
+            }
 
-        if (file_exists($configFile)) {
             $config->set(array_replace_recursive(
                 $config->get(null),
-                require $configFile
+                require $file
             ));
         }
+
+        if (empty($config->get(null))) {
+            throw new Exception('Configuration not found');
+        }
     }
 }
-- 
cgit v1.2.3-54-g00ecf