fix(file/types): Preserve keys (including numeric-looking ones)

joshtrichards · web-flow · commit 23db62566a9e · 2025-12-08T11:56:05.000-05:00
Replace array_merge with array_replace for definitions

Signed-off-by: Josh &lt;josh.t.richards@gmail.com&gt;
diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
@@ -97,7 +97,7 @@ private function loadCustomDefinitions(string $fileName, array $definitions): ar
 		if (file_exists($this->customConfigDir . '/' . $fileName)) {
 			$custom = json_decode(file_get_contents($this->customConfigDir . '/' . $fileName), true);
 			if (json_last_error() === JSON_ERROR_NONE) {
-				$definitions = array_merge($definitions, $custom);
+				$definitions = array_replace($definitions, $custom);
 			} else {
 				$this->logger->warning('Failed to parse ' . $fileName . ': ' . json_last_error_msg());
 			}

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ private function loadCustomDefinitions(string $fileName, array $definitions): ar`
`97`	`97`	`if (file_exists($this->customConfigDir . '/' . $fileName)) {`
`98`	`98`	`$custom = json_decode(file_get_contents($this->customConfigDir . '/' . $fileName), true);`
`99`	`99`	`if (json_last_error() === JSON_ERROR_NONE) {`
`100`		`- $definitions = array_merge($definitions, $custom);`
	`100`	`+ $definitions = array_replace($definitions, $custom);`
`101`	`101`	`} else {`
`102`	`102`	`$this->logger->warning('Failed to parse ' . $fileName . ': ' . json_last_error_msg());`
`103`	`103`	`}`