From 9a130bce320860031a7cda02a6d14f48ebbc288b Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Mon, 6 Jan 2025 22:50:25 +0000
Subject: [PATCH] Config: remove bad assumptions about string root keys these
 could just as easily be integers and the code should still work.

---
 src/utils/Config.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/utils/Config.php b/src/utils/Config.php
index cabc8fe16..dbccc892e 100644
--- a/src/utils/Config.php
+++ b/src/utils/Config.php
@@ -72,7 +72,7 @@ class Config{
 
 	/**
 	 * @var mixed[]
-	 * @phpstan-var array<string, mixed>
+	 * @phpstan-var array<mixed, mixed>
 	 */
 	private array $config = [];
 
@@ -450,7 +450,7 @@ class Config{
 
 	/**
 	 * @return mixed[]
-	 * @phpstan-return list<string>|array<string, mixed>
+	 * @phpstan-return list<mixed>|array<mixed, mixed>
 	 */
 	public function getAll(bool $keys = false) : array{
 		return ($keys ? array_keys($this->config) : $this->config);
@@ -458,7 +458,6 @@ class Config{
 
 	/**
 	 * @param mixed[] $defaults
-	 * @phpstan-param array<string, mixed> $defaults
 	 */
 	public function setDefaults(array $defaults) : void{
 		$this->fillDefaults($defaults, $this->config);
@@ -467,13 +466,11 @@ class Config{
 	/**
 	 * @param mixed[] $default
 	 * @param mixed[] $data    reference parameter
-	 * @phpstan-param array<string, mixed> $default
-	 * @phpstan-param array<string, mixed> $data
-	 * @phpstan-param-out array<string, mixed> $data
+	 * @phpstan-param-out array<mixed, mixed> $data
 	 */
 	private function fillDefaults(array $default, array &$data) : int{
 		$changed = 0;
-		foreach(Utils::stringifyKeys($default) as $k => $v){
+		foreach(Utils::promoteKeys($default) as $k => $v){
 			if(is_array($v)){
 				if(!isset($data[$k]) || !is_array($data[$k])){
 					$data[$k] = [];
@@ -560,7 +557,7 @@ class Config{
 						};
 						break;
 				}
-				$result[(string) $k] = $v;
+				$result[$k] = $v;
 			}
 		}