patch

AnourValar · Jan 12, 2023 · 25418be · 25418be
1 parent 94e71c0
commit 25418be
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/src/ValidatorHelper.php b/src/ValidatorHelper.php
@@ -65,20 +65,9 @@ public function mutateArray(
             foreach ($value as $key => $item) {
                 $path = array_merge($parentKeys, [$key]);
 
-                if ($parentKeys && ( (is_string($item) && trim($item) === '') || $item === [] )) {
-                    foreach ((array) $nullable as $nullableKey) {
-                        if (! $this->isMatching($nullableKey, $path)) {
-                            continue;
-                        }
-
-                        $item = null;
-                        $value[$key] = $item;
-                        break;
-                    }
-                }
-
                 if (is_array($item)) {
-                    $value[$key] = $this->mutateArray($value[$key], $nullable, $purges, $types, $sorts, $lists, $path);
+                    $item = $this->mutateArray($value[$key], $nullable, $purges, $types, $sorts, $lists, $path);
+                    $value[$key] = $item;
 
                     foreach ((array) $sorts as $sortKey) {
                         if (! $this->isMatching($sortKey, $path)) {
@@ -97,7 +86,21 @@ public function mutateArray(
                         $value[$key] = array_values($value[$key]);
                         break;
                     }
-                } else {
+                }
+
+                if ($parentKeys && ( (is_string($item) && trim($item) === '') || $item === [] )) {
+                    foreach ((array) $nullable as $nullableKey) {
+                        if (! $this->isMatching($nullableKey, $path)) {
+                            continue;
+                        }
+
+                        $item = null;
+                        $value[$key] = $item;
+                        break;
+                    }
+                }
+
+                if (! is_array($item)) {
                     if ($parentKeys && is_null($item)) {
                         foreach ((array) $purges as $purgeKey) {
                             if (! $this->isMatching($purgeKey, $path)) {