Merge pull request #136 from TYPO3incubator/bugfix/env-file-order

[BUGFIX] Load env.prod file before server env vars
TYPO3incubator · Jun 12, 2024 · d65bfa5 · d65bfa5
2 parents ebee376 + 6a643db
commit d65bfa5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/config/system/additional.php b/config/system/additional.php
@@ -3,13 +3,13 @@
 $dotenv = Dotenv\Dotenv::createMutable(__DIR__ . '/../../', '.env.dist');
 $dotenv->load();
 
-if (file_exists(__DIR__ . '/../../.env')) {
-    $dotenv = Dotenv\Dotenv::createMutable(__DIR__ . '/../../');
+if (\TYPO3\CMS\Core\Core\Environment::getContext() == 'Production') {
+    $dotenv = Dotenv\Dotenv::createMutable(__DIR__ . '/../../', '.env.prod');
     $dotenv->load();
 }
 
-if (\TYPO3\CMS\Core\Core\Environment::getContext() == 'Production') {
-    $dotenv = Dotenv\Dotenv::createMutable(__DIR__ . '/../../', '.env.prod');
+if (file_exists(__DIR__ . '/../../.env')) {
+    $dotenv = Dotenv\Dotenv::createMutable(__DIR__ . '/../../');
     $dotenv->load();
 }