fixes for phpstan

spatie · Jan 18, 2024 · 09e703e · 09e703e
1 parent 4951179
commit 09e703e
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 19 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,17 +1,12 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Method Spatie\\\\Holidays\\\\Countries\\\\Belgium\\:\\:allHolidays\\(\\) should return array\\<string, Carbon\\\\CarbonImmutable\\> but returns array\\<string, Carbon\\\\CarbonImmutable\\|string\\>\\.$#"
-			count: 1
-			path: src/Countries/Belgium.php
-
 		-
 			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
 			count: 1
 			path: src/Countries/Country.php
 
 		-
-			message: "#^Method Spatie\\\\Holidays\\\\Countries\\\\Country\\:\\:get\\(\\) should return array\\<string, Carbon\\\\CarbonImmutable\\> but returns array\\<string, Carbon\\\\CarbonImmutable\\|false\\>\\.$#"
+			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
 
@@ -20,11 +15,6 @@ parameters:
 			count: 1
 			path: src/Countries/Country.php
 
-		-
-			message: "#^Method Spatie\\\\Holidays\\\\Countries\\\\Hungary\\:\\:allHolidays\\(\\) should return array\\<string, Carbon\\\\CarbonImmutable\\> but returns array\\<string, Carbon\\\\CarbonImmutable\\|string\\>\\.$#"
-			count: 1
-			path: src/Countries/Hungary.php
-
 		-
 			message: "#^Cannot call method isSunday\\(\\) on Carbon\\\\CarbonImmutable\\|false\\.$#"
 			count: 1
@@ -44,3 +34,8 @@ parameters:
 			message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(Carbon\\\\CarbonImmutable\\)\\: mixed\\)\\|null, Closure\\(string\\)\\: non\\-falsy\\-string given\\.$#"
 			count: 1
 			path: src/Holidays.php
+
+		-
+			message: "#^Property Spatie\\\\Holidays\\\\Holidays\\:\\:\\$holidays \\(array\\<string, Carbon\\\\CarbonImmutable\\>\\) does not accept array\\<string, Carbon\\\\CarbonImmutable\\|string\\>\\.$#"
+			count: 1
+			path: src/Holidays.php
diff --git a/src/Countries/Andorra.php b/src/Countries/Andorra.php
@@ -11,7 +11,6 @@ public function countryCode(): string
         return 'ad';
     }
 
-    /** @return array<string, CarbonImmutable> */
     protected function allHolidays(int $year): array
     {
         return array_merge([

diff --git a/src/Countries/Austria.php b/src/Countries/Austria.php
@@ -16,7 +16,6 @@ public function countryCode(): string
         return 'at';
     }
 
-    /** @return array<string, CarbonImmutable> */
     protected function allHolidays(int $year): array
     {
         return array_merge([
@@ -39,7 +38,7 @@ protected function variableHolidays(int $year): array
             ->setTimezone('Europe/Vienna');
 
         return [
-            'Ostermontag' => $easter->addDay(1),
+            'Ostermontag' => $easter->addDay(),
             'Christi Himmelfahrt' => $easter->addDays(39),
             'Pfingstmontag' => $easter->addDays(50),
             'Fronleichnam' => $easter->addDays(60),

diff --git a/src/Countries/Belgium.php b/src/Countries/Belgium.php
@@ -11,7 +11,6 @@ public function countryCode(): string
         return 'be';
     }
 
-    /** @return array<string, CarbonImmutable> */
     protected function allHolidays(int $year): array
     {
         return array_merge([

diff --git a/src/Countries/Brazil.php b/src/Countries/Brazil.php
@@ -11,7 +11,6 @@ public function countryCode(): string
         return 'br';
     }
 
-    /** @return array<string, CarbonImmutable> */
     protected function allHolidays(int $year): array
     {
         return array_merge([

diff --git a/src/Countries/Country.php b/src/Countries/Country.php
@@ -13,7 +13,7 @@ abstract public function countryCode(): string;
     /** @return array<string, string|CarbonImmutable> */
     abstract protected function allHolidays(int $year): array;
 
-    /** @return array<string, CarbonImmutable> */
+    /** @return array<string, CarbonImmutable|string> */
     public function get(int $year): array
     {
         $this->ensureYearCanBeCalculated($year);

diff --git a/src/Countries/Hungary.php b/src/Countries/Hungary.php
@@ -11,7 +11,6 @@ public function countryCode(): string
         return 'hu';
     }
 
-    /** @return array<string, CarbonImmutable> */
     protected function allHolidays(int $year): array
     {
         return array_merge([

diff --git a/src/Countries/Netherlands.php b/src/Countries/Netherlands.php
@@ -11,7 +11,6 @@ public function countryCode(): string
         return 'nl';
     }
 
-    /** @return array<string, string|CarbonImmutable> */
     protected function allHolidays(int $year): array
     {
         return array_merge([