ArrayOfRule, ListOfRule: skip 2nd and 3rd validation phase for item r…

…ules that don't require it
orisai · Jan 19, 2025 · 0ed26b3 · 0ed26b3
1 parent 7f92fb1
commit 0ed26b3
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 	- all rules initialize `Type` lazily (performance optimization)
 - `ArrayOfRule`
 	- check during metadata parsing that default value is an array when `mergeDefaults` is enabled
+- `ArrayOfRule`, `ListOfRule`
+	- skip 2nd and 3rd validation phase for item rules that don't require it
 - `FieldContext`, `MappedObjectContext`
 	- initializes `Type` lazily (performance optimization)
 - `ArrayShapeType`

diff --git a/src/Rules/ArrayOfRule.php b/src/Rules/ArrayOfRule.php
@@ -129,6 +129,9 @@ public function processValue($value, Args $args, FieldContext $context): array
 		$itemArgs = $itemMeta->getArgs();
 		if (!$itemRule instanceof MultiValueEfficientRule) {
 			$itemRule = new MultiValueEfficientRuleAdapter($itemRule);
+			$phasedRule = false;
+		} else {
+			$phasedRule = true;
 		}
 
 		$keyMeta = $args->keyRuleMeta;
@@ -165,18 +168,20 @@ public function processValue($value, Args $args, FieldContext $context): array
 			}
 		}
 
-		$itemRule->processValuePhase2(array_values($value), $args, $context->createClone());
+		if ($phasedRule) {
+			$itemRule->processValuePhase2(array_values($value), $args, $context->createClone());
 
-		foreach ($value as $key => $item) {
-			try {
-				$value[$key] = $itemRule->processValuePhase3(
-					$item,
-					$itemArgs,
-					$context->createClone(),
-				);
-			} catch (ValueDoesNotMatch | InvalidData $exception) {
-				$type ??= $this->createType($args, $context);
-				$type->addInvalidValue($key, $exception);
+			foreach ($value as $key => $item) {
+				try {
+					$value[$key] = $itemRule->processValuePhase3(
+						$item,
+						$itemArgs,
+						$context->createClone(),
+					);
+				} catch (ValueDoesNotMatch | InvalidData $exception) {
+					$type ??= $this->createType($args, $context);
+					$type->addInvalidValue($key, $exception);
+				}
 			}
 		}
 

diff --git a/src/Rules/ListOfRule.php b/src/Rules/ListOfRule.php
@@ -102,6 +102,9 @@ public function processValue($value, Args $args, FieldContext $context): array
 		$itemArgs = $itemMeta->getArgs();
 		if (!$itemRule instanceof MultiValueEfficientRule) {
 			$itemRule = new MultiValueEfficientRuleAdapter($itemRule);
+			$phasedRule = false;
+		} else {
+			$phasedRule = true;
 		}
 
 		$lastIntKey = -1; // List starts from 0
@@ -136,18 +139,20 @@ public function processValue($value, Args $args, FieldContext $context): array
 			}
 		}
 
-		$itemRule->processValuePhase2(array_values($value), $args, $context->createClone());
-
-		foreach ($value as $key => $item) {
-			try {
-				$value[$key] = $itemRule->processValuePhase3(
-					$item,
-					$itemArgs,
-					$context->createClone(),
-				);
-			} catch (ValueDoesNotMatch | InvalidData $exception) {
-				$type ??= $this->createType($args, $context);
-				$type->addInvalidValue($key, $exception);
+		if ($phasedRule) {
+			$itemRule->processValuePhase2(array_values($value), $args, $context->createClone());
+
+			foreach ($value as $key => $item) {
+				try {
+					$value[$key] = $itemRule->processValuePhase3(
+						$item,
+						$itemArgs,
+						$context->createClone(),
+					);
+				} catch (ValueDoesNotMatch | InvalidData $exception) {
+					$type ??= $this->createType($args, $context);
+					$type->addInvalidValue($key, $exception);
+				}
 			}
 		}