fix date_format rule throw ValueError (laravel#46824)

bert-w · Apr 19, 2023 · a3cfd2d · a3cfd2d
1 parent ed75852
commit a3cfd2d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -25,6 +25,7 @@
 use InvalidArgumentException;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use ValueError;
 
 trait ValidatesAttributes
 {
@@ -550,10 +551,14 @@ public function validateDateFormat($attribute, $value, $parameters)
         }
 
         foreach ($parameters as $format) {
-            $date = DateTime::createFromFormat('!'.$format, $value);
+            try {
+                $date = DateTime::createFromFormat('!'.$format, $value);
 
-            if ($date && $date->format($format) == $value) {
-                return true;
+                if ($date && $date->format($format) == $value) {
+                    return true;
+                }
+            } catch (ValueError) {
+                return false;
             }
         }
 

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -4802,6 +4802,9 @@ public function testValidateDateAndFormat()
         $v = new Validator($trans, ['x' => ['Not', 'a', 'date']], ['x' => 'date_format:Y-m-d']);
         $this->assertTrue($v->fails());
 
+        $v = new Validator($trans, ['x' => "Contain null bytes \0"], ['x' => 'date_format:Y-m-d']);
+        $this->assertTrue($v->fails());
+
         // Set current machine date to 31/xx/xxxx
         $v = new Validator($trans, ['x' => '2013-02'], ['x' => 'date_format:Y-m']);
         $this->assertTrue($v->passes());