Add Singapore Public Holiday #94

captainjaypee01 · 2024-01-18T18:13:22Z

Singapore Holidays

New Year's Day
Chinese New Year
Good Friday
Hari Raya Puasa
Labour Day
Vesak Day
Hari Raya Haji
National Day
Deepavali
Christmas Day

Changes

Replacement for Holidays. If falls on Sunday, Monday will be the replacement. For Chinese New Year, if the Day is Sunday and Monday then the Tuesday will be the replacement for Sunday.
Used IntlDateFormatter for accurate calendar calculations
Added Chinese Calendar to get the Chinese New Year and Vesak Day dates
Added Islamic Calendar to get the Hari Raya Puasa and Hari Raya Haji dates
Added Indian Calendar to get the Kartik month which is 8th month of the Indian Calendar and 10th month of the Gregorian Calendar.
Used the solaris/php-moon-phase for accurate computation of moon phases. Especially for Deepavali holiday, as this holiday is based on moon appearance

Additional Notes

The solaris/php-moon-phase extension is required for this addition. It is referenced in the composer.json file.

References:

Singapore's Ministry of Manpower to reference the Holidays in Singapore
MOM Gov Public Holiday

Deepavali date is based on the appearance of the moon.
Deepavali is subject to change

Chinese Calendar
Islamic Calendar
Indian Calendar

captainjaypee01 · 2024-01-20T07:40:52Z

I added REPLACEMENT feature when holiday is in Sunday

captainjaypee01 · 2024-01-20T09:54:00Z

Refactor replacement for Sunday holiday. Trying to think if it can implemented in the Holiday class but it seems that not all countries are doing the same process

captainjaypee01 · 2024-01-20T11:23:31Z

I added the Deepavali Holiday using the moon phases. I used the "solaris/php-moon-phase" package to determine the phases of the moon. I based the date using the Indian Calendar in Kartik month

captainjaypee01 · 2024-01-20T19:53:32Z

Rebased to the latest main branch

Nielsvanpach

We have a ChineseCalendar trait you can use: https://github.com/spatie/holidays/blob/main/src/Calendars/ChineseCalendar.php

For the Islamic & Indian calendars, could you use the same reusable approach as the ChineseCalendar trait? Thanks!

Nielsvanpach · 2024-01-27T10:44:47Z

src/Countries/Singapore.php

+    }
+
+    /** @return array<string, string|CarbonImmutable> */
+    protected function replacementForSunday(string $name, int $year, string $input, int $addDays = 0): array


Could you make this name & code more readable, so it's immediately obvious what it does?

I will review on this.

Nielsvanpach · 2024-01-27T10:45:19Z

src/Countries/Singapore.php

+        return (int) $hijriYear;
+    }
+
+    protected function chineseCalendar(string $input, int $year): string


I think you could use the ChineseCalendar trait

I will review on this.

Nielsvanpach · 2024-01-27T10:48:52Z

src/Countries/Singapore.php

+    }
+
+
+    protected function getIslamicFormatter(): IntlDateFormatter


@thecaliskan would you want to help reviewing the Islamic part? Thanks!

@Nielsvanpach I will prepare a script and check it when I am available.

Hi @thecaliskan and @Nielsvanpach I have updated my changes in this branch. You may want to check

Thanks

captainjaypee01 · 2024-01-31T03:11:14Z

Hi @Nielsvanpach, I have added the Islamic Calendar and Indian Calendar and I used the Chinese Calendar Trait.

Regarding Deepavali Date, I didn't include this holiday in the Indian Calendar. I was thinking of adding it but I'm not sure if all countries celebrating the Deepavali Date is the same with Singapore.

For the replacement function I renamed it to "replaceHolidayFallsOnSunday". This function is more on replacing the holidays in Singapore if it falls on Sunday. But if there's a consecutive holidays like in Chinese New Year which falls on Sunday and Monday , the Sunday will move to Tuesday as the replacement. I think not all countries doing this scenario.

captainjaypee01 · 2024-01-31T03:26:49Z

Hi @Nielsvanpach , I'm planning to add a function to check if the holiday is a regular or a replacement holiday.

captainjaypee01 · 2024-02-19T09:47:33Z

Updated the composer.json file to fix the conflict

captainjaypee01 · 2024-02-24T06:33:28Z

Hi @Nielsvanpach , is there anything that I need to add on this PR?

Nielsvanpach

Looks good!
I'm not sure if the IslamicCalendar gives proper results, as it was previously stated this is different from country to country.

