Allow null dates in hasFormat()

briannesbitt · Oct 10, 2020 · d156866 · d156866
1 parent 91d8d8d
commit d156866
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/Carbon/Traits/Comparison.php b/src/Carbon/Traits/Comparison.php
@@ -862,7 +862,7 @@ public static function hasFormat($date, $format)
         // E.g. "1975-5-1" (Y-n-j) will still be parsed correctly when "Y-m-d" is supplied as the format.
         // To ensure we're really testing against our desired format, perform an additional regex validation.
 
-        return self::matchFormatPattern($date, preg_quote($format, '/'), static::$regexFormats);
+        return self::matchFormatPattern((string) $date, preg_quote((string) $format, '/'), static::$regexFormats);
     }
 
     /**
@@ -879,9 +879,9 @@ public static function hasFormat($date, $format)
      *
      * @return bool
      */
-    public static function hasFormatWithModifiers(string $date, string $format): bool
+    public static function hasFormatWithModifiers($date, $format): bool
     {
-        return self::matchFormatPattern($date, $format, array_merge(static::$regexFormats, static::$regexFormatModifiers));
+        return self::matchFormatPattern((string) $date, (string) $format, array_merge(static::$regexFormats, static::$regexFormatModifiers));
     }
 
     /**

diff --git a/tests/Carbon/IsTest.php b/tests/Carbon/IsTest.php
@@ -888,6 +888,7 @@ public function testHasFormat()
         }
 
         // Format failure
+        $this->assertFalse(Carbon::hasFormat(null, 'd m Y'));
         $this->assertFalse(Carbon::hasFormat('1975-05-01', 'd m Y'));
         $this->assertFalse(Carbon::hasFormat('1975-01-30\\', '\\Y-m-d\\\\'));
         $this->assertFalse(Carbon::hasFormat('Foo 21st', 'D jS'));

diff --git a/tests/CarbonImmutable/CreateFromFormatTest.php b/tests/CarbonImmutable/CreateFromFormatTest.php
@@ -112,4 +112,11 @@ public function testCreateFromFormatResetLastErrors()
         $carbon = Carbon::createFromFormat('d/m/Y', '11/03/2016');
         $this->assertSame($this->noErrors, $carbon->getLastErrors());
     }
+
+    public function testCreateFromFormatWithDollar()
+    {
+        $d = Carbon::createFromFormat('$c', '$1975-05-21T22:32:11+01:00');
+        $this->assertCarbon($d, 1975, 5, 21, 22, 32, 11);
+        $this->assertInstanceOfCarbon($d);
+    }
 }
diff --git a/tests/CarbonImmutable/IsTest.php b/tests/CarbonImmutable/IsTest.php
@@ -900,6 +900,7 @@ public function testHasFormat()
         }
 
         // Format failure
+        $this->assertFalse(Carbon::hasFormat(null, 'd m Y'));
         $this->assertFalse(Carbon::hasFormat('1975-05-01', 'd m Y'));
         $this->assertFalse(Carbon::hasFormat('Foo 21st', 'D jS'));
         $this->assertFalse(Carbon::hasFormat('Sun 51st', 'D jS'));