Fix: Anpassung der Umgebungsvariablen-Logik in CleanProcess
Changelog: fixed
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
* CleanProcess.php 2026-03-27 thomas
|
* CleanProcess.php 2026-04-9 thomas
|
||||||
*
|
*
|
||||||
* Copyright (c) 2026 Thomas Schneider <thomas@inter-mundos.de>
|
* Copyright (c) 2026 Thomas Schneider <thomas@inter-mundos.de>
|
||||||
* Alle Rechte vorbehalten.
|
* Alle Rechte vorbehalten.
|
||||||
@@ -27,8 +27,9 @@ class CleanProcess extends Process
|
|||||||
private function parseEnvVars(string $keySelector, array &$env): void
|
private function parseEnvVars(string $keySelector, array &$env): void
|
||||||
{
|
{
|
||||||
$preservedKeys = [];
|
$preservedKeys = [];
|
||||||
|
$envVars = getenv($keySelector) ?: ($_SERVER[$keySelector] ?? $_ENV[$keySelector] ?? false);
|
||||||
|
|
||||||
if(empty(getenv($keySelector)))
|
if(empty($envVars))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -39,7 +40,7 @@ class CleanProcess extends Process
|
|||||||
$preservedKeys += ['SSH_AUTH_SOCK'];
|
$preservedKeys += ['SSH_AUTH_SOCK'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$vars = array_fill_keys(explode(',', getenv($keySelector)), false);
|
$vars = array_fill_keys(explode(',', $envVars), false);
|
||||||
|
|
||||||
$env = [...array_diff_key($vars, array_flip($preservedKeys)), ...$env];
|
$env = [...array_diff_key($vars, array_flip($preservedKeys)), ...$env];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user