1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
From: kylekatarnls <kylekatarnls@gmail.com>
Date: Fri, 4 Apr 2025 19:51:20 +0200
Subject: Fix overflow issue for is-month
Backported from 3.x.
Origin: https://github.com/briannesbitt/Carbon/commit/1887f86e3be1a936513376f6663227bfe8061a5a
---
src/Carbon/Traits/Comparison.php | 2 +-
tests/Carbon/IsTest.php | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/Carbon/Traits/Comparison.php b/src/Carbon/Traits/Comparison.php
index daee19c..f8e1e78 100644
--- a/src/Carbon/Traits/Comparison.php
+++ b/src/Carbon/Traits/Comparison.php
@@ -995,7 +995,7 @@ trait Comparison
}
if (preg_match('/^(?:Jan|January|Feb|February|Mar|March|Apr|April|May|Jun|June|Jul|July|Aug|August|Sep|September|Oct|October|Nov|November|Dec|December)$/i', $tester)) {
- return $this->isSameMonth(static::parse($tester), false);
+ return $this->isSameMonth(static::parse("$tester 1st"), false);
}
if (preg_match('/^\d{3,}-\d{1,2}$/', $tester)) {
diff --git a/tests/Carbon/IsTest.php b/tests/Carbon/IsTest.php
index 057a455..0a46e7d 100644
--- a/tests/Carbon/IsTest.php
+++ b/tests/Carbon/IsTest.php
@@ -19,6 +19,7 @@ use DateTime;
use Generator;
use InvalidArgumentException;
use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\TestWith;
use stdClass;
use Tests\AbstractTestCase;
@@ -1017,8 +1018,12 @@ class IsTest extends AbstractTestCase
$date->isCurrentFoobar();
}
- public function testIs()
+ #[TestWith([null])]
+ #[TestWith(['2025-03-31 12:00'])]
+ public function testIs(?string $testNow)
{
+ Carbon::setTestNow($testNow);
+
$this->assertTrue(Carbon::parse('2019-06-02 12:23:45')->is('2019'));
$this->assertFalse(Carbon::parse('2019-06-02 12:23:45')->is('2018'));
$this->assertTrue(Carbon::parse('2019-06-02 12:23:45')->is('2019-06'));
@@ -1048,6 +1053,8 @@ class IsTest extends AbstractTestCase
$this->assertTrue(Carbon::parse('2019-06-02 15:23:45')->is('3pm'));
$this->assertFalse(Carbon::parse('2019-06-02 15:23:45')->is('4pm'));
$this->assertFalse(Carbon::parse('2019-06-02 15:23:45')->is('3am'));
+ $this->assertTrue(Carbon::parse('2019-06-02 12:23:45')->is('2019-06'));
+ $this->assertTrue(Carbon::parse('2019-05-31 12:23:45')->is('2019-05'));
$this->assertTrue(Carbon::parse('2019-06-02 12:23:45')->is('2019-06-02 12:23'));
$this->assertFalse(Carbon::parse('2019-06-02 12:23:45')->is('2019-06-03 12:23'));
$this->assertFalse(Carbon::parse('2019-06-02 12:23:45')->is('2019-06-02 15:23'));
|
