Structure refactoring [WIP]

nette · Jan 21, 2024 · 881af4b · 881af4b
1 parent aa0232d
commit 881af4b
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/src/Schema/Elements/Structure.php b/src/Schema/Elements/Structure.php
@@ -150,30 +150,31 @@ public function complete(mixed $value, Context $context): mixed
 		$isOk = $context->createChecker();
 		Helpers::validateType($value, 'array', $context);
 		$isOk() && Helpers::validateRange($value, $this->range, $context);
-		$isOk() && $this->validateItems($value, $context);
+		$isOk() && $this->completeItems($value, $context);
 		$isOk() && $value = $this->doTransform($value, $context);
 		return $isOk() ? $value : null;
 	}
 
 
-	private function validateItems(array &$value, Context $context): void
+	private function validateItems(array $value, Context $context): void
 	{
-		$items = $this->items;
-		if ($extraKeys = array_keys(array_diff_key($value, $items))) {
-			if ($this->otherItems) {
-				$items += array_fill_keys($extraKeys, $this->otherItems);
-			} else {
-				$keys = array_map('strval', array_keys($items));
-				foreach ($extraKeys as $key) {
-					$hint = Nette\Utils\Helpers::getSuggestion($keys, (string) $key);
-					$context->addError(
-						'Unexpected item %path%' . ($hint ? ", did you mean '%hint%'?" : '.'),
-						Nette\Schema\Message::UnexpectedItem,
-						['hint' => $hint],
-					)->path[] = $key;
-				}
+		$extraKeys = array_keys(array_diff_key($value, $this->items));
+		if ($extraKeys && !$this->otherItems) {
+			$keys = array_map('strval', array_keys($this->items));
+			foreach ($extraKeys as $key) {
+				$hint = Nette\Utils\Helpers::getSuggestion($keys, (string) $key);
+				$context->addError(
+					'Unexpected item %path%' . ($hint ? ", did you mean '%hint%'?" : '.'),
+					Nette\Schema\Message::UnexpectedItem,
+					['hint' => $hint],
+				)->path[] = $key;
 			}
 		}
+	}
+
+	private function completeItems(array &$value, Context $context): void
+	{
+		$items = $this->items + array_fill_keys(array_keys(array_diff_key($value, $this->items)), $this->otherItems);
 
 		foreach ($items as $itemKey => $itemVal) {
 			$context->path[] = $itemKey;