Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Oct 29, 2021
2 parents 7c200f1 + 2590032 commit 022c7da
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Internal/autoload_runtime.template
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ if (!is_object($app)) {
throw new TypeError(sprintf('Invalid return value: callable object expected, "%s" returned from "%s".', get_debug_type($app), $_SERVER['SCRIPT_FILENAME']));
}

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

[$app, $args] = $runtime
->getResolver($app)
Expand Down

0 comments on commit 022c7da

Please sign in to comment.