Skip to content

Commit 7ae279b

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [SecurityBundle] Fix compat with symfony/security-core:^6 [DependencyInjection] Fix support for unions/intersections together with `ServiceSubscriberInterface` fixed leftover deprecations PHP 8.1 [Runtime] fix defining APP_DEBUG when Dotenv is not enabled revert using functions provided by polyfill packages [FrameworkBundle] Fix logic in workflow:dump between workflow name and workflow id Bump Symfony version to 5.4.0 Update VERSION for 5.4.0-BETA1 Update CHANGELOG for 5.4.0-BETA1 Add getters and setters for attributes property
2 parents 022c7da + 1fb6017 commit 7ae279b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

SymfonyRuntime.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ public function __construct(array $options = [])
108108
$options['debug'] ?? $options['debug'] = '1' === $_SERVER[$debugKey];
109109
$options['disable_dotenv'] = true;
110110
} else {
111-
$_SERVER[$envKey] ?? $_SERVER[$envKey] = 'dev';
111+
$_SERVER[$envKey] ?? $_SERVER[$envKey] = $_ENV[$envKey] ?? 'dev';
112+
$_SERVER[$debugKey] ?? $_SERVER[$debugKey] = $_ENV[$debugKey] ?? !\in_array($_SERVER[$envKey], (array) ($options['prod_envs'] ?? ['prod']), true);
112113
}
113114

114115
$options['error_handler'] ?? $options['error_handler'] = SymfonyErrorHandler::class;

0 commit comments

Comments
 (0)