Nielsvanpach · 2024-03-22T16:01:22Z

composer.json

-        "nesbot/carbon": "^2.72.1|^3.0"
+        "nesbot/carbon": "^2.72.1|^3.0",
+        "ext-calendar": "*",
+        "solaris/php-moon-phase": "^2.1"


solaris/php-moon-phase can be removed, I think?

I think I used the moon phase for deepavali event as this holiday is based on the moon phases

Nielsvanpach · 2024-03-22T16:03:20Z

src/Countries/Singapore.php

+     * 
+     * @return array<string, string|CarbonImmutable> 
+     */
+    protected function replaceHolidayFallsOnSunday(string $holidayName, int $year, string $input, int $moveDays = 1): array


I think you could use the Observable trait for this

I will convert this to Observable trait

spatie-bot · 2024-09-25T10:08:15Z

Dear contributor,

because this pull request seems to be inactive for quite some time now, I've automatically closed it. If you feel this pull request deserves some attention from my human colleagues feel free to reopen it.

captainjaypee01 force-pushed the add-singapore-holiday branch 3 times, most recently from e0af794 to 182d6d4 Compare January 20, 2024 07:40

captainjaypee01 force-pushed the add-singapore-holiday branch from 182d6d4 to 24ccc25 Compare January 20, 2024 09:51

captainjaypee01 force-pushed the add-singapore-holiday branch from 24ccc25 to db23fee Compare January 20, 2024 11:21

captainjaypee01 force-pushed the add-singapore-holiday branch 3 times, most recently from e84ea1b to 53d268d Compare January 20, 2024 19:50

Nielsvanpach reviewed Jan 27, 2024

View reviewed changes

captainjaypee01 force-pushed the add-singapore-holiday branch from 53d268d to a5a74e3 Compare January 31, 2024 03:06

captainjaypee01 force-pushed the add-singapore-holiday branch from a5a74e3 to 42c322c Compare January 31, 2024 03:14

captainjaypee01 requested a review from Nielsvanpach February 4, 2024 09:05

Add Singapore Holiday

db70b65

captainjaypee01 force-pushed the add-singapore-holiday branch from 42c322c to db70b65 Compare February 19, 2024 09:45

captainjaypee01 requested a review from thecaliskan February 19, 2024 09:47

Nielsvanpach requested changes Mar 22, 2024

View reviewed changes

spatie-bot closed this Sep 25, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Singapore Public Holiday #94

Add Singapore Public Holiday #94

captainjaypee01 commented Jan 18, 2024 •

edited

Loading

captainjaypee01 commented Jan 20, 2024

captainjaypee01 commented Jan 20, 2024

captainjaypee01 commented Jan 20, 2024

captainjaypee01 commented Jan 20, 2024

Nielsvanpach left a comment

Nielsvanpach Jan 27, 2024

captainjaypee01 Jan 31, 2024

Nielsvanpach Jan 27, 2024

captainjaypee01 Jan 31, 2024

Nielsvanpach Jan 27, 2024 •

edited

Loading

thecaliskan Jan 31, 2024

captainjaypee01 Feb 1, 2024

captainjaypee01 commented Jan 31, 2024

captainjaypee01 commented Jan 31, 2024

captainjaypee01 commented Feb 19, 2024

captainjaypee01 commented Feb 24, 2024

Nielsvanpach left a comment

Nielsvanpach Mar 22, 2024

captainjaypee01 May 24, 2024

Nielsvanpach Mar 22, 2024

captainjaypee01 May 24, 2024

spatie-bot commented Sep 25, 2024

		}


		protected function getIslamicFormatter(): IntlDateFormatter

Add Singapore Public Holiday #94

Add Singapore Public Holiday #94

Conversation

captainjaypee01 commented Jan 18, 2024 • edited Loading

Singapore Holidays

Changes

Additional Notes

References:

captainjaypee01 commented Jan 20, 2024

captainjaypee01 commented Jan 20, 2024

captainjaypee01 commented Jan 20, 2024

captainjaypee01 commented Jan 20, 2024

Nielsvanpach left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Nielsvanpach Jan 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

captainjaypee01 commented Jan 31, 2024

captainjaypee01 commented Jan 31, 2024

captainjaypee01 commented Feb 19, 2024

captainjaypee01 commented Feb 24, 2024

Nielsvanpach left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

spatie-bot commented Sep 25, 2024

captainjaypee01 commented Jan 18, 2024 •

edited

Loading

Nielsvanpach Jan 27, 2024 •

edited

Loading