Convert to array only redis and memcached env vars, fix #59

Author: RobiNN1

src/Config.php

@@ -96,23 +96,7 @@ private static function getEnvConfig(array $config): array {
      * @param array<string, mixed> $array
      */
     private static function envVarToArray(array &$array, string $var, string $value): void {
-        $var = substr($var, 4);
-        $keys = array_map(strtolower(...), explode('_', $var));
-
-        $current = &$array;
-
-        foreach ($keys as $i => $key) {
-            if (count($keys) === 1) {
-                break;
-            }
-
-            if (isset($current[$key]) && is_array($current[$key])) {
-                $current = &$current[$key];
-                unset($keys[$i]);
-            } else {
-                break;
-            }
-        }
+        $lower_var = strtolower(substr($var, 4));
 
         if (json_validate($value)) {
             try {
@@ -122,7 +106,25 @@ private static function envVarToArray(array &$array, string $var, string $value)
             }
         }
 
-        $current[implode('_', $keys)] = $value;
+        // Redis and Memcached variables: PCA_REDIS_1_HOST $config['redis'][1]['host']
+        if (str_starts_with($lower_var, 'redis') || str_starts_with($lower_var, 'memcached')) {
+            $keys = explode('_', $lower_var);
+            $final_key = array_pop($keys);
+
+            $current = &$array;
+
+            foreach ($keys as $key) {
+                if (!isset($current[$key]) || !is_array($current[$key])) {
+                    $current[$key] = [];
+                }
+                $current = &$current[$key];
+            }
+
+            $current[$final_key] = $value;
+        } else {
+            // All other variables: PCA_AUTH_PASSWORD $config['auth_password']
+            $array[$lower_var] = $value;
+        }
     }
 
     /**

tests/ConfigTest.php

@@ -63,11 +63,16 @@ public function testEnvOverride(): void {
     public function testEnvNested(): void {
         putenv('PCA_REDIS_0_HOST=127.0.0.1');
         putenv('PCA_REDIS_0_PORT=6379');
+        putenv('PCA_REDIS_2_HOST=localhost');
+        putenv('PCA_REDIS_2_PORT=6380');
 
         $redis_config = Config::get('redis', []);
 
         $this->assertSame('127.0.0.1', $redis_config[0]['host'] ?? null);
         $this->assertSame(6379, $redis_config[0]['port'] ?? null);
+
+        $this->assertSame('localhost', $redis_config[2]['host'] ?? null);
+        $this->assertSame(6380, $redis_config[2]['port'] ?? null);
     }
 
     public function testEnvCollisionWithScalar(): void {