bug #41148 [Runtime] fix defining $_SERVER[APP_ENV] (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit c151f76b0227 · 2021-05-10T10:53:17.000+02:00
This PR was merged into the 5.3-dev branch. Discussion ---------- [Runtime] fix defining $_SERVER[APP_ENV] | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #41140 | License | MIT | Doc PR | - Commits ------- e271acc [Runtime] fix defining $_SERVER[APP_ENV]
diff --git a/src/Symfony/Component/Runtime/SymfonyRuntime.php b/src/Symfony/Component/Runtime/SymfonyRuntime.php
@@ -88,20 +88,22 @@ class SymfonyRuntime extends GenericRuntime
      */
     public function __construct(array $options = [])
     {
-        if (isset($_SERVER['argv']) && !isset($options['env']) && class_exists(ArgvInput::class)) {
+        if (isset($options['env'])) {
+            $_SERVER['APP_ENV'] = $options['env'];
+        } elseif (isset($_SERVER['argv']) && class_exists(ArgvInput::class)) {
             $this->options = $options;
             $this->getInput();
         }
 
-        $_SERVER['APP_ENV'] = $options['env'] ?? $_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? 'dev';
-
         if (!($options['disable_dotenv'] ?? false) && isset($options['project_dir']) && !class_exists(MissingDotenv::class, false)) {
             (new Dotenv())
                 ->setProdEnvs((array) ($options['prod_envs'] ?? ['prod']))
                 ->usePutenv($options['use_putenv'] ?? false)
                 ->bootEnv($options['project_dir'].'/'.($options['dotenv_path'] ?? '.env'), 'dev', (array) ($options['test_envs'] ?? ['test']));
             $options['debug'] ?? $options['debug'] = '1' === $_SERVER['APP_DEBUG'];
             $options['disable_dotenv'] = true;
+        } else {
+            $_SERVER['APP_ENV'] ?? $_SERVER['APP_ENV'] = 'dev';
         }
 
         $options['error_handler'] ?? $options['error_handler'] = SymfonyErrorHandler::class;
