Fix #58

Author: RobiNN1

src/Config.php

@@ -99,14 +99,19 @@ private static function envVarToArray(array &$array, string $var, string $value)
         $var = substr($var, 4);
         $keys = array_map(strtolower(...), explode('_', $var));
 
+        $current = &$array;
+
         foreach ($keys as $i => $key) {
             if (count($keys) === 1) {
                 break;
             }
 
-            unset($keys[$i]);
-
-            $array = &$array[$key];
+            if (isset($current[$key]) && is_array($current[$key])) {
+                $current = &$current[$key];
+                unset($keys[$i]);
+            } else {
+                break;
+            }
         }
 
         if (json_validate($value)) {
@@ -117,7 +122,7 @@ private static function envVarToArray(array &$array, string $var, string $value)
             }
         }
 
-        $array[array_shift($keys)] = $value;
+        $current[implode('_', $keys)] = $value;
     }
 
     /**

tests/ConfigTest.php

@@ -59,4 +59,28 @@ public function testEnvOverride(): void {
 
         $this->assertSame('d. m. Y', Config::get('timeformat', ''));
     }
+
+    public function testEnvNested(): void {
+        putenv('PCA_REDIS_0_HOST=127.0.0.1');
+        putenv('PCA_REDIS_0_PORT=6379');
+
+        $redis_config = Config::get('redis', []);
+
+        $this->assertSame('127.0.0.1', $redis_config[0]['host'] ?? null);
+        $this->assertSame(6379, $redis_config[0]['port'] ?? null);
+    }
+
+    public function testEnvCollisionWithScalar(): void {
+        putenv('PCA_TIMEFORMAT=d. m. Y H:i:s');
+        putenv('PCA_TIMEFORMAT_EXTRA=test');
+
+        $this->assertSame('d. m. Y H:i:s', Config::get('timeformat', ''));
+        $this->assertSame('test', Config::get('timeformat_extra'));
+    }
+
+    public function testEnvSnakeCase(): void {
+        putenv('PCA_SOME_SNAKE_CASE_KEY=value');
+
+        $this->assertSame('value', Config::get('some_snake_case_key'));
+    }
 }