Merge branch 'main' into refactor/islamic-calendar

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to `holidays` will be documented in this file.
 
+## 1.8.0 - 2024-03-08
+
+### What's Changed
+
+* Adding holidays for Bahrain by @bo3bdo in https://github.com/spatie/holidays/pull/206
+* Add default locale by @Nielsvanpach in https://github.com/spatie/holidays/pull/208
+* Fix: Canada Victoria Day correction in test and calculation by @mercury64 in https://github.com/spatie/holidays/pull/211
+
+### New Contributors
+
+* @bo3bdo made their first contribution in https://github.com/spatie/holidays/pull/206
+* @mercury64 made their first contribution in https://github.com/spatie/holidays/pull/211
+
+**Full Changelog**: https://github.com/spatie/holidays/compare/1.7.0...1.8.0
+
 ## 1.7.0 - 2024-02-08
 
 ### What's Changed

src/Countries/Canada.php

@@ -31,12 +31,9 @@ protected function variableHolidays(int $year): array
     {
         $easter = $this->easter($year);
 
-        /** @var CarbonImmutable $victoriaDay */
-        $victoriaDay = (new CarbonImmutable("last monday of May $year"))->startOfDay();
-
-        if ($victoriaDay->day < 25) {
-            $victoriaDay = $victoriaDay->addWeek();
-        }
+        // the Monday preceding May 25
+        $victoriaDay = CarbonImmutable::createFromFormat('Y-m-d', "{$year}-05-25")
+            ->previous('Monday');
 
         return [
             'Victoria Day' => $victoriaDay,

tests/.pest/snapshots/Countries/CanadaTest/it_can_calculate_canadian_holidays.snap

@@ -13,7 +13,7 @@
     },
     {
         "name": "Victoria Day",
-        "date": "2024-05-27"
+        "date": "2024-05-20"
     },
     {
         "name": "Canada Day",