Only Carbon v3 now

Author: edalzell

src/Modifiers/IsEndOfWeek.php

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

src/Modifiers/IsStartOfWeek.php

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

src/ServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace TransformStudios\Events;
 
+use Carbon\Carbon;
 use Carbon\CarbonImmutable;
-use Composer\InstalledVersions;
 use Illuminate\Support\Facades\Artisan;
 use Statamic\Entries\Entry;
 use Statamic\Facades\Collection;
@@ -30,27 +30,9 @@ public function bootAddon()
 
     private function bootCarbon(): self
     {
+        Carbon::setLocale(Site::current()->locale());
         CarbonImmutable::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.
-
-         When the next version of Carbon is released, it should be set properly: https://github.com/briannesbitt/Carbon/issues/2539#issuecomment-1037257768
-
-        */
-
-        if (is_string($weekStartDay = CarbonImmutable::getTranslator()->trans(id: 'first_day_of_week', locale: Site::current()->locale()))) {
-            $weekStartDay = 0;
-        }
-
-        CarbonImmutable::setWeekStartsAt(day: $weekStartDay);
-        CarbonImmutable::setWeekEndsAt(day: ($weekStartDay + 6) % 7);
-
         return $this;
     }