Improve env handling

dunglas · dunglas · commit bafbfd0e9903 · 2018-10-30T23:17:57.000+01:00
diff --git a/symfony/console/4.2/bin/console b/symfony/console/4.2/bin/console
@@ -7,15 +7,12 @@ use Symfony\Component\Debug\Debug;
 
 set_time_limit(0);
 
-require __DIR__.'/../src/bootstrap.php';
+[$env, $debug] = require __DIR__.'/../src/bootstrap.php';
 
 if (!class_exists(Application::class)) {
     throw new \RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
 }
 
-$env = $_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? 'dev';
-$debug = (bool) ($_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? ('prod' !== $env)) && !$input->hasParameterOption('--no-debug', true);
-
 if ($debug) {
     umask(0000);
 
diff --git a/symfony/framework-bundle/4.2/public/index.php b/symfony/framework-bundle/4.2/public/index.php
@@ -4,10 +4,7 @@
 use Symfony\Component\Debug\Debug;
 use Symfony\Component\HttpFoundation\Request;
 
-require __DIR__.'/../src/bootstrap.php';
-
-$env = $_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? 'dev';
-$debug = (bool) ($_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? ('prod' !== $env));
+[$env, $debug] = require __DIR__.'/../src/bootstrap.php';
 
 if ($debug) {
     umask(0000);
diff --git a/symfony/framework-bundle/4.2/src/bootstrap.php b/symfony/framework-bundle/4.2/src/bootstrap.php
@@ -4,8 +4,14 @@
 
 use Symfony\Component\Dotenv\Dotenv;
 
-if (class_exists(Dotenv::class)) {
-    (new Dotenv())->loadForEnv($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? 'dev', __DIR__.'/../.env');
-} elseif (!isset($_SERVER['APP_ENV']) && !isset($_ENV['APP_ENV'])) {
+$envFromEnv = $_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null;
+$env = $envFromEnv ?? 'dev';
+$prod = 'prod' === $env;
+
+if (!$prod && class_exists(Dotenv::class)) {
+    (new Dotenv())->loadForEnv($env, __DIR__.'/../.env');
+} elseif (null === $envFromEnv) {
     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.');
 }
+
+return [$env, (bool) ($_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? (!$prod))];
