Skip to content

Commit 022c7da

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Runtime] Consider also $_ENV when resolving APP_RUNTIME and APP_RUNTIME_OPTIONS [WebProfilerBundle] Add a "previews tab in mailer profiler for HTML email [Config] Fix signature generation with nested attributes on PHP 8.1 [Cache] allow/provide psr/simple-cache v2 [Validator] Add missing translations for Slovenian (sl) Add missing translations for Bosnian (bs) Bump Symfony version to 4.4.34 Update VERSION for 4.4.33 Update CONTRIBUTORS for 4.4.33 Update CHANGELOG for 4.4.33
2 parents 7c200f1 + 2590032 commit 022c7da

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Internal/autoload_runtime.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ if (!is_object($app)) {
1212
throw new TypeError(sprintf('Invalid return value: callable object expected, "%s" returned from "%s".', get_debug_type($app), $_SERVER['SCRIPT_FILENAME']));
1313
}
1414

15-
$runtime = $_SERVER['APP_RUNTIME'] ?? %runtime_class%;
16-
$runtime = new $runtime(($_SERVER['APP_RUNTIME_OPTIONS'] ?? []) + %runtime_options%);
15+
$runtime = $_SERVER['APP_RUNTIME'] ?? $_ENV['APP_RUNTIME'] ?? %runtime_class%;
16+
$runtime = new $runtime(($_SERVER['APP_RUNTIME_OPTIONS'] ?? $_ENV['APP_RUNTIME_OPTIONS'] ?? []) + %runtime_options%);
1717

1818
[$app, $args] = $runtime
1919
->getResolver($app)

0 commit comments

Comments
 (0)