Merge pull request #180 from spatie/bug/orthodox-easter

Bug fix: calculating orthodox easter
spatie · Jan 25, 2024 · 4d30204 · 4d30204
2 parents 37b0717 + 1fa7a39
commit 4d30204
Show file tree

Hide file tree

Showing 57 changed files with 130 additions and 84 deletions.
diff --git a/composer.json b/composer.json
@@ -29,6 +29,7 @@
         "laravel/prompts": "^0.1.15",
         "pestphp/pest": "^2.31",
         "phpstan/phpstan": "^1.10.56",
+        "spatie/invade": "^2.0",
         "spatie/ray": "^1.40.1",
         "symfony/var-dumper": "^6.4"
     },

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -12,19 +12,14 @@ parameters:
 
 		-
 			message: "#^Cannot call method startOfDay\\(\\) on Carbon\\\\CarbonImmutable\\|false\\.$#"
-			count: 1
+			count: 2
 			path: src/Countries/Country.php
 
 		-
 			message: "#^Method Spatie\\\\Holidays\\\\Countries\\\\Country\\:\\:get\\(\\) should return array\\<string, Carbon\\\\CarbonImmutable\\|string\\> but returns array\\<string, Carbon\\\\CarbonImmutable\\|false\\>\\.$#"
 			count: 1
 			path: src/Countries/Country.php
 
-		-
-			message: "#^Parameter \\#1 \\$timestamp of static method Carbon\\\\CarbonImmutable\\:\\:createFromTimestamp\\(\\) expects float\\|int\\|string, int\\|false given\\.$#"
-			count: 1
-			path: src/Countries/Country.php
-
 		-
 			message: "#^Parameter \\#2 \\$callback of function uasort expects callable\\(bool\\|Carbon\\\\CarbonImmutable, bool\\|Carbon\\\\CarbonImmutable\\)\\: int, Closure\\(Carbon\\\\CarbonImmutable, Carbon\\\\CarbonImmutable\\)\\: int\\<\\-1, 1\\> given\\.$#"
 			count: 1

diff --git a/src/Countries/Country.php b/src/Countries/Country.php
@@ -56,10 +56,13 @@ protected function easter(int $year): CarbonImmutable
 
     protected function orthodoxEaster(int $year): CarbonImmutable
     {
-        $timestamp = easter_date($year, CAL_EASTER_ALWAYS_JULIAN);
-        $daysDifference = (int) ($year / 100) - (int) ($year / 400) - 2;
+        // Paschal full moon date
+        // Not covered edge case:
+        // when the full moon is on a 3 April, Easter is the next Sunday
+        $easter = CarbonImmutable::createFromFormat('Y-m-d', "{$year}-04-03")
+            ->startOfDay();
 
-        return CarbonImmutable::createFromTimestamp(strtotime("+$daysDifference days", $timestamp));
+        return $easter->addDays(easter_days($year, CAL_EASTER_ALWAYS_JULIAN));
     }
 
     public static function find(string $countryCode): ?Country

diff --git a/tests/Countries/AndorraTest.php b/tests/Countries/AndorraTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate andorra holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'ad')->get();
 

diff --git a/tests/Countries/AustraliaTest.php b/tests/Countries/AustraliaTest.php
@@ -7,7 +7,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate australian holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-22', 'Australia/Melbourne');
+    CarbonImmutable::setTestNow('2024-01-22');
 
     $holidays = Holidays::for(country: 'au')->get();
 
@@ -19,7 +19,7 @@
 });
 
 it('can calculate australian holidays for a specific year', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-22', 'Australia/Melbourne');
+    CarbonImmutable::setTestNow('2024-01-22');
 
     $holidays = Holidays::for(country: 'au', year: 2025)->get();
 
@@ -31,7 +31,7 @@
 });
 
 it('can calculate regional australian holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-22', 'Australia/Melbourne');
+    CarbonImmutable::setTestNow('2024-01-22');
 
     $holidays = Holidays::for(Australia::make('vic'))->get();
 
