Fix #2229 infinite loop in ceiling intervals in forHumans()

briannesbitt · Oct 22, 2020 · 61b2c44 · 61b2c44
1 parent 6571aec
commit 61b2c44
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Carbon/CarbonInterval.php b/src/Carbon/CarbonInterval.php
@@ -1541,13 +1541,19 @@ public function forHumans($syntax = null, $short = false, $parts = -1, $options
 
         $intervalValues = $this;
         $method = static::getRoundingMethodFromOptions($options);
+        $previousCount = INF;
 
         if ($method) {
             while (
                 \count($intervalValues->getNonZeroValues()) > $parts &&
                 ($count = \count($keys = array_keys($intervalValues->getValuesSequence()))) > 1
             ) {
-                $intervalValues = $this->copy()->roundUnit($keys[$count - 2], 1, $method);
+                $intervalValues = $this->copy()->roundUnit(
+                    $keys[min($count, $previousCount - 1) - 2],
+                    1,
+                    $method
+                );
+                $previousCount = $count;
             }
         }
 

diff --git a/tests/CarbonInterval/ForHumansTest.php b/tests/CarbonInterval/ForHumansTest.php
@@ -11,6 +11,7 @@
  */
 namespace Tests\CarbonInterval;
 
+use Carbon\Carbon;
 use Carbon\CarbonInterface;
 use Carbon\CarbonInterval;
 use Symfony\Component\Translation\Loader\ArrayLoader;
@@ -362,6 +363,18 @@ public function testRoundCarryOverDoesntMatter()
 
         $interval = CarbonInterval::days(2)->minutes(59)->seconds(62);
         $this->assertEquals('2 days 59 minutes', $interval->forHumans(['parts' => 2]));
+
+        $start = Carbon::create(2009, 9)->startOfMonth();
+        $end = Carbon::create(2012, 2)->endOfMonth();
+
+        $interval = CarbonInterval::instance($start->diff($end))->forHumans(
+            Carbon::DIFF_ABSOLUTE,
+            false,
+            2,
+            Carbon::CEIL
+        );
+
+        $this->assertEquals('2 years 6 months', $interval);
     }
 
     public function testGetValuesSequence()