ArrayOfRule, ListOfRule: pass values with keys included to phase 2 (p…

…reviously keys were stripped)
orisai · Jan 19, 2025 · 10651d9 · 10651d9
1 parent b003277
commit 10651d9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 	- 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
+	- pass values with keys included to phase 2 (previously keys were stripped)
 - `FieldContext`, `MappedObjectContext`
 	- initializes `Type` lazily (performance optimization)
 - `ArrayShapeType`

diff --git a/src/Rules/ArrayOfRule.php b/src/Rules/ArrayOfRule.php
@@ -14,7 +14,6 @@
 use Orisai\ObjectMapper\Processing\Value;
 use Orisai\ObjectMapper\Types\GenericArrayType;
 use Orisai\Utils\Arrays\ArrayMerger;
-use function array_values;
 use function count;
 use function get_debug_type;
 use function is_array;
@@ -169,7 +168,7 @@ public function processValue($value, Args $args, FieldContext $context): array
 		}
 
 		if ($phasedRule) {
-			$itemRule->processValuePhase2(array_values($value), $args, $context->createClone());
+			$itemRule->processValuePhase2($value, $args, $context->createClone());
 
 			foreach ($value as $key => $item) {
 				try {

diff --git a/src/Rules/ListOfRule.php b/src/Rules/ListOfRule.php
@@ -14,7 +14,6 @@
 use Orisai\ObjectMapper\Types\GenericArrayType;
 use Orisai\ObjectMapper\Types\SimpleValueType;
 use Orisai\Utils\Arrays\ArrayMerger;
-use function array_values;
 use function count;
 use function is_array;
 use function is_int;
@@ -140,7 +139,7 @@ public function processValue($value, Args $args, FieldContext $context): array
 		}
 
 		if ($phasedRule) {
-			$itemRule->processValuePhase2(array_values($value), $args, $context->createClone());
+			$itemRule->processValuePhase2($value, $args, $context->createClone());
 
 			foreach ($value as $key => $item) {
 				try {

diff --git a/src/Rules/PhasedRule.php b/src/Rules/PhasedRule.php
@@ -24,7 +24,7 @@ interface PhasedRule extends Rule
 	public function processValuePhase1($value, Args $args, FieldContext $context);
 
 	/**
-	 * @param list<mixed> $values
+	 * @param array<int|string, mixed> $values
 	 * @param T_ARGS      $args
 	 */
 	public function processValuePhase2(array $values, Args $args, FieldContext $context): void;

diff --git a/tests/Unit/Rules/ArrayOfRuleTest.php b/tests/Unit/Rules/ArrayOfRuleTest.php
@@ -166,7 +166,7 @@ public function testProcessMultiStepCallOrderWithErrors(): void
 		$rule = new PhasedTestRule();
 		$this->ruleManager->addRule($rule);
 
-		$value = [$rule::Fail1, 'string' => $rule::Fail3, 'baz', 123];
+		$value = [0 => $rule::Fail1, 'string' => $rule::Fail3, 1 => 'baz', 2 => 123];
 		$exception = null;
 
 		try {
@@ -216,7 +216,7 @@ public function testProcessMultiStepCallOrderWithErrors(): void
 				],
 				[
 					'phase' => 2,
-					'value' => [$rule::Fail3, 'baz', 123],
+					'value' => ['string' => $rule::Fail3, 1 => 'baz', 2 => 123],
 				],
 				[
 					'phase' => 3,

diff --git a/tests/Unit/Rules/ListOfRuleTest.php b/tests/Unit/Rules/ListOfRuleTest.php
@@ -207,7 +207,7 @@ public function testProcessMultiStepCallOrderWithErrors(): void
 				],
 				[
 					'phase' => 2,
-					'value' => [$rule::Fail3, 'baz', 123],
+					'value' => [42 => $rule::Fail3, 'baz', 123],
 				],
 				[
 					'phase' => 3,