Merge pull request #211 from mercury64/main

Fix: Canada Victoria Day correction in test and calculation
spatie · Mar 8, 2024 · 210d4a5 · 210d4a5
2 parents 7010c1f + 619930a
commit 210d4a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Countries/Canada.php b/src/Countries/Canada.php
@@ -31,11 +31,9 @@ protected function variableHolidays(int $year): array
     {
         $easter = $this->easter($year);
 
-        $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,

diff --git a/tests/.pest/snapshots/Countries/CanadaTest/it_can_calculate_canadian_holidays.snap b/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",