refactor: collect only specific env vars in EnvConfigLoader

- EnvConfigLoader::loadDatabaseConfig() now collects only database-related
  PDODB_* variables instead of all PDODB_* variables
- BaseCliCommand::loadCacheConfig() now collects only PDODB_CACHE_*
  variables instead of all PDODB_* variables
- This prevents environment variable pollution from other tests
- Fixes Oracle tests failing due to PDODB_CHARSET=utf8mb4 from MySQL tests

Author: tommyknocker

src/cli/BaseCliCommand.php

@@ -257,29 +257,9 @@ protected static function buildConfigFromEnv(string $driver): ?array
      */
     protected static function loadCacheConfig(array $dbConfig): array
     {
-        // Collect environment variables
+        // Collect only cache-related environment variables
         // Always use getenv() to ensure we get variables set via putenv()
         // $_ENV may not be updated when putenv() is called
-        $envVars = [];
-        // Check $_ENV first (most reliable)
-        foreach ($_ENV as $key => $value) {
-            if (is_string($key) && str_starts_with($key, 'PDODB_')) {
-                $envValue = getenv($key);
-                if ($envValue !== false) {
-                    $envVars[$key] = $envValue;
-                }
-            }
-        }
-        // Also check $_SERVER for variables that might not be in $_ENV
-        foreach ($_SERVER as $key => $value) {
-            if (is_string($key) && str_starts_with($key, 'PDODB_') && !isset($envVars[$key])) {
-                $envValue = getenv($key);
-                if ($envValue !== false) {
-                    $envVars[$key] = $envValue;
-                }
-            }
-        }
-        // Also check common PDODB_CACHE_* variables directly via getenv() to catch putenv() calls
         $cacheEnvVars = [
             'PDODB_CACHE_ENABLED',
             'PDODB_CACHE_TYPE',
@@ -293,12 +273,12 @@ protected static function loadCacheConfig(array $dbConfig): array
             'PDODB_CACHE_MEMCACHED_SERVERS',
             'PDODB_CACHE_NAMESPACE',
         ];
+
+        $envVars = [];
         foreach ($cacheEnvVars as $key) {
-            if (!isset($envVars[$key])) {
-                $envValue = getenv($key);
-                if ($envValue !== false) {
-                    $envVars[$key] = $envValue;
-                }
+            $envValue = getenv($key);
+            if ($envValue !== false) {
+                $envVars[$key] = $envValue;
             }
         }
 

src/connection/EnvConfigLoader.php

@@ -38,27 +38,30 @@ public static function loadDatabaseConfig(?string $envPath = null): array
         // Validate that required extension is available
         \tommyknocker\pdodb\connection\ExtensionChecker::validate($driver);
 
-        // Collect all PDODB_* environment variables
-        $envVars = [];
+        // Collect only database-related PDODB_* environment variables
         // Always use getenv() to ensure we get variables set via putenv()
         // $_ENV may not be updated when putenv() is called
-        // Collect all PDODB_* variables from environment
-        // Check $_ENV first (most reliable)
-        foreach ($_ENV as $key => $value) {
-            if (is_string($key) && str_starts_with($key, 'PDODB_')) {
-                $envValue = getenv($key);
-                if ($envValue !== false) {
-                    $envVars[$key] = $envValue;
-                }
-            }
-        }
-        // Also check $_SERVER for variables that might not be in $_ENV
-        foreach ($_SERVER as $key => $value) {
-            if (is_string($key) && str_starts_with($key, 'PDODB_') && !isset($envVars[$key])) {
-                $envValue = getenv($key);
-                if ($envValue !== false) {
-                    $envVars[$key] = $envValue;
-                }
+        $dbEnvVars = [
+            'PDODB_DRIVER',
+            'PDODB_HOST',
+            'PDODB_PORT',
+            'PDODB_DATABASE',
+            'PDODB_DB', // Alternative name
+            'PDODB_USERNAME',
+            'PDODB_USER', // Alternative name
+            'PDODB_PASSWORD',
+            'PDODB_CHARSET',
+            'PDODB_PREFIX',
+            'PDODB_SERVICE_NAME',
+            'PDODB_SID',
+            'PDODB_PATH', // For SQLite
+        ];
+
+        $envVars = [];
+        foreach ($dbEnvVars as $key) {
+            $envValue = getenv($key);
+            if ($envValue !== false) {
+                $envVars[$key] = $envValue;
             }
         }
 

tests/shared/InitCommandCliTests.php

@@ -34,6 +34,8 @@ protected function tearDown(): void
         putenv('PDODB_NON_INTERACTIVE');
         putenv('PDODB_DRIVER');
         putenv('PDODB_PATH');
+        putenv('PDODB_CHARSET');
+        unset($_ENV['PDODB_CHARSET']);
         if (is_dir($this->tempDir)) {
             $this->removeDirectory($this->tempDir);
         }