[10.x] fix Validator::validated get nullable array (#50056)

* fix Validator::validated get nullable array * Update Validator.php --------- Co-authored-by: Taylor Otwell <[email protected]>
laravel · Feb 12, 2024 · 52305ed · 52305ed
1 parent 7ff37c6
commit 52305ed
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -584,14 +584,15 @@ public function validated()
         $missingValue = new stdClass;
 
         foreach ($this->getRules() as $key => $rules) {
+            $value = data_get($this->getData(), $key, $missingValue);
+
             if ($this->excludeUnvalidatedArrayKeys &&
                 in_array('array', $rules) &&
+                $value !== null &&
                 ! empty(preg_grep('/^'.preg_quote($key, '/').'\.+/', array_keys($this->getRules())))) {
                 continue;
             }
 
-            $value = data_get($this->getData(), $key, $missingValue);
-
             if ($value !== $missingValue) {
                 Arr::set($results, $key, $value);
             }

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -293,6 +293,28 @@ public function testNullable()
         $this->assertSame('validation.boolean', $v->messages()->get('b')[0]);
     }
 
+    public function testArrayNullableWithUnvalidatedArrayKeys()
+    {
+        $trans = $this->getIlluminateArrayTranslator();
+
+        $v = new Validator($trans, [
+            'x' => null,
+        ], [
+            'x' => 'array|nullable',
+            'x.key' => 'string',
+        ]);
+        $this->assertTrue($v->passes());
+        $this->assertArrayHasKey('x', $v->validated());
+
+        $v = new Validator($trans, [
+            'x' => null,
+        ], [
+            'x' => 'array',
+            'x.key' => 'string',
+        ]);
+        $this->assertFalse($v->passes());
+    }
+
     public function testNullableMakesNoDifferenceIfImplicitRuleExists()
     {
         $trans = $this->getIlluminateArrayTranslator();