diff --git a/src/Countries/Australia.php b/src/Countries/Australia.php index 0b43bae4e..3de478baa 100644 --- a/src/Countries/Australia.php +++ b/src/Countries/Australia.php @@ -30,7 +30,7 @@ protected function allHolidays(int $year): array /** @return array */ protected function variableHolidays(int $year): array { - $easter = $this->easter($year)->setTimezone('Australia/Sydney'); + $easter = $this->easter($year); return [ 'Good Friday' => $easter->subDays(2), diff --git a/src/Countries/Greece.php b/src/Countries/Greece.php index 1b206e007..5a0b0a450 100644 --- a/src/Countries/Greece.php +++ b/src/Countries/Greece.php @@ -30,7 +30,7 @@ protected function allHolidays(int $year): array protected function variableHolidays(int $year): array { // OrthodoxEaster needs to setTimezone - $orthodoxEaster = $this->orthodoxEaster($year)->setTimezone('Europe/Athens'); + $orthodoxEaster = $this->orthodoxEaster($year); $cleanMonday = $orthodoxEaster->copy()->subDays(48); $megaliParaskevi = $orthodoxEaster->copy()->subDays(2); $megaloSavvato = $orthodoxEaster->copy()->subDays(1); diff --git a/src/Countries/Japan.php b/src/Countries/Japan.php index 38b1bc7d5..a15d890c5 100644 --- a/src/Countries/Japan.php +++ b/src/Countries/Japan.php @@ -33,17 +33,13 @@ protected function allHolidays(int $year): array /** @return array */ protected function variableHolidays(int $year): array { - $comingOfAgeDay = (new CarbonImmutable("second monday of january $year")) // Coming of Age Day - ->setTimezone('Asia/Tokyo'); + $comingOfAgeDay = (new CarbonImmutable("second monday of january $year"))->startOfDay(); - $oceansDay = (new CarbonImmutable("third monday of july $year")) // Ocean's Day - ->setTimezone('Asia/Tokyo'); + $oceansDay = (new CarbonImmutable("third monday of july $year"))->startOfDay(); - $respectForTheAgedDay = (new CarbonImmutable("third monday of september $year")) // Respect for the Aged Day - ->setTimezone('Asia/Tokyo'); + $respectForTheAgedDay = (new CarbonImmutable("third monday of september $year"))->startOfDay(); - $sportsDay = (new CarbonImmutable("second monday of october $year")) // Sports Day - ->setTimezone('Asia/Tokyo'); + $sportsDay = (new CarbonImmutable("second monday of october $year"))->startOfDay(); $holidays = [ '成人の日' => $comingOfAgeDay, diff --git a/src/Countries/Kenya.php b/src/Countries/Kenya.php index 82a7ad3d8..86e95b704 100644 --- a/src/Countries/Kenya.php +++ b/src/Countries/Kenya.php @@ -28,8 +28,7 @@ protected function allHolidays(int $year): array /** @return array */ protected function variableHolidays(int $year): array { - $easter = CarbonImmutable::createFromTimestamp(easter_date($year)) - ->setTimezone('Africa/Nairobi'); + $easter = $this->easter($year); return [ 'Good Friday' => $easter->subDays(2), diff --git a/src/Countries/Montenegro.php b/src/Countries/Montenegro.php index 2423f1e81..b653d4a4f 100644 --- a/src/Countries/Montenegro.php +++ b/src/Countries/Montenegro.php @@ -36,7 +36,7 @@ public function allHolidays(int $year): array public function variableHolidays(int $year): array { // Orthodox Easter calculation needs to be in the same timezone as the country - $orthodoxEaster = $this->orthodoxEaster($year)->setTimezone('Europe/Podgorica'); + $orthodoxEaster = $this->orthodoxEaster($year); $goodFriday = $orthodoxEaster->copy()->subDays(2); $orthodoxEasterMonday = $orthodoxEaster->copy()->addDay(); diff --git a/src/Countries/Vietnam.php b/src/Countries/Vietnam.php index 76ae6f1b5..7d6504047 100644 --- a/src/Countries/Vietnam.php +++ b/src/Countries/Vietnam.php @@ -80,8 +80,7 @@ protected function getTheExtraDayForIndependenceDay(int $year): array return []; } - $independenceDay = CarbonImmutable::parse("$year-09-02") - ->setTimeZone('Asia/Ho_Chi_Minh'); + $independenceDay = CarbonImmutable::parse("$year-09-02")->startOfDay(); if ($independenceDay->dayOfWeek === CarbonInterface::MONDAY) { return ['Ngày Sau Quốc Khánh' => $independenceDay->addDay()];