Skip to content

Commit 2cc275a

Browse files
Merge branch '7.4' into 8.0
* 7.4: [Security][TwigBridge] Add access_decision() and access_decision_for_user() [DependencyInjection] Optimize `AutowireRequiredMethodsPass` [Config] Fix `ReflectionClassResource` hash validation [Cache] Fix internal representation of non-static values [Cache] Make `TagAwareAdapter` registrable as a service [Validator] Add the Video constraint for validating video files refactor: Unify & more humane translation message [DependencyInjection] Allow multiple `#[AsDecorator]` attributes fix Resources translations validators.pt.xlf [Security] Pass attributes to nested `ChainUserProviders` [Runtime] Expose the runtime class in `$_SERVER['APP_RUNTIME']` [Validator] Update translation for the Video constraint [Messenger] Firebird Database - incompatibility with expected lowercase columns SQLSRV: Change column type from TEXT to STRING [DependencyInjection] Parse attributes found on abstract classes for resource definitions Fix exception catch when deleting temporary table in the sameDatabaseChecker [JsonStreamer] Fix encoding iterable lists [Console] Harden array type for test-related user inputs [Serializer] Fix serializer crash due to asymmetric visibility on `protected(set)` properties [DependencyInjection] Respect original service class when a proxy is defined
2 parents 6f950f2 + be29914 commit 2cc275a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ CHANGELOG
77
* Add JSON encoded value support for `APP_RUNTIME_OPTIONS`
88
* Add `FrankenPhpWorkerRunner`
99
* Add automatic detection of FrankenPHP worker mode in `SymfonyRuntime`
10+
* Expose the runtime class in `$_SERVER['APP_RUNTIME']`
11+
* Expose the runtime options in `$_SERVER['APP_RUNTIME_OPTIONS']`
1012

1113
6.4
1214
---

Internal/autoload_runtime.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ if (!is_object($app)) {
1515
if (is_string($_SERVER['APP_RUNTIME_OPTIONS'] ??= $_ENV['APP_RUNTIME_OPTIONS'] ?? [])) {
1616
$_SERVER['APP_RUNTIME_OPTIONS'] = json_decode($_SERVER['APP_RUNTIME_OPTIONS'], true, 512, JSON_THROW_ON_ERROR);
1717
}
18-
$runtime = $_SERVER['APP_RUNTIME'] ?? $_ENV['APP_RUNTIME'] ?? %runtime_class%;
19-
$runtime = new $runtime($_SERVER['APP_RUNTIME_OPTIONS'] += %runtime_options%);
18+
$_SERVER['APP_RUNTIME'] ??= $_ENV['APP_RUNTIME'] ?? %runtime_class%;
19+
$runtime = new $_SERVER['APP_RUNTIME']($_SERVER['APP_RUNTIME_OPTIONS'] += %runtime_options%);
2020

2121
[$app, $args] = $runtime
2222
->getResolver($app)

0 commit comments

Comments
 (0)