switch to easter method

spatie · Jan 21, 2024 · 7557596 · 7557596
1 parent f4fce73
commit 7557596
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 42 deletions.
diff --git a/src/Countries/NorthernIreland.php b/src/Countries/NorthernIreland.php
@@ -77,8 +77,7 @@ protected function allHolidays(int $year): array
     /** @return array<string, CarbonImmutable> */
     protected function variableHolidays(int $year): array
     {
-        $easterSunday = CarbonImmutable::createFromTimestamp(easter_date($year))
-            ->setTimezone('Europe/London');
+        $easterSunday = $this->easter($year);
 
         $goodFriday = $easterSunday->subDays(2);
         $easterMonday = $easterSunday->addDay();

diff --git a/src/Countries/Scotland.php b/src/Countries/Scotland.php
@@ -83,8 +83,7 @@ protected function allHolidays(int $year): array
     /** @return array<string, CarbonImmutable> */
     protected function variableHolidays(int $year): array
     {
-        $easterSunday = CarbonImmutable::createFromTimestamp(easter_date($year))
-            ->setTimezone('Europe/London');
+        $easterSunday = $this->easter($year);
 
         $goodFriday = $easterSunday->subDays(2);
 

diff --git a/src/Countries/Wales.php b/src/Countries/Wales.php
@@ -120,8 +120,7 @@ protected function allHolidays(int $year): array
     /** @return array<string, CarbonImmutable> */
     protected function variableHolidays(int $year): array
     {
-        $easterSunday = CarbonImmutable::createFromTimestamp(easter_date($year))
-            ->setTimezone('Europe/London');
+        $easterSunday = $this->easter($year);
 
         $goodFriday = $easterSunday->subDays(2);
         $easterMonday = $easterSunday->addDay();

diff --git a/tests/.pest/snapshots/Countries/WalesTest/it_can_calculate_holidays_for_2020.snap b/tests/.pest/snapshots/Countries/WalesTest/it_can_calculate_holidays_for_2020.snap
@@ -1,15 +1,15 @@
 [
     {
-        "name": "Good Friday",
-        "date": "1969-12-30"
+        "name": "New Year's Day",
+        "date": "2020-01-01"
     },
     {
-        "name": "Easter Monday",
-        "date": "1970-01-02"
+        "name": "Good Friday",
+        "date": "2020-04-10"
     },
     {
-        "name": "New Year's Day",
-        "date": "2020-01-01"
+        "name": "Easter Monday",
+        "date": "2020-04-13"
     },
     {
         "name": "Early May bank holiday (VE day)",

diff --git a/tests/.pest/snapshots/Countries/WalesTest/it_can_calculate_welsh_holidays.snap b/tests/.pest/snapshots/Countries/WalesTest/it_can_calculate_welsh_holidays.snap
@@ -1,15 +1,15 @@
 [
     {
-        "name": "Good Friday",
-        "date": "1969-12-30"
+        "name": "New Year's Day",
+        "date": "2024-01-01"
     },
     {
-        "name": "Easter Monday",
-        "date": "1970-01-02"
+        "name": "Good Friday",
+        "date": "2024-03-29"
     },
     {
-        "name": "New Year's Day",
-        "date": "2024-01-01"
+        "name": "Easter Monday",
+        "date": "2024-04-01"
     },
     {
         "name": "Early May bank holiday",

diff --git a/...hots/Countries/WalesTest/it_can_calculate_welsh_holidays_if_christmas_is_on_a_friday.snap b/...hots/Countries/WalesTest/it_can_calculate_welsh_holidays_if_christmas_is_on_a_friday.snap
@@ -1,15 +1,15 @@
 [
     {
-        "name": "Good Friday",
-        "date": "1969-12-30"
+        "name": "New Year's Day",
+        "date": "2020-01-01"
     },
     {
-        "name": "Easter Monday",
-        "date": "1970-01-02"
+        "name": "Good Friday",
+        "date": "2020-04-10"
     },
     {
-        "name": "New Year's Day",
-        "date": "2020-01-01"
+        "name": "Easter Monday",
+        "date": "2020-04-13"
     },
     {
         "name": "Early May bank holiday (VE day)",

diff --git a/...ts/Countries/WalesTest/it_can_calculate_welsh_holidays_if_christmas_is_on_a_saturday.snap b/...ts/Countries/WalesTest/it_can_calculate_welsh_holidays_if_christmas_is_on_a_saturday.snap
@@ -1,15 +1,15 @@
 [
     {
-        "name": "Good Friday",
-        "date": "1969-12-30"
+        "name": "New Year's Day",
+        "date": "2021-01-01"
     },
     {
-        "name": "Easter Monday",
-        "date": "1970-01-02"
+        "name": "Good Friday",
+        "date": "2021-04-02"
     },
     {
-        "name": "New Year's Day",
-        "date": "2021-01-01"
+        "name": "Easter Monday",
+        "date": "2021-04-05"
     },
     {
         "name": "Early May bank holiday",

diff --git a/...hots/Countries/WalesTest/it_can_calculate_welsh_holidays_if_christmas_is_on_a_sunday.snap b/...hots/Countries/WalesTest/it_can_calculate_welsh_holidays_if_christmas_is_on_a_sunday.snap
@@ -1,15 +1,15 @@
 [
     {
-        "name": "Good Friday",
-        "date": "1969-12-30"
+        "name": "New Year's Day (substitute day)",
+        "date": "2022-01-03"
     },
     {
-        "name": "Easter Monday",
-        "date": "1970-01-02"
+        "name": "Good Friday",
+        "date": "2022-04-15"
     },
     {
-        "name": "New Year's Day (substitute day)",
-        "date": "2022-01-03"
+        "name": "Easter Monday",
+        "date": "2022-04-18"
     },
     {
         "name": "Early May bank holiday",

diff --git a/.../Countries/WalesTest/it_returns_a_substitute_day_if_new_years_day_falls_on_a_weekend.snap b/.../Countries/WalesTest/it_returns_a_substitute_day_if_new_years_day_falls_on_a_weekend.snap
@@ -1,15 +1,15 @@
 [
     {
-        "name": "Good Friday",
-        "date": "1969-12-30"
+        "name": "New Year's Day (substitute day)",
+        "date": "2033-01-03"
     },
     {
-        "name": "Easter Monday",
-        "date": "1970-01-02"
+        "name": "Good Friday",
+        "date": "2033-04-15"
     },
     {
-        "name": "New Year's Day (substitute day)",
-        "date": "2033-01-03"
+        "name": "Easter Monday",
+        "date": "2033-04-18"
     },
     {
         "name": "Early May bank holiday",