Fix validating present and nullable (#18173)

laravel · Mar 1, 2017 · 3e8e085 · 3e8e085
1 parent e09b9eb
commit 3e8e085
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -480,7 +480,7 @@ protected function isNotNullIfMarkedAsNullable($attribute, $value)
             return true;
         }
 
-        return ! is_null($value);
+        return ! is_null(Arr::get($this->data, $attribute, 0));
     }
 
     /**

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -549,6 +549,12 @@ public function testValidatePresent()
         $v = new Validator($trans, [], ['name' => 'present']);
         $this->assertFalse($v->passes());
 
+        $v = new Validator($trans, [], ['name' => 'present|nullable']);
+        $this->assertFalse($v->passes());
+
+        $v = new Validator($trans, ['name' => null], ['name' => 'present|nullable']);
+        $this->assertTrue($v->passes());
+
         $v = new Validator($trans, ['name' => ''], ['name' => 'present']);
         $this->assertTrue($v->passes());
-Original file line number
+Diff line change
@@ Expand Up @@
                 return true;
             }
-            return ! is_null($value);
+            return ! is_null(Arr::get($this->data, $attribute, 0));
         }
         /**
@@ Expand Down @@