Structure::merge() refactoring

nette · Oct 5, 2024 · aa6726d · aa6726d
1 parent f4402f7
commit aa6726d
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/Schema/Elements/Structure.php b/src/Schema/Elements/Structure.php
@@ -144,20 +144,17 @@ public function merge(mixed $value, mixed $base): mixed
 				if ($key === $index) {
 					$base[] = $val;
 					$index++;
-				} elseif (array_key_exists($key, $base)) {
-					$itemSchema = $this->items[$key] ?? $this->otherItems;
-					$base[$key] = $itemSchema
-						? $itemSchema->merge($val, $base[$key])
-						: Helpers::merge($val, $base[$key]);
 				} else {
-					$base[$key] = $val;
+					$base[$key] = array_key_exists($key, $base) && ($itemSchema = $this->items[$key] ?? $this->otherItems)
+						? $itemSchema->merge($val, $base[$key])
+						: $val;
 				}
 			}
 
 			return $base;
 		}
 
-		return Helpers::merge($value, $base);
+		return $value ?? $base;
 	}