Merge pull request #50 from hughgrigg/feature/carbon-2

Allow Carbon ^2.0

composer.json

@@ -5,7 +5,7 @@
     "type": "library",
     "require": {
         "php": "^7.0",
-        "nesbot/carbon": "^1.25"
+        "nesbot/carbon": "^1.2 || ^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.5 || ^7.4",

src/BusinessTime.php

@@ -429,7 +429,7 @@ public function endOfBusinessDay(): self
      *
      * @return BusinessTime
      */
-    public function floor(DateInterval $precision = null): self
+    public function floorToPrecision(DateInterval $precision = null): self
     {
         $precisionSeconds = Interval::instance($precision ?: $this->precision())
                                     ->inSeconds();
@@ -459,7 +459,7 @@ public function floor(DateInterval $precision = null): self
      *
      * @return BusinessTime
      */
-    public function round(DateInterval $precision = null): self
+    public function roundToPrecision(DateInterval $precision = null): self
     {
         $precisionSeconds = Interval::instance($precision ?: $this->precision())
                                     ->inSeconds();
@@ -492,7 +492,7 @@ public function round(DateInterval $precision = null): self
      *
      * @return BusinessTime
      */
-    public function ceil(DateInterval $precision = null): self
+    public function ceilToPrecision(DateInterval $precision = null): self
     {
         $seconds = Interval::instance($precision ?: $this->precision())
                            ->inSeconds();

src/Deadline/RecurringDeadline.php

@@ -53,7 +53,7 @@ public function nextOccurrenceFrom(BusinessTime $time): BusinessTime
             $time = $time->add($time->precision());
         }
 
-        return $time->floor();
+        return $time->floorToPrecision();
     }
 
     /**
@@ -81,7 +81,7 @@ public function previousOccurrenceFrom(BusinessTime $time): BusinessTime
             $time = $time->sub($time->precision());
         }
 
-        return $time->floor();
+        return $time->floorToPrecision();
     }
 
     /**
@@ -125,7 +125,7 @@ public function firstTimePassedBetween(
         $time = $start->copy();
         while ($time->lte($end)) {
             if ($this->isDeadline($time)) {
-                return $time->floor();
+                return $time->floorToPrecision();
             }
             $time = $time->add($time->precision());
         }

src/Interval.php

@@ -68,13 +68,24 @@ public function asMultipleOf(DateInterval $interval): float
      * intervals is to use whichever arbitrary units they are specified in,
      * leading to e.g. "480 minutes" instead of "8 hours".
      *
+     * @param bool $syntax
      * @param bool $short
+     * @param int  $parts
+     * @param null $options
+     *
+     * @throws \Exception
      *
      * @return string
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function forHumans($short = false): string
-    {
-        return (new Carbon())->add($this)->diffForHumans(null, true, $short, 2);
+    public function forHumans(
+        $syntax = true,
+        $short = false,
+        $parts = 2,
+        $options = null
+    ): string {
+        return (new Carbon())->add($this)->diffForHumans(null, $syntax, $short, $parts);
     }
 
     /**

tests/Unit/BusinessTime/RoundTest.php

@@ -36,7 +36,7 @@ public function testFloor(
         $businessTime = new BusinessTime($time);
 
         // When we floor it to a precision interval.
-        $floored = $businessTime->floor($precision);
+        $floored = $businessTime->floorToPrecision($precision);
 
         // Then we should get the expected floored time.
         self::assertSame(
@@ -95,7 +95,7 @@ public function testRound(
         $businessTime = new BusinessTime($time);
 
         // When we round it to a precision interval.
-        $rounded = $businessTime->round($precision);
+        $rounded = $businessTime->roundToPrecision($precision);
 
         // Then we should get the expected rounded time.
         self::assertSame(
@@ -154,7 +154,7 @@ public function testCeil(
         $businessTime = new BusinessTime($time);
 
         // When we ceil it to a precision interval.
-        $ceil = $businessTime->ceil($precision);
+        $ceil = $businessTime->ceilToPrecision($precision);
 
         // Then we should get the expected ceil-ed time.
         self::assertSame(

tests/Unit/BusinessTime/TimeZoneTest.php

@@ -39,7 +39,7 @@ public function testFloorToHourInTimezone(string $timezone)
         $businessTime = $businessTime->setTimezone($timezone);
 
         // When we floor it to the nearest hour.
-        $floored = $businessTime->floor(Interval::hour());
+        $floored = $businessTime->floorToPrecision(Interval::hour());
 
         // Then we should get the expected floored time.
         self::assertSame(
@@ -73,7 +73,7 @@ public function testRoundDownToHourInTimezone(string $timezone)
         $businessTime = $businessTime->setTimezone($timezone);
 
         // When we round it to the nearest hour.
-        $floored = $businessTime->round(Interval::hour());
+        $floored = $businessTime->roundToPrecision(Interval::hour());
 
         // Then we should get the expected rounded time.
         self::assertSame(
@@ -107,7 +107,7 @@ public function testRoundUpToHourInTimezone(string $timezone)
         $businessTime = $businessTime->setTimezone($timezone);
 
         // When we round it to the nearest hour.
-        $floored = $businessTime->round(Interval::hour());
+        $floored = $businessTime->roundToPrecision(Interval::hour());
 
         // Then we should get the expected rounded time.
         self::assertSame(
@@ -141,7 +141,7 @@ public function testCeilDownToHourInTimezone(string $timezone)
         $businessTime = $businessTime->setTimezone($timezone);
 
         // When we ceil it to the nearest hour.
-        $floored = $businessTime->ceil(Interval::hour());
+        $floored = $businessTime->ceilToPrecision(Interval::hour());
 
         // Then we should get the expected rounded time.
         self::assertSame(