@@ -43,7 +43,7 @@
 });
 
 it('can calculate the day before afl grand final', function () {
-    CarbonImmutable::setTestNowAndTimezone('2021-01-22', 'Australia/Melbourne');
+    CarbonImmutable::setTestNow('2021-01-22');
 
     $holidays = Holidays::for(Australia::make('vic'))->get();
 
@@ -52,7 +52,7 @@
 });
 
 it('can calculate the day before afl grand final during lockdown', function () {
-    CarbonImmutable::setTestNowAndTimezone('2020-01-22', 'Australia/Melbourne');
+    CarbonImmutable::setTestNow('2020-01-22');
 
     $holidays = Holidays::for(Australia::make('vic'))->get();
 
@@ -61,7 +61,7 @@
 });
 
 it('does not return the day before afl grand final before 2015', function () {
-    CarbonImmutable::setTestNowAndTimezone('2014-01-22', 'Australia/Melbourne');
+    CarbonImmutable::setTestNow('2014-01-22');
 
     $holidays = Holidays::for(Australia::make('vic'))->get();
 
@@ -70,7 +70,7 @@
 });
 
 it("returns queen's birthday before her death", function () {
-    CarbonImmutable::setTestNowAndTimezone('2021-01-22', 'Australia/Perth');
+    CarbonImmutable::setTestNow('2021-01-22', 'Australia/Perth');
 
     $holidays = Holidays::for(Australia::make('wa'))->get();
 
@@ -82,7 +82,7 @@
 });
 
 it("returns king's birthday after her death", function () {
-    CarbonImmutable::setTestNowAndTimezone('2022-01-22', 'Australia/Perth');
+    CarbonImmutable::setTestNow('2022-01-22', 'Australia/Perth');
 
     $holidays = Holidays::for(Australia::make('wa'))->get();
 
@@ -94,7 +94,7 @@
 });
 
 it('can calculate Adelaide Cup Day before 2006', function () {
-    CarbonImmutable::setTestNowAndTimezone('2005-01-22', 'Australia/Adelaide');
+    CarbonImmutable::setTestNow('2005-01-22', 'Australia/Adelaide');
 
     $holidays = Holidays::for(Australia::make('sa'))->get();
 
@@ -103,7 +103,7 @@
 });
 
 it('can calculate Adelaide Cup Day after 2006', function () {
-    CarbonImmutable::setTestNowAndTimezone('2007-01-22', 'Australia/Adelaide');
+    CarbonImmutable::setTestNow('2007-01-22', 'Australia/Adelaide');
 
     $holidays = Holidays::for(Australia::make('sa'))->get();
 
@@ -112,7 +112,7 @@
 });
 
 it('can calculate Reconciliation Day on 27 May', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-22', 'Australia/Canberra');
+    CarbonImmutable::setTestNow('2024-01-22', 'Australia/Canberra');
 
     $holidays = Holidays::for(Australia::make('act'))->get();
 
@@ -121,7 +121,7 @@
 });
 
 it('can calculate Reconciliation Day after 27 May', function () {
-    CarbonImmutable::setTestNowAndTimezone('2025-01-22', 'Australia/Canberra');
+    CarbonImmutable::setTestNow('2025-01-22', 'Australia/Canberra');
 
     $holidays = Holidays::for(Australia::make('act'))->get();
 

diff --git a/tests/Countries/AustriaTest.php b/tests/Countries/AustriaTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate austrian holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'at')->get();
 

diff --git a/tests/Countries/BangladeshTest.php b/tests/Countries/BangladeshTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate bangladesh holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'bd')->get();
 

diff --git a/tests/Countries/BelarusTest.php b/tests/Countries/BelarusTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate belarus holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'by')->get();
 
@@ -18,7 +18,7 @@
 });
 
 it('can calculate belarus holidays in English', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'by', locale: 'en')->get();
 
@@ -30,7 +30,7 @@
 });
 
 it('can calculate belarus holidays in Belarus Lacinka', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'by', locale: 'be-latn')->get();
 
@@ -42,7 +42,7 @@
 });
 
 it('can calculate belarus holidays in Russian', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'by', locale: 'ru')->get();
 

diff --git a/tests/Countries/BelgiumTest.php b/tests/Countries/BelgiumTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate belgian holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'be')->get();
 

diff --git a/tests/Countries/BoliviaTest.php b/tests/Countries/BoliviaTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate bolivian holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'bo')->get();
 

diff --git a/tests/Countries/BrazilTest.php b/tests/Countries/BrazilTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate brazil holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'br')->get();
 

diff --git a/tests/Countries/CanadaTest.php b/tests/Countries/CanadaTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate canadian holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'ca')->get();
 

diff --git a/tests/Countries/ColombiaTest.php b/tests/Countries/ColombiaTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate colombian holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'co')->get();
 

diff --git a/tests/Countries/CroatiaTest.php b/tests/Countries/CroatiaTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate croatian holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'hr')->get();
 

diff --git a/tests/Countries/CzechiaTest.php b/tests/Countries/CzechiaTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate czech holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'cz')->get();
 

diff --git a/tests/Countries/DenmarkTest.php b/tests/Countries/DenmarkTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate danish holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'da')->get();
 

diff --git a/tests/Countries/DominicanRepublicTest.php b/tests/Countries/DominicanRepublicTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate dominican republic holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'do')->get();
 

diff --git a/tests/Countries/ElSalvadorTest.php b/tests/Countries/ElSalvadorTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate el salvador holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'sv')->get();
 

diff --git a/tests/Countries/EstoniaTest.php b/tests/Countries/EstoniaTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate estonian holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01', 'Europe/Tallinn');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'ee')->get();
 

diff --git a/tests/Countries/FinlandTest.php b/tests/Countries/FinlandTest.php
@@ -6,7 +6,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate finnish holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'fi')->get();
 
@@ -19,7 +19,7 @@
 });
 
 it('can get finnish holidays in swedish', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'fi', locale: 'sv')->get();
 

diff --git a/tests/Countries/FranceTest.php b/tests/Countries/FranceTest.php
@@ -7,7 +7,7 @@
 use Spatie\Holidays\Holidays;
 
 it('can calculate french holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(country: 'fr')->get();
 
@@ -19,7 +19,7 @@
 });
 
 it('can calculate french easter based region holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(France::make('FR-57'))->get();
 
@@ -31,7 +31,7 @@
 });
 
 it('can calculate french date based regional holidays', function () {
-    CarbonImmutable::setTestNowAndTimezone('2024-01-01');
+    CarbonImmutable::setTestNow('2024-01-01');
 
     $holidays = Holidays::for(France::make('FR-BL'))->get();