generated from spatie/package-skeleton-php
-
-
Notifications
You must be signed in to change notification settings - Fork 197
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
Add French holidays #15
Merged
Merged
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
288a7f9
Create France.php
levrailoup b64a241
Create FranceTest.php
levrailoup fa67eac
Fix France.php
levrailoup 35afd9e
Create it_can_calculate_french_holidays.snap
levrailoup d542faf
tests
levrailoup f853f98
Update src/Countries/France.php
levrailoup f366bdc
Merge branch 'spatie:main' into main
levrailoup f9aba7a
Removed typehint from France::allHolidays()
levrailoup 31b95cf
Added region-specific ISO 3166-2 codes
levrailoup ce172db
Added regionHolidays return value type
levrailoup File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
<?php | ||
|
||
namespace Spatie\Holidays\Countries; | ||
|
||
use Carbon\CarbonImmutable; | ||
|
||
class France extends Country | ||
{ | ||
public function countryCode(): string | ||
{ | ||
return 'fr'; | ||
} | ||
|
||
/** @return array<string, CarbonImmutable> */ | ||
protected function allHolidays(int $year): array | ||
{ | ||
return array_merge([ | ||
'Jour de l\'An' => '01-01', | ||
'Fête du Travail' => '05-01', | ||
'Victoire 1945' => '05-08', | ||
'Fête Nationale' => '07-14', | ||
'Assomption' => '08-15', | ||
'Toussaint' => '11-01', | ||
'Armistice 1918' => '11-11', | ||
'Noël' => '12-25', | ||
], $this->variableHolidays($year)); | ||
} | ||
|
||
/** @return array<string, CarbonImmutable> */ | ||
protected function variableHolidays(int $year): array | ||
{ | ||
$easter = CarbonImmutable::createFromTimestamp(easter_date($year)) | ||
->setTimezone('Europe/Paris'); | ||
|
||
return [ | ||
'Lundi de Pâques' => $easter->addDay(), | ||
'Ascension' => $easter->addDays(39), | ||
'Lundi de Pentecôte' => $easter->addDays(50), | ||
]; | ||
} | ||
} |
46 changes: 46 additions & 0 deletions
46
tests/.pest/snapshots/Countries/FranceTest/it_can_calculate_french_holidays.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
[ | ||
{ | ||
"name": "Jour de l'An", | ||
"date": "2024-01-01" | ||
}, | ||
{ | ||
"name": "Lundi de P\u00e2ques", | ||
"date": "2024-04-01" | ||
}, | ||
{ | ||
"name": "F\u00eate du Travail", | ||
"date": "2024-05-01" | ||
}, | ||
{ | ||
"name": "Victoire 1945", | ||
"date": "2024-05-08" | ||
}, | ||
{ | ||
"name": "Ascension", | ||
"date": "2024-05-09" | ||
}, | ||
{ | ||
"name": "Lundi de Pentec\u00f4te", | ||
"date": "2024-05-20" | ||
}, | ||
{ | ||
"name": "F\u00eate Nationale", | ||
"date": "2024-07-14" | ||
}, | ||
{ | ||
"name": "Assomption", | ||
"date": "2024-08-15" | ||
}, | ||
{ | ||
"name": "Toussaint", | ||
"date": "2024-11-01" | ||
}, | ||
{ | ||
"name": "Armistice 1918", | ||
"date": "2024-11-11" | ||
}, | ||
{ | ||
"name": "No\u00ebl", | ||
"date": "2024-12-25" | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?php | ||
|
||
namespace Spatie\Holidays\Tests\Countries; | ||
|
||
use Carbon\CarbonImmutable; | ||
use Spatie\Holidays\Holidays; | ||
|
||
it('can calculate french holidays', function () { | ||
CarbonImmutable::setTestNowAndTimezone('2024-01-01'); | ||
|
||
$holidays = Holidays::for(country: 'fr')->get(); | ||
|
||
expect($holidays) | ||
->toBeArray() | ||
->not()->toBeEmpty(); | ||
|
||
expect(formatDates($holidays))->toMatchSnapshot(); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this return type is wrong (but anyway, you should not need to specify it here. Inheriting it from the parent is better)