fix: validation multiple asterisk

Author: ddevsr

system/Validation/DotArrayFilter.php

@@ -21,8 +21,6 @@ final class DotArrayFilter
     /**
      * Creates a new array with only the elements specified in dot array syntax.
      *
-     * This code comes from the dot_array_search() function.
-     *
      * @param array $indexes The dot array syntax pattern to use for filtering.
      * @param array $array   The array to filter.
      *
@@ -33,20 +31,14 @@ public static function run(array $indexes, array $array): array
         $result = [];
 
         foreach ($indexes as $index) {
-            // See https://regex101.com/r/44Ipql/1
-            $segments = preg_split(
-                '/(?<!\\\\)\./',
-                rtrim($index, '* '),
-                0,
-                PREG_SPLIT_NO_EMPTY
-            );
-
-            $segments = array_map(
-                static fn ($key) => str_replace('\.', '.', $key),
-                $segments
-            );
-
-            $result = array_replace_recursive($result, self::filter($segments, $array));
+            $segments = preg_split('/(?<!\\\\)\./', $index, -1, PREG_SPLIT_NO_EMPTY);
+            $segments = array_map(static fn ($key) => str_replace('\.', '.', $key), $segments);
+
+            $filteredArray = self::filter($segments, $array);
+
+            if ($filteredArray !== []) {
+                $result = array_replace_recursive($result, $filteredArray);
+            }
         }
 
         return $result;
@@ -62,53 +54,54 @@ public static function run(array $indexes, array $array): array
      */
     private static function filter(array $indexes, array $array): array
     {
-        // If index is empty, returns empty array.
+        // If there are no indexes left, return an empty array
         if ($indexes === []) {
             return [];
         }
 
-        // Grab the current index.
+        // Get the current index
         $currentIndex = array_shift($indexes);
 
+        // If the current index doesn't exist and is not a wildcard, return an empty array
         if (! isset($array[$currentIndex]) && $currentIndex !== '*') {
             return [];
         }
 
-        // Handle Wildcard (*)
+        // Handle the wildcard '*' at the current level
         if ($currentIndex === '*') {
-            $answer = [];
+            $result = [];
 
+            // Iterate over all keys at this level
             foreach ($array as $key => $value) {
-                if (! is_array($value)) {
-                    continue;
-                }
-
-                $result = self::filter($indexes, $value);
-
-                if ($result !== []) {
-                    $answer[$key] = $result;
+                if ($indexes === []) {
+                    // If no indexes are left, capture the entire value
+                    $result[$key] = $value;
+                } elseif (is_array($value)) {
+                    // If there are still indexes left, continue filtering recursively
+                    $filtered = self::filter($indexes, $value);
+                    if ($filtered !== []) {
+                        $result[$key] = $filtered;
+                    }
                 }
             }
 
-            return $answer;
+            return $result;
         }
 
-        // If this is the last index, make sure to return it now,
-        // and not try to recurse through things.
+        // If this is the last index, return the value
         if ($indexes === []) {
-            return [$currentIndex => $array[$currentIndex]];
+            return [$currentIndex => $array[$currentIndex] ?? []];
         }
 
-        // Do we need to recursively filter this value?
-        if (is_array($array[$currentIndex]) && $array[$currentIndex] !== []) {
-            $result = self::filter($indexes, $array[$currentIndex]);
+        // If the current value is an array, recursively filter it
+        if (is_array($array[$currentIndex])) {
+            $filtered = self::filter($indexes, $array[$currentIndex]);
 
-            if ($result !== []) {
-                return [$currentIndex => $result];
+            if ($filtered !== []) {
+                return [$currentIndex => $filtered];
             }
         }
 
-        // Otherwise, not found.
         return [];
     }
 }

tests/system/Validation/ValidationTest.php

@@ -1826,4 +1826,50 @@ public function testRuleWithAsteriskToMultiDimensionalArray(): void
             $this->validation->getErrors()
         );
     }
+
+    public function testRuleWithMultipleAsterisk(): void
+    {
+        $data = [
+            'id'    => 1,
+            'dates' => [
+                23 => [
+                    45 => 'Its Mee!',
+                ],
+            ],
+            'foo' => [
+                'bar' => [
+                    'data' => [
+                        'name'     => 'John Doe',
+                        'age'      => 29,
+                        'location' => 'Indonesia',
+                    ],
+                ],
+            ],
+        ];
+
+        $this->validation->setRules([
+            'id'        => 'required|numeric',
+            'dates.*.*' => 'required',
+            'foo.*.*.*' => 'required',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+        $this->assertSame([
+            'id'    => 1,
+            'dates' => [
+                23 => [
+                    45 => 'Its Mee!',
+                ],
+            ],
+            'foo' => [
+                'bar' => [
+                    'data' => [
+                        'name'     => 'John Doe',
+                        'age'      => 29,
+                        'location' => 'Indonesia',
+                    ],
+                ],
+            ],
+        ], $this->validation->getValidated());
+    }
 }