Skip to content

Commit bcf5440

Browse files
Merge branch '5.4' into 6.0
* 5.4: (22 commits) fix cs Update validators.lv.xlf Fix API gateway service name Improve recommendation message for "composer req" Fix CS in composer.json [DependencyInjection] fix preloading Update validators.uz.xlf AddMake ExpressionVoter Cacheable Add framework config for DBAL cache adapter [ExpressionLanguage] Fix LexerTest number types [Process] intersect with getenv() to populate default envs Improve CI script a bit Fix deprecation message placeholders [Cache] Fix calculate ttl in couchbase sdk 3.0 Fix Loco Provider [Cache] fix dbindex Redis Fix typos in a test message [Cache] fix releasing not acquired locks [DependencyInjection] fix creating 2nd container instances Never rely on dynamic properties ...
2 parents 6b208c9 + 956acb3 commit bcf5440

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

Process.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,13 +1599,8 @@ private function replacePlaceholders(string $commandline, array $env)
15991599

16001600
private function getDefaultEnv(): array
16011601
{
1602-
$env = [];
1603-
1604-
foreach ($_SERVER as $k => $v) {
1605-
if (\is_string($v) && false !== $v = getenv($k)) {
1606-
$env[$k] = $v;
1607-
}
1608-
}
1602+
$env = getenv();
1603+
$env = array_intersect_key($env, $_SERVER) ?: $env;
16091604

16101605
foreach ($_ENV as $k => $v) {
16111606
if (\is_string($v)) {

0 commit comments

Comments
 (0)