From f9a3f6c34fd7fb4624fd33487dd88021e5bb9f89 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Thu, 9 Nov 2017 11:25:10 +0100
Subject: [PATCH] Add a APP_DEBUG fallback in console and front controller

---
 bin/console      | 2 +-
 public/index.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/console b/bin/console
index 8ec3af44d..9f0dd4ea8 100755
--- a/bin/console
+++ b/bin/console
@@ -21,7 +21,7 @@ if (!isset($_SERVER['APP_ENV'])) {
 
 $input = new ArgvInput();
 $env = $input->getParameterOption(['--env', '-e'], $_SERVER['APP_ENV'] ?? 'dev');
-$debug = ($_SERVER['APP_DEBUG'] ?? true) !== '0' && !$input->hasParameterOption(['--no-debug', '']);
+$debug = ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env)) && !$input->hasParameterOption(['--no-debug', '']);
 
 if ($debug) {
     umask(0000);
diff --git a/public/index.php b/public/index.php
index 4ab996a76..552012707 100644
--- a/public/index.php
+++ b/public/index.php
@@ -21,7 +21,7 @@
     (new Dotenv())->load(__DIR__.'/../.env');
 }
 
-if ($_SERVER['APP_DEBUG'] ?? false) {
+if ($_SERVER['APP_DEBUG'] ?? ('prod' !== ($_SERVER['APP_ENV'] ?? 'dev'))) {
     umask(0000);
 
     Debug::enable();
@@ -29,7 +29,7 @@
 
 // Request::setTrustedProxies(['0.0.0.0/0'], Request::HEADER_FORWARDED);
 
-$kernel = new Kernel($_SERVER['APP_ENV'] ?? 'dev', $_SERVER['APP_DEBUG'] ?? false);
+$kernel = new Kernel($_SERVER['APP_ENV'] ?? 'dev', $_SERVER['APP_DEBUG'] ?? ('prod' !== ($_SERVER['APP_ENV'] ?? 'dev')));
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();