diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Runtime] fix defining $_SERVER[APP_ENV]

Browse Source
This commit is contained in:
Nicolas Grekas 2021-05-09 19:16:51 +02:00
parent f6ab4b5b26
commit e271accc12
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Runtime/SymfonyRuntime.php
View File

@ -88,13 +88,13 @@ 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']))
@ -102,6 +102,8 @@ class SymfonyRuntime extends GenericRuntime
->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;