From ca0ec57d99349b8a3df470bd99dce20b35c1da74 Mon Sep 17 00:00:00 2001
From: Daniel Opitz <d.opitz@outlook.com>
Date: Sun, 14 Aug 2022 10:49:46 +0200
Subject: [PATCH] Update settings

---
 config/defaults.php | 3 ---
 config/settings.php | 8 +++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/config/defaults.php b/config/defaults.php
index 1c1bff67b..16cb64bd7 100644
--- a/config/defaults.php
+++ b/config/defaults.php
@@ -12,9 +12,6 @@
 
 $settings = [];
 
-// Environment
-$settings['env'] = $_ENV['APP_ENV'] ?? $_SERVER['APP_ENV'] ?? 'dev';
-
 // Error handler
 $settings['error'] = [
     // Should be set to false for the production environment
diff --git a/config/settings.php b/config/settings.php
index e78152f16..84eef052a 100644
--- a/config/settings.php
+++ b/config/settings.php
@@ -1,10 +1,16 @@
 <?php
 
+// Load .env file if located in the project root directory
+//(\Dotenv\Dotenv::createImmutable(__DIR__ . '/../'))->safeLoad();
+
+// Define environment
+$_ENV['APP_ENV'] = $_ENV['APP_ENV'] ?? $_SERVER['APP_ENV'] ?? 'dev';
+
 // Load default settings
 $settings = require __DIR__ . '/defaults.php';
 
 // Overwrite default settings with environment specific local settings
-$configFiles = sprintf('%s/{local.%s,env,../../env}.php', __DIR__, $settings['env']);
+$configFiles = sprintf('%s/{local.%s,env,../../env}.php', __DIR__, $_ENV['APP_ENV']);
 
 foreach (glob($configFiles, GLOB_BRACE) as $file) {
     $local = require $file;