Use finest overflow detection

briannesbitt · Feb 11, 2021 · b65deb7 · b65deb7
1 parent e2ba317
commit b65deb7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/Carbon/Traits/Rounding.php b/src/Carbon/Traits/Rounding.php
@@ -56,6 +56,7 @@ public function roundUnit($unit, $precision = 1, $function = 'round')
             'microsecond' => [0, 999999],
         ]);
         $factor = 1;
+        $initialMonth = $this->month;
 
         if ($normalizedUnit === 'week') {
             $normalizedUnit = 'day';
@@ -115,7 +116,7 @@ public function roundUnit($unit, $precision = 1, $function = 'round')
             $result = $result->$unit($value);
         }
 
-        return $normalizedUnit === 'month'
+        return $normalizedUnit === 'month' && $precision <= 1 && abs($result->month - $initialMonth) === 2
             // Re-run the change in case an overflow occurred
             ? $result->$normalizedUnit($normalizedValue)
             : $result;

diff --git a/tests/Carbon/RoundTest.php b/tests/Carbon/RoundTest.php
@@ -156,9 +156,11 @@ public function testRoundWeek()
         Carbon::setWeekEndsAt(Carbon::SUNDAY);
     }
 
-    public function testRoundMonth()
+    public function testCeilMonth()
     {
         $this->assertCarbon(Carbon::parse('2021-01-29')->ceilMonth(), 2021, 2, 1, 0, 0, 0);
+        $this->assertCarbon(Carbon::parse('2021-01-31')->ceilMonth(), 2021, 2, 1, 0, 0, 0);
+        $this->assertCarbon(Carbon::parse('2021-12-17')->ceilMonth(), 2022, 1, 1, 0, 0, 0);
     }
 
     public function testRoundInvalidArgument()

diff --git a/tests/CarbonImmutable/RoundTest.php b/tests/CarbonImmutable/RoundTest.php
@@ -123,9 +123,11 @@ public function testRoundWeek()
         Carbon::setWeekEndsAt(Carbon::SUNDAY);
     }
 
-    public function testRoundMonth()
+    public function testCeilMonth()
     {
         $this->assertCarbon(Carbon::parse('2021-01-29')->ceilMonth(), 2021, 2, 1, 0, 0, 0);
+        $this->assertCarbon(Carbon::parse('2021-01-31')->ceilMonth(), 2021, 2, 1, 0, 0, 0);
+        $this->assertCarbon(Carbon::parse('2021-12-17')->ceilMonth(), 2022, 1, 1, 0, 0, 0);
     }
 
     public function testRoundInvalidArgument()