Merge pull request #3103 from briannesbitt/fix/issue-3102-setUnitNoOv…

…erflow-immutable Fix immutable return for setUnitNoOverflow
briannesbitt · Nov 7, 2024 · e1268cd · e1268cd
2 parents d481d8d + 9d1cc38
commit e1268cd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/Carbon/Traits/Date.php b/src/Carbon/Traits/Date.php
@@ -2965,7 +2965,7 @@ private static function floorZeroPad(int|float $value, int $length): string
     private function mutateIfMutable(CarbonInterface $date): CarbonInterface
     {
         return $this instanceof DateTimeImmutable
-            ? $this
+            ? $date
             : $this->modify('@'.$date->rawFormat('U.u'))->setTimezone($date->getTimezone());
     }
 }
diff --git a/tests/Carbon/SettersTest.php b/tests/Carbon/SettersTest.php
@@ -629,6 +629,14 @@ public function testMidDayAtSetter()
         $this->assertSame(12, $d->getMidDayAt());
     }
 
+    public function testSetUnitNoOverflowFebruary()
+    {
+        $d = Carbon::parse('2024-02-29')->setUnitNoOverFlow('day', 31, 'month');
+
+        $this->assertInstanceOf(Carbon::class, $d);
+        $this->assertSame('2024-02-29 23:59:59.999999', $d->format('Y-m-d H:i:s.u'));
+    }
+
     public function testSetUnitNoOverflow()
     {
         $results = [

diff --git a/tests/CarbonImmutable/SettersTest.php b/tests/CarbonImmutable/SettersTest.php
@@ -423,4 +423,12 @@ public function testSetter()
         $d->setMidDayAt(12);
         $this->assertSame(12, $d->getMidDayAt());
     }
+
+    public function testSetUnitNoOverflowFebruary()
+    {
+        $d = Carbon::parse('2024-02-29')->setUnitNoOverFlow('day', 31, 'month');
+
+        $this->assertInstanceOf(Carbon::class, $d);
+        $this->assertSame('2024-02-29 23:59:59.999999', $d->format('Y-m-d H:i:s.u'));
+    }
 }