Merge pull request #44 from ingenerator/fix-date-validation-from-null

Allow date validation to accept null

Author: craig410

CHANGELOG.md

@@ -1,5 +1,10 @@
 ### Unreleased
 
+### v1.17.1 (2022-10-28)
+
+* Fix deprecation warning when passing NULL to date validator by casting 
+  to empty string to maintain current behaviour.
+
 ### v1.17.0 (2022-10-14)
 
 * Support PHP 8.2

src/Validation/StrictDate.php

@@ -131,7 +131,7 @@ public static function iso_date($value)
 
     protected static function is_datetime_format($format, $value)
     {
-        $dt = \DateTimeImmutable::createFromFormat($format, $value);
+        $dt = \DateTimeImmutable::createFromFormat($format, (string) $value);
 
         return ($dt AND ($dt->format($format) === $value));
     }

test/unit/Validation/StrictDateTest.php

@@ -16,6 +16,7 @@ class StrictDateTest extends TestCase
 
     /**
      * @testWith ["", false]
+     *           [null, false]
      *           ["junk", false]
      *           ["01/10/01", false]
      *           ["2016-01-01", false]
@@ -32,6 +33,7 @@ public function test_it_validates_iso_datetime($value, $expect)
 
     /**
      * @testWith ["", false]
+     *           [null, false]
      *           ["junk", false]
      *           ["01/10/01", false]
      *           ["2016-01-45", false]
@@ -107,28 +109,10 @@ public function test_date_compare_funcs_validate_invalid_input($data, $from_fiel
         );
     }
 
-    public function provider_date_after_date()
-    {
-        return [
-            // Invalid inputs all true as they should be caught by other rules
-            // Simple > the first one
-            [
-                ['a' => new \DateTimeImmutable, 'b' => new \DateTimeImmutable('-5 mins')],
-                'a',
-                'b',
-                FALSE
-            ],
-            [
-                ['a' => new \DateTimeImmutable('-5 mins'), 'b' => new \DateTimeImmutable],
-                'a',
-                'b',
-                TRUE
-            ],
-        ];
-    }
-
     /**
      * @testWith ["", "-5 mins", false]
+     *           [null, "", true]
+     *           ["", null, true]
      *           ["-5 mins", "", true]
      */
     public function test_it_validates_date_after_date($from, $to, $expect)
@@ -138,8 +122,8 @@ public function test_it_validates_date_after_date($from, $to, $expect)
             StrictDate::date_after(
                 new \ArrayObject(
                     [
-                        'from' => new \DateTimeImmutable($from),
-                        'to'   => new \DateTimeImmutable($to)
+                        'from' => new \DateTimeImmutable((string) $from),
+                        'to'   => new \DateTimeImmutable((string) $to)
                     ]
                 ),
                 'from',