Skip to content

Commit 334f189

Browse files
committed
[FWBundle] $_ENV fallback (needed for Panther)
1 parent 6ebbd64 commit 334f189

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

symfony/framework-bundle/3.3/public/index.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@
88
require __DIR__.'/../vendor/autoload.php';
99

1010
// The check is to ensure we don't use .env in production
11-
if (!isset($_SERVER['APP_ENV'])) {
11+
if (!isset($_SERVER['APP_ENV']) && !isset($_ENV['APP_ENV'])) {
1212
if (!class_exists(Dotenv::class)) {
1313
throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
1414
}
1515
(new Dotenv())->load(__DIR__.'/../.env');
1616
}
1717

18-
$env = $_SERVER['APP_ENV'] ?? 'dev';
19-
$debug = (bool) ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env));
18+
$env = $_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? 'dev';
19+
$debug = (bool) ($_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? ('prod' !== $env));
2020

2121
if ($debug) {
2222
umask(0000);
2323

2424
Debug::enable();
2525
}
2626

27-
if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? false) {
27+
if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
2828
Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
2929
}
3030

31-
if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? false) {
31+
if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
3232
Request::setTrustedHosts(explode(',', $trustedHosts));
3333
}
3434

symfony/framework-bundle/4.2/public/index.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@
88
require __DIR__.'/../vendor/autoload.php';
99

1010
// The check is to ensure we don't use .env if APP_ENV is defined
11-
if (!isset($_SERVER['APP_ENV'])) {
11+
if (!isset($_SERVER['APP_ENV']) && !isset($_ENV['APP_ENV'])) {
1212
if (!class_exists(Dotenv::class)) {
1313
throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
1414
}
1515
(new Dotenv())->load(__DIR__.'/../.env');
1616
}
1717

18-
$env = $_SERVER['APP_ENV'] ?? 'dev';
19-
$debug = (bool) ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env));
18+
$env = $_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? 'dev';
19+
$debug = (bool) ($_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? ('prod' !== $env));
2020

2121
if ($debug) {
2222
umask(0000);
2323

2424
Debug::enable();
2525
}
2626

27-
if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? false) {
27+
if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
2828
Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
2929
}
3030

31-
if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? false) {
31+
if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
3232
Request::setTrustedHosts(explode(',', $trustedHosts));
3333
}
3434

0 commit comments

Comments
 (0)