Skip to content

Commit 6ee27aa

Browse files
authored
fix: Use getenv() for getting environment variable values (#193)
1 parent 4d1dc17 commit 6ee27aa

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

src/Client/TrapHandle.php

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ private function sendDump(): void
220220
try {
221221
// Set default values if not set
222222
if (!isset($_SERVER['VAR_DUMPER_FORMAT'], $_SERVER['VAR_DUMPER_SERVER'])) {
223-
$_SERVER['VAR_DUMPER_FORMAT'] = $_ENV['VAR_DUMPER_FORMAT'] ?? 'server';
223+
$_SERVER['VAR_DUMPER_FORMAT'] = $this->getEnvValue('VAR_DUMPER_FORMAT', 'server');
224224
// todo use the config file in the future
225-
$_SERVER['VAR_DUMPER_SERVER'] = $_ENV['VAR_DUMPER_SERVER'] ?? '127.0.0.1:9912';
225+
$_SERVER['VAR_DUMPER_SERVER'] = $this->getEnvValue('VAR_DUMPER_SERVER', '127.0.0.1:9912');
226226
}
227227

228228
// Dump single value
@@ -245,6 +245,25 @@ private function sendDump(): void
245245
}
246246
}
247247

248+
private function getEnvValue(string $name, string $default): string
249+
{
250+
if (\array_key_exists($name, $_ENV)) {
251+
return $_ENV[$name];
252+
}
253+
254+
$value = getenv($name, true);
255+
if ($value !== false) {
256+
return $value;
257+
}
258+
259+
$value = getenv($name);
260+
if ($value !== false) {
261+
return $value;
262+
}
263+
264+
return $default;
265+
}
266+
248267
private function haveToSend(): bool
249268
{
250269
if (!$this->haveToSend || $this->values === []) {

0 commit comments

Comments
 (0)