[Runtime] Consider also $_ENV when resolving APP_RUNTIME and APP_RUNTIME_OPTIONS

Peter Simoncic · nicolas-grekas · commit 29c2073f2549 · 2021-10-29T18:06:43.000+02:00
diff --git a/Internal/autoload_runtime.template b/Internal/autoload_runtime.template
@@ -18,8 +18,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)

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ if (!is_object($app)) {`
`18`	`18`	`throw new TypeError(sprintf('Invalid return value: callable object expected, "%s" returned from "%s".', get_debug_type($app), $_SERVER['SCRIPT_FILENAME']));`
`19`	`19`	`}`
`20`	`20`
`21`		`-$runtime = $_SERVER['APP_RUNTIME'] ?? %runtime_class%;`
`22`		`-$runtime = new $runtime(($_SERVER['APP_RUNTIME_OPTIONS'] ?? []) + %runtime_options%);`
	`21`	`+$runtime = $_SERVER['APP_RUNTIME'] ?? $_ENV['APP_RUNTIME'] ?? %runtime_class%;`
	`22`	`+$runtime = new $runtime(($_SERVER['APP_RUNTIME_OPTIONS'] ?? $_ENV['APP_RUNTIME_OPTIONS'] ?? []) + %runtime_options%);`
`23`	`23`
`24`	`24`	`[$app, $args] = $runtime`
`25`	`25`	`->getResolver($app)`