Handle Carbon v3 (#116)

Author: edalzell

composer.json

@@ -37,7 +37,7 @@
     "require": {
         "php": "^8.2",
         "edalzell/forma": "^2.0 || ^3.0",
-        "nesbot/carbon": "^2.0",
+        "nesbot/carbon": "^2.0 || ^3.0",
         "rlanvin/php-rrule": "^2.3.1",
         "spatie/calendar-links": "^1.0",
         "spatie/icalendar-generator": "^2.3.3",

src/Modifiers/IsEndOfWeek.php

@@ -2,13 +2,21 @@
 
 namespace TransformStudios\Events\Modifiers;
 
+use Carbon\CarbonImmutable;
+use Composer\InstalledVersions;
 use Illuminate\Support\Carbon;
 use Statamic\Modifiers\Modifier;
 
 class IsEndOfWeek extends Modifier
 {
     public function index($value, $params, $context)
     {
-        return Carbon::parse($value)->dayOfWeek == now()->endOfWeek()->dayOfWeek;
+        $date = CarbonImmutable::parse($value);
+
+        if (InstalledVersions::getVersion('nesbot/carbon') >= '3') {
+            $date->isSameDay($date->locale(Carbon::getLocale())->startOfWeek());
+        }
+
+        return $date->dayOfWeek == now()->endOfWeek()->dayOfWeek;
     }
 }

src/Modifiers/IsStartOfWeek.php

@@ -2,13 +2,21 @@
 
 namespace TransformStudios\Events\Modifiers;
 
+use Carbon\CarbonImmutable;
+use Composer\InstalledVersions;
 use Illuminate\Support\Carbon;
 use Statamic\Modifiers\Modifier;
 
 class IsStartOfWeek extends Modifier
 {
     public function index($value, $params, $context)
     {
-        return Carbon::parse($value)->dayOfWeek == now()->startOfWeek()->dayOfWeek;
+        $date = CarbonImmutable::parse($value);
+
+        if (InstalledVersions::getVersion('nesbot/carbon') >= '3') {
+            $date->isSameDay($date->locale(Carbon::getLocale())->startOfWeek());
+        }
+
+        return $date->dayOfWeek == now()->startOfWeek()->dayOfWeek;
     }
 }

src/ServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace TransformStudios\Events;
 
+use Composer\InstalledVersions;
 use Edalzell\Forma\Forma;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Artisan;
@@ -56,6 +57,10 @@ private function bootCarbon(): self
     {
         Carbon::setLocale(Site::current()->locale());
 
+        if (InstalledVersions::getVersion('nesbot/carbon') >= '3') {
+            return $this;
+        }
+
         /*
          Using these deprecated methods because I couldn't figure out another way to
          have the weekstart set based on the current locale.