Merge branch 'main' into 110-including-a-url-description-and-possibly-other-common-ics-fields

Author: edalzell

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v5.6.2 - 2025-04-22
+
+### 🐛 Fixed
+
+- [5.x] Add support for PHP 8.4 & Laravel 12 [@edalzell](https://github.com/edalzell) (#112)
+- Default first day of week to Sunday [@edalzell](https://github.com/edalzell) (#113)
+
 ## v5.6.1 - 2025-03-03
 
 ### 🐛 Fixed

src/ServiceProvider.php

@@ -56,15 +56,18 @@ private function bootCarbon(): self
     {
         Carbon::setLocale(Site::current()->locale());
 
-        $weekStartDay = Carbon::getTranslator()->trans(id: 'first_day_of_week', locale: Site::current()->locale());
-
         /*
          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 = Carbon::getTranslator()->trans(id: 'first_day_of_week', locale: Site::current()->locale()))) {
+            $weekStartDay = 0;
+        }
+
         Carbon::setWeekStartsAt(day: $weekStartDay);
         Carbon::setWeekEndsAt(day: ($weekStartDay + 6) % 7);