Skip to content

Commit 956acb3

Browse files
Merge branch '5.3' into 5.4
* 5.3: fix cs Update validators.lv.xlf Fix API gateway service name Fix CS in composer.json Update validators.uz.xlf [ExpressionLanguage] Fix LexerTest number types [Process] intersect with getenv() to populate default envs Improve CI script a bit Fix Loco Provider [Cache] fix dbindex Redis Fix typos in a test message Never rely on dynamic properties
2 parents cbdd4cd + 6c99204 commit 956acb3

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
@@ -1661,13 +1661,8 @@ private function replacePlaceholders(string $commandline, array $env)
16611661

16621662
private function getDefaultEnv(): array
16631663
{
1664-
$env = [];
1665-
1666-
foreach ($_SERVER as $k => $v) {
1667-
if (\is_string($v) && false !== $v = getenv($k)) {
1668-
$env[$k] = $v;
1669-
}
1670-
}
1664+
$env = getenv();
1665+
$env = array_intersect_key($env, $_SERVER) ?: $env;
16711666

16721667
foreach ($_ENV as $k => $v) {
16731668
if (\is_string($v)) {

0 commit comments

Comments
 (0)