Merge pull request #1974 from simongroenewolt/feature/dotenv-additions

Use ->loadEnv() instead of ->load() to support the 'standard' Symfony…

.gitignore

@@ -68,6 +68,8 @@ appveyor.yml
 /config/routes/local
 !/config/routes/local/_import_dev.yaml
 .php-version
+/.env.local
+/.env.*.local
 
 ###> symfony/framework-bundle ###
 /public/bundles/

bin/console

@@ -19,7 +19,7 @@ if (!isset($_SERVER['APP_ENV'])) {
     if (!class_exists(Dotenv::class)) {
         throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
     }
-    (new Dotenv())->load(__DIR__.'/../.env');
+    (new Dotenv())->bootEnv(__DIR__.'/../.env');
 }
 
 $input = new ArgvInput();

public/index.php

@@ -9,12 +9,12 @@
 
 require __DIR__.'/../vendor/autoload.php';
 
-// The check is to ensure we don't use .env in production
+// If APP_ENV is set Dotenv is skipped (so .env / .env.local etc. are _not_ processed)
 if (! isset($_SERVER['APP_ENV'])) {
     if (! class_exists(Dotenv::class)) {
         throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
     }
-    (new Dotenv())->load(__DIR__.'/../.env');
+    (new Dotenv())->bootEnv(__DIR__.'/../.env');
 }
 
 $env = $_SERVER['APP_ENV'] ?? 'dev';