Merge pull request #8425 from grimpirate/grimpirate-patch-1

fix: [Validation] DotArrayFilter returns incorrect array when numeric index array is passed

Author: kenjis

system/Validation/DotArrayFilter.php

@@ -44,7 +44,7 @@ public static function run(array $indexes, array $array): array
                 $segments
             );
 
-            $result = array_merge_recursive($result, self::filter($segments, $array));
+            $result = array_replace_recursive($result, self::filter($segments, $array));
         }
 
         return $result;

tests/system/Validation/DotArrayFilterTest.php

@@ -180,4 +180,19 @@ public function testRunNestedArray()
         ];
         $this->assertSame($expected, $result);
     }
+
+    public function testRunReturnOrderedIndices()
+    {
+        $data = [
+            'foo' => [
+                2 => 'bar',
+                0 => 'baz',
+                1 => 'biz',
+            ],
+        ];
+
+        $result = DotArrayFilter::run(['foo.2', 'foo.0', 'foo.1'], $data);
+
+        $this->assertSame($data, $result);
+    }
 }