[Chore] Fix .env overriding (#204)

Author: tchapi

bin/console

@@ -1,8 +1,12 @@
 #!/usr/bin/env php
 <?php
 
-if (getenv('ENV_DIR') !== false && getenv('ENV_DIR') !== '' ) {
-    $_SERVER['APP_RUNTIME_OPTIONS']['dotenv_path'] = getenv('ENV_DIR').'/.env';
+$overridenEnvDir = getenv('ENV_DIR') ?: null;
+
+if ($overridenEnvDir) {
+    // Tell the Runtime not to touch dotenv so we can load our own file.
+    // This is needed if the ENV_DIR is outside of the project directory
+    $_SERVER['APP_RUNTIME_OPTIONS']['disable_dotenv'] = true;
 }
 
 use App\Kernel;
@@ -19,11 +23,12 @@ if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 
-return function (array $context) {
-
-    $env_dir = getenv('ENV_DIR') != false ? getenv('ENV_DIR') : dirname(__DIR__);
-    (new Dotenv())->bootEnv($env_dir.'/.env');
+if ($overridenEnvDir) {
+    // Load our own now, after the runtime has booted
+    (new Dotenv())->bootEnv($overridenEnvDir.'/.env');
+}
 
+return function (array $context) {
     $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
 
     return new Application($kernel);

public/index.php

@@ -1,17 +1,23 @@
 <?php
 
-if (false !== getenv('ENV_DIR') && '' !== getenv('ENV_DIR')) {
-    $_SERVER['APP_RUNTIME_OPTIONS']['dotenv_path'] = getenv('ENV_DIR').'/.env';
+$overridenEnvDir = getenv('ENV_DIR') ?: null;
+
+if ($overridenEnvDir) {
+    // Tell the Runtime not to touch dotenv so we can load our own file.
+    // This is needed if the ENV_DIR is outside of the project directory
+    $_SERVER['APP_RUNTIME_OPTIONS']['disable_dotenv'] = true;
 }
 
 use App\Kernel;
 use Symfony\Component\Dotenv\Dotenv;
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 
-return function (array $context) {
-    $env_dir = false != getenv('ENV_DIR') ? getenv('ENV_DIR') : dirname(__DIR__);
-    (new Dotenv())->bootEnv($env_dir.'/.env');
+if ($overridenEnvDir) {
+    // Load our own now, after the runtime has booted
+    (new Dotenv())->bootEnv($overridenEnvDir.'/.env');
+}
 
+return function (array $context) {
     return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
 };