Structure::merge() without otherItems it merges by overwriting

nette · Oct 6, 2024 · f441aec · f441aec
1 parent d00e944
commit f441aec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Schema/Elements/Structure.php b/src/Schema/Elements/Structure.php
@@ -130,7 +130,7 @@ public function merge(mixed $value, mixed $base): mixed
 		}
 
 		if (is_array($value) && is_array($base)) {
-			$index = 0;
+			$index = $this->otherItems === null ? null : 0;
 			foreach ($value as $key => $val) {
 				if ($key === $index) {
 					$base[] = $val;

diff --git a/tests/Schema/Expect.structure.phpt b/tests/Schema/Expect.structure.phpt
@@ -156,9 +156,15 @@ test('with indexed item', function () {
 		$processor->process($schema, ['key1' => 'newval', 'newval3']),
 	);
 
-	checkValidationErrors(function () use ($processor, $schema) {
-		$processor->processMultiple($schema, [['key1' => 'newval', 'newval3'], ['key2' => 'newval', 'newval4']]);
-	}, ["Unexpected item '1'."]);
+	Assert::equal(
+		(object) [
+			'key1' => 'newval',
+			'key2' => 'newval',
+			'newval4',
+			'arr' => [],
+		],
+		$processor->processMultiple($schema, [['key1' => 'newval', 'newval3'], ['key2' => 'newval', 'newval4']]),
+	);
 });