Skip to content

Commit

Permalink
Fix holidays name
Browse files Browse the repository at this point in the history
  • Loading branch information
Massoud114 committed Feb 1, 2024
1 parent 188059a commit 0473c49
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
15 changes: 7 additions & 8 deletions src/Countries/Benin.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ public function countryCode(): string
protected function allHolidays(int $year): array
{
return array_merge([
'Fête du Nouvel An' => '01-01',
'Fête annuelle des religions traditionnelles' => '01-10',
'Fête du travail' => '05-01',
'Fête de l\'indépendance' => '08-01',
'Fete du Nouvel An' => '01-01',
'Fete annuelle des religions traditionnelles' => '01-10',
'Fete du travail' => '05-01',
'Fete de l\'independance' => '08-01',
'Jour de la Toussaint' => '11-01',
'Jour de Noël' => '12-25',
'Jour de l\'assomption' => '08-15',
Expand All @@ -30,8 +30,7 @@ protected function allHolidays(int $year): array
/** @return array<string, CarbonImmutable> */
protected function variableHolidays(int $year): array
{
$easter = CarbonImmutable::createFromTimestamp(easter_date($year))
->setTimezone('Africa/Porto-Novo');
$easter = $this->easter($year)->setTimezone('Africa/Porto-Novo');

$hijriYear = Hijri::convertToHijri($easter->format('Y-m-d'))->year;

Expand All @@ -43,8 +42,8 @@ protected function variableHolidays(int $year): array
* Islamic holidays are based on the Hijri calendar and vary by a day or so.
*/
'Jour du Maouloud' => Hijri::convertToGregorian(12, 3, $hijriYear)->toImmutable(),
'Fête du Ramadan' => Hijri::convertToGregorian(10, 1, $hijriYear)->toImmutable(),
'Fête de la Tabaski' => Hijri::convertToGregorian(12, 10, $hijriYear)->toImmutable(),
'Fete du Ramadan' => Hijri::convertToGregorian(10, 1, $hijriYear)->toImmutable(),
'Fete de la Tabaski' => Hijri::convertToGregorian(12, 10, $hijriYear)->toImmutable(),
];
}
}
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
[
{
"name": "F\u00eate du Ramadan",
"name": "Fete du Ramadan",
"date": "2023-07-27"
},
{
"name": "Jour du Maouloud",
"date": "2023-09-26"
},
{
"name": "F\u00eate du Nouvel An",
"name": "Fete du Nouvel An",
"date": "2024-01-01"
},
{
"name": "F\u00eate annuelle des religions traditionnelles",
"name": "Fete annuelle des religions traditionnelles",
"date": "2024-01-10"
},
{
"name": "Lundi de P\u00e2ques",
"date": "2024-04-01"
},
{
"name": "F\u00eate de la Tabaski",
"name": "Fete de la Tabaski",
"date": "2024-04-20"
},
{
"name": "F\u00eate du travail",
"name": "Fete du travail",
"date": "2024-05-01"
},
{
Expand All @@ -36,7 +36,7 @@
"date": "2024-05-20"
},
{
"name": "F\u00eate de l'ind\u00e9pendance",
"name": "Fete de l'independance",
"date": "2024-08-01"
},
{
Expand All @@ -51,4 +51,4 @@
"name": "Jour de No\u00ebl",
"date": "2024-12-25"
}
]
]
2 changes: 1 addition & 1 deletion tests/Countries/BeninTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Spatie\Holidays\Holidays;

it('can calculate benin holidays', function () {
CarbonImmutable::setTestNowAndTimezone('2024-01-01');
CarbonImmutable::setTestNow('2024-01-01');

$holidays = Holidays::for(country: 'bj')->get();

Expand Down

0 comments on commit 0473c49

Please sign in to comment.