Skip to content

Commit 6de6211

Browse files
committed
CHG from $_ENV vars to getenv() to better environment compatibility
1 parent b3ddf17 commit 6de6211

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/ConnectParams.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ public static function fromEnv(string $alias, ?array $env = null)
5353
$pwflKey = "DATABASE_{$alias}_PSWD_FILE";
5454
$instKey = "DATABASE_{$alias}_INST";
5555

56-
$host = $env[$hostKey] ?? $driver->getDefaultHost();
57-
$port = $env[$portKey] ?? $driver->getDefaultPort();
58-
$user = $env[$userKey] ?? $driver->getDefaultUser();
59-
$name = $env[$nameKey] ?? $alias;
60-
$encd = $env[$encdKey] ?? null;
61-
$inst = $env[$instKey] ?? null;
62-
63-
$pswd = $env[$pswdKey] ?? $driver->getDefaultPswd();
64-
if (!empty($env[$pwflKey]) && file_exists($env[$pwflKey])) {
65-
$pswd = file_get_contents($env[$pwflKey]);
56+
$host = getenv($hostKey) ?? $driver->getDefaultHost();
57+
$port = getenv($portKey) ?? $driver->getDefaultPort();
58+
$user = getenv($userKey) ?? $driver->getDefaultUser();
59+
$name = getenv($nameKey) ?? $alias;
60+
$encd = getenv($encdKey) ?? null;
61+
$inst = getenv($instKey) ?? null;
62+
63+
$pswd = getenv($pswdKey) ?? $driver->getDefaultPswd();
64+
if (!empty(getenv($pwflKey)) && file_exists(getenv($pwflKey))) {
65+
$pswd = file_get_contents(getenv($pwflKey));
6666
}
6767

6868
return new ConnectParams($driver, $host, $user, $pswd, $name, $port, $encd, $inst);

0 commit comments

Comments
 (0)