Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding German holidays #8

Merged
merged 13 commits into from
Jan 25, 2024
Prev Previous commit
Next Next commit
Adding state testing snapshots
  • Loading branch information
arnebr committed Jan 21, 2024
commit 16c90deaa9658aa71b9356065223ef537de7507a
36 changes: 9 additions & 27 deletions src/Countries/Germany.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,16 @@
protected function regionHolidays(int $year): array
{
$easter = $this->easter($year);

switch ($this->region) {
case 'DE-BW':
return [

Check failure on line 67 in src/Countries/Germany.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Spatie\Holidays\Countries\Germany::regionHolidays() should return array<string, Carbon\CarbonImmutable> but returns array<string, Carbon\CarbonImmutable|string>.
'Heilige Drei Könige' => '01-06',
'Fronleichnam' => $easter->addDays(60),
'Allerheiligen' => '11-01',
];
case 'DE-BY':
return [

Check failure on line 73 in src/Countries/Germany.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Spatie\Holidays\Countries\Germany::regionHolidays() should return array<string, Carbon\CarbonImmutable> but returns array<string, Carbon\CarbonImmutable|string>.
'Heilige Drei Könige' => '01-06',
'Fronleichnam' => $easter->addDays(60),
'Allerheiligen' => '11-01',
Expand All @@ -79,7 +80,7 @@
case 'DE-BE':
if($year >=2019)
{
return [

Check failure on line 83 in src/Countries/Germany.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Spatie\Holidays\Countries\Germany::regionHolidays() should return array<string, Carbon\CarbonImmutable> but returns array<string, string>.
'Internationaler Frauentag' => '03-08',
];
}
Expand All @@ -92,7 +93,7 @@
case 'DE-BB':
if($year >=1991)
{
return [

Check failure on line 96 in src/Countries/Germany.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Spatie\Holidays\Countries\Germany::regionHolidays() should return array<string, Carbon\CarbonImmutable> but returns array<string, Carbon\CarbonImmutable|string>.
'Reformationstag' => '10-31',
'Pfingstsonntag' => $easter->addDays(49),
];
Expand All @@ -109,7 +110,7 @@
case 'DE-SH':
if($year >=2017)
{
return [

Check failure on line 113 in src/Countries/Germany.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Spatie\Holidays\Countries\Germany::regionHolidays() should return array<string, Carbon\CarbonImmutable> but returns array<string, string>.
'Reformationstag' => '10-31',
];
}
Expand All @@ -129,28 +130,22 @@
$mvHolidays = [];
if($year >=1990)
{
array_push($mvHolidays, [
'Reformationstag' => '10-31',
]);

$mvHolidays['Reformationstag'] = '10-31';
}
if($year >=2023)
{
array_push($mvHolidays, [
'Internationaler Frauentag'=> '03-08',
]);

$mvHolidays['Internationaler Frauentag'] = '03-08';
}
return $mvHolidays;

Check failure on line 139 in src/Countries/Germany.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Spatie\Holidays\Countries\Germany::regionHolidays() should return array<string, Carbon\CarbonImmutable> but returns array<string, string>.
case 'DE-NW':
case 'DE-RP':

return [

Check failure on line 143 in src/Countries/Germany.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Spatie\Holidays\Countries\Germany::regionHolidays() should return array<string, Carbon\CarbonImmutable> but returns array<string, Carbon\CarbonImmutable|string>.
'Fronleichnam' => $easter->addDays(60),
'Allerheiligen' => '11-01',
];
case 'DE-SL':
return [

Check failure on line 148 in src/Countries/Germany.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Spatie\Holidays\Countries\Germany::regionHolidays() should return array<string, Carbon\CarbonImmutable> but returns array<string, Carbon\CarbonImmutable|string>.
'Fronleichnam' => $easter->addDays(60),
'Allerheiligen' => '11-01',
'Mariä Himmelfahrt' => '08-15',
Expand All @@ -159,48 +154,35 @@
$snHolidays = [];
if($year >=1990)
{
array_push($snHolidays, [
'Reformationstag' => '10-31',
]);
$snHolidays['Reformationstag'] = '10-31';

}
if($year >1994)
{
array_push($snHolidays, [
'Buß- und Bettag' => $this->getRepentanceAndPrayerDay($year)
]);
$snHolidays['Buß- und Bettag'] = $this->getRepentanceAndPrayerDay($year);

}
return $snHolidays;

Check failure on line 165 in src/Countries/Germany.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Spatie\Holidays\Countries\Germany::regionHolidays() should return array<string, Carbon\CarbonImmutable> but returns array<string, string>.
case 'DE-ST':
$stHolidays = [];
if($year >=1990)
{
array_push($stHolidays, [
'Reformationstag' => '10-31',
]);
$stHolidays['Reformationstag'] = '10-31';

}
if($year >=1991){
array_push($stHolidays, [
'Heilige Drei Könige' => '01-06',
]);
$stHolidays['Weltkindertag'] = '09-20';
}
case 'DE-TH':
$thHolidays = [];
if($year >=1990)
{
array_push($thHolidays, [
'Reformationstag' => '10-31',
]);

$thHolidays['Reformationstag'] = '10-31';
}
if($year >=2019){
array_push($thHolidays, [
'Weltkindertag' => '09-20',
]);
$thHolidays['Weltkindertag'] = '09-20';
}
return $thHolidays;

Check failure on line 185 in src/Countries/Germany.php

View workflow job for this annotation

GitHub Actions / phpstan

Method Spatie\Holidays\Countries\Germany::regionHolidays() should return array<string, Carbon\CarbonImmutable> but returns array<string, string>.

}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
[
{
"name": "Neujahr",
"date": "2024-01-01"
},
{
"name": "Karfreitag",
"date": "2024-03-29"
},
{
"name": "Ostermontag",
"date": "2024-04-01"
},
{
"name": "Tag der Arbeit",
"date": "2024-05-01"
},
{
"name": "Himmelfahrt",
"date": "2024-05-09"
},
{
"name": "Pfingstsonntag",
"date": "2024-05-19"
},
{
"name": "Pfingstmontag",
"date": "2024-05-20"
},
{
"name": "Tag der deutschen Einheit",
"date": "2024-10-03"
},
{
"name": "Reformationstag",
"date": "2024-10-31"
},
{
"name": "1. Weihnachtstag",
"date": "2024-12-25"
},
{
"name": "2. Weihnachtstag",
"date": "2024-12-26"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[
{
"name": "Neujahr",
"date": "2024-01-01"
},
{
"name": "Internationaler Frauentag",
"date": "2024-03-08"
},
{
"name": "Karfreitag",
"date": "2024-03-29"
},
{
"name": "Ostermontag",
"date": "2024-04-01"
},
{
"name": "Tag der Arbeit",
"date": "2024-05-01"
},
{
"name": "Himmelfahrt",
"date": "2024-05-09"
},
{
"name": "Pfingstmontag",
"date": "2024-05-20"
},
{
"name": "Tag der deutschen Einheit",
"date": "2024-10-03"
},
{
"name": "1. Weihnachtstag",
"date": "2024-12-25"
},
{
"name": "2. Weihnachtstag",
"date": "2024-12-26"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[
{
"name": "Neujahr",
"date": "2024-01-01"
},
{
"name": "Heilige Drei K\u00f6nige",
"date": "2024-01-06"
},
{
"name": "Karfreitag",
"date": "2024-03-29"
},
{
"name": "Ostermontag",
"date": "2024-04-01"
},
{
"name": "Tag der Arbeit",
"date": "2024-05-01"
},
{
"name": "Himmelfahrt",
"date": "2024-05-09"
},
{
"name": "Pfingstmontag",
"date": "2024-05-20"
},
{
"name": "Fronleichnam",
"date": "2024-05-30"
},
{
"name": "Tag der deutschen Einheit",
"date": "2024-10-03"
},
{
"name": "Allerheiligen",
"date": "2024-11-01"
},
{
"name": "1. Weihnachtstag",
"date": "2024-12-25"
},
{
"name": "2. Weihnachtstag",
"date": "2024-12-26"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
[
{
"name": "Neujahr",
"date": "2024-01-01"
},
{
"name": "Heilige Drei K\u00f6nige",
"date": "2024-01-06"
},
{
"name": "Karfreitag",
"date": "2024-03-29"
},
{
"name": "Ostermontag",
"date": "2024-04-01"
},
{
"name": "Tag der Arbeit",
"date": "2024-05-01"
},
{
"name": "Himmelfahrt",
"date": "2024-05-09"
},
{
"name": "Pfingstmontag",
"date": "2024-05-20"
},
{
"name": "Fronleichnam",
"date": "2024-05-30"
},
{
"name": "Mari\u00e4 Himmelfahrt",
"date": "2024-08-15"
},
{
"name": "Tag der deutschen Einheit",
"date": "2024-10-03"
},
{
"name": "Allerheiligen",
"date": "2024-11-01"
},
{
"name": "1. Weihnachtstag",
"date": "2024-12-25"
},
{
"name": "2. Weihnachtstag",
"date": "2024-12-26"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[
{
"name": "Neujahr",
"date": "2024-01-01"
},
{
"name": "Karfreitag",
"date": "2024-03-29"
},
{
"name": "Ostermontag",
"date": "2024-04-01"
},
{
"name": "Tag der Arbeit",
"date": "2024-05-01"
},
{
"name": "Himmelfahrt",
"date": "2024-05-09"
},
{
"name": "Pfingstmontag",
"date": "2024-05-20"
},
{
"name": "Tag der deutschen Einheit",
"date": "2024-10-03"
},
{
"name": "Reformationstag",
"date": "2024-10-31"
},
{
"name": "1. Weihnachtstag",
"date": "2024-12-25"
},
{
"name": "2. Weihnachtstag",
"date": "2024-12-26"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
[
{
"name": "Neujahr",
"date": "2024-01-01"
},
{
"name": "Karfreitag",
"date": "2024-03-29"
},
{
"name": "Ostersonntag",
"date": "2024-03-31"
},
{
"name": "Ostermontag",
"date": "2024-04-01"
},
{
"name": "Tag der Arbeit",
"date": "2024-05-01"
},
{
"name": "Himmelfahrt",
"date": "2024-05-09"
},
{
"name": "Pfingstmontag",
"date": "2024-05-20"
},
{
"name": "Fronleichnam",
"date": "2024-05-30"
},
{
"name": "Tag der deutschen Einheit",
"date": "2024-10-03"
},
{
"name": "1. Weihnachtstag",
"date": "2024-12-25"
},
{
"name": "2. Weihnachtstag",
"date": "2024-12-26"
}
]
Loading
Loading