CHG from $_ENV to getenv() (fixes)

Author: francerz

README.md

@@ -49,18 +49,18 @@ Using an URI string
 $db = DatabaseManager::connect('driver://user:password@host:port/database');
 ```
 
-Using $_ENV global variable
+Using environment variable
 ```php
-$_ENV['DATABASE_SCHOOL_DRIVER'] = 'driver';
-$_ENV['DATABASE_SCHOOL_HOST'] = 'host';
-$_ENV['DATABASE_SCHOOL_INST'] = 'instanceName';
-$_ENV['DATABASE_SCHOOL_PORT'] = 'port';
-$_ENV['DATABASE_SCHOOL_USER'] = 'user';
-$_ENV['DATABASE_SCHOOL_PSWD'] = 'password';
-$_ENV['DATABASE_SCHOOL_NAME'] = 'database';
+putenv('DATABASE_SCHOOL_DRIVER', 'driver');
+putenv('DATABASE_SCHOOL_HOST', 'host');
+putenv('DATABASE_SCHOOL_INST', 'instanceName');
+putenv('DATABASE_SCHOOL_PORT', 'port');
+putenv('DATABASE_SCHOOL_USER', 'user');
+putenv('DATABASE_SCHOOL_PSWD', 'password');
+putenv('DATABASE_SCHOOL_NAME', 'database');
 
 // Support to Docker secrets
-$_ENV['DATABASE_SCHOOL_PSWD_FILE'] = '/run/secrets/db_school_password';
+putenv('DATABASE_SCHOOL_PSWD_FILE', '/run/secrets/db_school_password');
 
 $db = DatabaseManager::connect('school');
 ```

src/ConnectParams.php

@@ -40,7 +40,7 @@ public function __construct(
 
     public static function fromEnv(string $alias, ?array $env = null)
     {
-        $env = is_null($env) ? $_ENV : $env;
+        $env = $env ?? getenv();
         $alias = strtoupper($alias);
 
         $driver = DriverManager::fromEnv($alias, $env);
@@ -53,16 +53,16 @@ public static function fromEnv(string $alias, ?array $env = null)
         $pwflKey = "DATABASE_{$alias}_PSWD_FILE";
         $instKey = "DATABASE_{$alias}_INST";
 
-        $host = getenv($hostKey) ?? $driver->getDefaultHost();
-        $port = getenv($portKey) ?? $driver->getDefaultPort();
-        $user = getenv($userKey) ?? $driver->getDefaultUser();
-        $name = getenv($nameKey) ?? $alias;
-        $encd = getenv($encdKey) ?? null;
-        $inst = getenv($instKey) ?? null;
+        $host = $env[$hostKey] ?? $driver->getDefaultHost();
+        $port = $env[$portKey] ?? $driver->getDefaultPort();
+        $user = $env[$userKey] ?? $driver->getDefaultUser();
+        $name = $env[$nameKey] ?? $alias;
+        $encd = $env[$encdKey] ?? null;
+        $inst = $env[$instKey] ?? null;
 
-        $pswd = getenv($pswdKey) ?? $driver->getDefaultPswd();
-        if (!empty(getenv($pwflKey)) && file_exists(getenv($pwflKey))) {
-            $pswd = file_get_contents(getenv($pwflKey));
+        $pswd = $env[$pswdKey] ?? $driver->getDefaultPswd();
+        if (!empty($env[$pwflKey]) && file_exists($env[$pwflKey])) {
+            $pswd = file_get_contents($env[$pwflKey]);
         }
 
         return new ConnectParams($driver, $host, $user, $pswd, $name, $port, $encd, $inst);

src/DriverManager.php

@@ -41,7 +41,7 @@ public static function getDriverName(DriverInterface $driver): ?string
 
     public static function fromEnv(string $alias, ?array $env = null)
     {
-        $env = is_null($env) ? $_ENV : $env;
+        $env = $env ?? getenv();
         $alias = strtoupper($alias);
 
         $driverKey = "DATABASE_{$alias}_DRIVER";