wip

nette · Oct 3, 2023 · c10c712 · c10c712
1 parent 607b3f7
commit c10c712
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 31 deletions.
diff --git a/src/Schema/Elements/AnyOf.php b/src/Schema/Elements/AnyOf.php
@@ -82,9 +82,9 @@ public function complete($value, Context $context)
 	{
 		return (new Nette\Schema\Validators($context))->steps(
 			$value,
-			fn($value) => $this->findAlternative($value, $context),
-			fn($value) => $this->doTransform($value, $context),
-			fn($value) => $this->doAsserts($value, $context) ?? $value,
+			fn(&$value) => $this->findAlternative($value, $context),
+			fn(&$value) => $this->doTransform($value, $context),
+			fn($value) => $this->doAsserts($value, $context),
 		);
 	}
 

diff --git a/src/Schema/Elements/Base.php b/src/Schema/Elements/Base.php
@@ -115,7 +115,7 @@ private function doDeprecation(Context $context): void
 	}
 
 
-	private function doTransform($value, Context $context)
+	private function doTransform(&$value, Context $context): void
 	{
 		if ($this->castTo) {
 			if (Nette\Utils\Reflection::isBuiltinType($this->castTo)) {
@@ -125,11 +125,9 @@ private function doTransform($value, Context $context)
 				foreach ($value as $k => $v) {
 					$object->$k = $v;
 				}
-				return $object;
+				$value = $object;
 			}
 		}
-
-		return $value;
 	}
 
 
@@ -171,7 +169,7 @@ private function doFinalize($value, Context $context)
 	{
 		return (new Nette\Schema\Validators($context))->steps(
 			$value,
-			fn($value) => $this->doTransform($value, $context),
+			fn(&$value) => $this->doTransform($value, $context),
 			fn($value) => $this->doAsserts($value, $context),
 		);
 	}

diff --git a/src/Schema/Elements/Structure.php b/src/Schema/Elements/Structure.php
@@ -156,16 +156,16 @@ public function complete($value, Context $context)
 		$validator = new Nette\Schema\Validators($context);
 		return $validator->steps(
 			$value,
-			fn($value) => $validator->validateType($value, 'array') ?? $value,
-			fn($value) => $validator->validateRange($value, $this->range) ?? $value,
-			fn($value) => $this->validateItems($value, $context),
-			fn($value) => $this->doTransform($value, $context),
-			fn($value) => $this->doAsserts($value, $context) ?? $value,
+			fn() => $validator->validateType($value, 'array'),
+			fn() => $validator->validateRange($value, $this->range),
+			fn(&$value) => $this->validateItems($value, $context),
+			fn(&$value) => $this->doTransform($value, $context),
+			fn($value) => $this->doAsserts($value, $context),
 		);
 	}
 
 
-	private function validateItems(array $value, Context $context)
+	private function validateItems(array &$value, Context $context): void
 	{
 		$items = $this->items;
 		if ($extraKeys = array_keys(array_diff_key($value, $items))) {
@@ -197,8 +197,6 @@ private function validateItems(array $value, Context $context)
 
 			array_pop($context->path);
 		}
-
-		return $value;
 	}
 
 

diff --git a/src/Schema/Elements/Type.php b/src/Schema/Elements/Type.php
@@ -183,18 +183,14 @@ public function complete($value, Context $context)
 		$this->doDeprecation($context);
 
 		$validator = new Nette\Schema\Validators($context);
-		$validator->steps(
+		$value = $validator->steps(
 			$value,
-			fn($value) => $validator->validateType($value, $this->type) ?? $value,
-			fn($value) => $validator->validateRange($value, $this->range, $this->type) ?? $value,
-			fn($value) => $value === null || $this->pattern === null || $validator->validatePattern($value, $this->pattern) ?? $value,
-//			fn() => !$this->itemsValue || $this->validateItems($value, $context),
-			fn($value) => $this->itemsValue ? $this->validateItems($value, $context) : $value,
-			fn($value) => $this->validateItems($value, $context),
-			fn($value) => $merge ? Helpers::merge($value, $this->default) : $value,
-			[$this, 'doTransform'],
-			[$this, 'doAsserts'],
-			fn($value) => $this->doTransform($value, $context),
+			fn() => $validator->validateType($value, $this->type),
+			fn() => $validator->validateRange($value, $this->range, $this->type),
+			fn() => $value === null || $this->pattern === null || $validator->validatePattern($value, $this->pattern),
+			fn(&$value) => $this->validateItems($value, $context),
+			fn(&$value) => $value = $merge ? Helpers::merge($value, $this->default) : $value,
+			fn(&$value) => $this->doTransform($value, $context),
 			fn($value) => $this->doAsserts($value, $context),
 		);
 
@@ -207,8 +203,12 @@ public function complete($value, Context $context)
 	}
 
 
-	private function validateItems($value, Context $context)
+	private function validateItems(&$value, Context $context): void
 	{
+		if (!$this->itemsValue) {
+			return;
+		}
+
 		$res = [];
 		foreach ($value as $key => $val) {
 			$context->path[] = $key;
@@ -219,6 +219,6 @@ private function validateItems($value, Context $context)
 			array_pop($context->path);
 		}
 
-		return $res;
+		$value = $res;
 	}
 }
diff --git a/src/Schema/Validators.php b/src/Schema/Validators.php
@@ -72,7 +72,7 @@ private static function isInRange($value, array $range): bool
 	}
 
 
-	public function validatePattern($value, string $pattern): void
+	public function validatePattern(string $value, string $pattern): void
 	{
 		if (!preg_match("\x01^(?:$pattern)$\x01Du", $value)) {
 			$this->context->addError(
@@ -88,7 +88,7 @@ public function steps($value, callable ...$steps)
 	{
 		$count = count($this->context->errors);
 		foreach ($steps as $step) {
-			$value = $step($value);
+			$step($value);
 			if ($count !== count($this->context->errors)) {
 				return null;
 			}