From 5e9768e0e7f512a33d708b5947e3c7cd741be9b3 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Sun, 28 Apr 2019 15:52:01 +0200
Subject: [PATCH] fix: Validate config only after the options have been set

To avoid an exception when default options are not valid but the new options are.
---
 classes/Config.php   |  2 +-
 tests/ConfigTest.php | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/classes/Config.php b/classes/Config.php
index 1e8e9a1..e302bf7 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -135,7 +135,6 @@ class Config
     {
         $this->applyOptions($options);
         $this->getEnv();
-        $this->validateOptions();
     }
 
     /**
@@ -216,6 +215,7 @@ class Config
         if (is_file($file)) {
             $options = Yaml::parse(file_get_contents($file));
             self::$instance = new self($options);
+            self::$instance->validateOptions();
         } else {
             throw new Exception("Can't find config file at ".$file);
         }
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 6480521..7304ed0 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -41,6 +41,20 @@ class ConfigTest extends BaseTest
         $this->assertConfig($config);
     }
 
+    /**
+     * Test the getInstance function.
+     *
+     * @return void
+     */
+    public function testGetInstanceFromScratch()
+    {
+        Config::destroyInstance();
+
+        $config = Config::getInstance();
+        $this->assertEquals($config->convert, false);
+        $this->assertConfig($config);
+    }
+
     /**
      * Assert that a Config object is correctly instantiated.
      *