bug #43945 [Runtime] fix defining APP_DEBUG when Dotenv is not enabled (nicolas-grekas)

fabpot · fabpot · commit a063a28e8553 · 2021-11-05T18:46:39.000+01:00
This PR was merged into the 5.3 branch. Discussion ---------- [Runtime] fix defining APP_DEBUG when Dotenv is not enabled | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #43793 | License | MIT | Doc PR | - Commits ------- 189987a [Runtime] fix defining APP_DEBUG when Dotenv is not enabled
diff --git a/src/Symfony/Component/Runtime/SymfonyRuntime.php b/src/Symfony/Component/Runtime/SymfonyRuntime.php
@@ -103,7 +103,8 @@ public function __construct(array $options = [])
             $options['debug'] ?? $options['debug'] = '1' === $_SERVER['APP_DEBUG'];
             $options['disable_dotenv'] = true;
         } else {
-            $_SERVER['APP_ENV'] ?? $_SERVER['APP_ENV'] = 'dev';
+            $_SERVER['APP_ENV'] ?? $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] ?? 'dev';
+            $_SERVER['APP_DEBUG'] ?? $_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] ?? !\in_array($_SERVER['APP_ENV'], (array) ($options['prod_envs'] ?? ['prod']), true);
         }
 
         $options['error_handler'] ?? $options['error_handler'] = SymfonyErrorHandler::class;

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,8 @@ public function __construct(array $options = [])`
`103`	`103`	`$options['debug'] ?? $options['debug'] = '1' === $_SERVER['APP_DEBUG'];`
`104`	`104`	`$options['disable_dotenv'] = true;`
`105`	`105`	`} else {`
`106`		`- $_SERVER['APP_ENV'] ?? $_SERVER['APP_ENV'] = 'dev';`
	`106`	`+ $_SERVER['APP_ENV'] ?? $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] ?? 'dev';`
	`107`	`+ $_SERVER['APP_DEBUG'] ?? $_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] ?? !\in_array($_SERVER['APP_ENV'], (array) ($options['prod_envs'] ?? ['prod']), true);`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`$options['error_handler'] ?? $options['error_handler'] = SymfonyErrorHandler::class;`