Albanian National Holidays #157

MirilTerolli · 2024-01-22T01:33:19Z

Official Albanian holidays, as documented by the Albanian government portal https://e-albania.al/Pages/OfficialHolidays.aspx
Includes tentative dates for Eid al-Fitr and Eid al-Adha holidays until 2034, because the dates are not static.

- Add Albanian national holidays including tentative dates for islamic holidays that are TBD. - Test coverage.

- Add test coverage for holidays with standard dates.

- Add empty line in the end of the testing file.

- Fix empty line warning in the end of the file.

- Fix php stan error.

fitimvata · 2024-01-23T20:09:30Z

src/Countries/Albania.php

+            'Dita e Pavarësisë' => '11-28',
+            'Dita e Çlirimit' => '11-29',
+            'Dita Kombëtare e Rinisë' => '12-08',
+            'Krishtlindjet' => '12-25',


@MirilTerolli Krishtlindjet should be Krishtlindja

@fitimvata it's done.

Nielsvanpach · 2024-01-24T15:23:18Z

In case you want to add multi language support: https://github.com/spatie/holidays/tree/main/lang

- Translation for German, English, Spanish, French, Greek, Italian, Portughese, Russian, Turkish.

MirilTerolli · 2024-01-28T00:17:54Z

In case you want to add multi language support: https://github.com/spatie/holidays/tree/main/lang

Good idea @Nielsvanpach , it's done! 👍

Nielsvanpach · 2024-01-29T09:56:27Z

src/Countries/Albania.php

+            2032 => '01-14',
+            2033 => '01-02',
+            2034 => '12-12',
+            default => '01-01' // Temporary placeholder; requires ongoing maintenance.


I would throw an exception by default and make sure we don't return false data

@Nielsvanpach , that would be a good idea, but this would prevent other standard holidays from not being displayed in case if we run something like this Holidays::for(country: "al", year: 2035)->get(); 🤷‍♂️

Nielsvanpach · 2024-01-29T09:56:51Z

src/Countries/Albania.php

+            2032 => '03-22',
+            2033 => '03-12',
+            2034 => '03-01',
+            default => '01-01' // Temporary placeholder; requires ongoing maintenance.


I would throw an exception by default and make sure we don't return false data

@Nielsvanpach as mentioned above, throwing an exception will prevent the standard holidays from being displayed.
I wonder if this is what we want.

If we can't provide valid data, I prefer to throw an exception.

fitimvata

@MirilTerolli I personally would do something like requested changes. Return null from getEidAlFitrHoliday and getEidAlAdhaHoliday and filter array in variableHolidays

fitimvata · 2024-01-30T09:31:19Z

src/Countries/Albania.php

+    /**
+     * 
+     */
+    private function getEidAlFitrHoliday(int $year): string


Suggested change

private function getEidAlFitrHoliday(int $year): string

private function getEidAlFitrHoliday(int $year): ?string

@fitimvata that could work as well, changes pushed.

fitimvata · 2024-01-30T09:31:46Z

src/Countries/Albania.php

+            2032 => '01-14',
+            2033 => '01-02',
+            2034 => '12-12',
+            default => '01-01' // Temporary placeholder; requires ongoing maintenance.


Suggested change

default => '01-01' // Temporary placeholder; requires ongoing maintenance.

default => null // Temporary placeholder; requires ongoing maintenance.

@fitimvata pushed.

fitimvata · 2024-01-30T09:32:06Z

src/Countries/Albania.php

+        };
+    }
+
+    private function getEidAlAdhaHoliday(int $year): string


Suggested change

private function getEidAlAdhaHoliday(int $year): string

private function getEidAlAdhaHoliday(int $year): ?string

@fitimvata changes pushed.

fitimvata · 2024-01-30T09:32:18Z

src/Countries/Albania.php

+            2032 => '03-22',
+            2033 => '03-12',
+            2034 => '03-01',
+            default => '01-01' // Temporary placeholder; requires ongoing maintenance.


Suggested change

default => '01-01' // Temporary placeholder; requires ongoing maintenance.

default => null // Temporary placeholder; requires ongoing maintenance.

@fitimvata pushed.

fitimvata · 2024-01-30T09:32:57Z

src/Countries/Albania.php

+    /** @return array<string, CarbonImmutable|string> */
+    protected function variableHolidays(int $year): array
+    {
+        return [


Suggested change

return [

return array_filter([

fitimvata · 2024-01-30T09:33:12Z

src/Countries/Albania.php

+            'E diela e Pashkëve Ortodokse' => $this->orthodoxEaster($year),
+            'Dita e Bajramit të Madh' => $this->getEidAlFitrHoliday($year),
+            'Dita e Kurban Bajramit' => $this->getEidAlAdhaHoliday($year),
+        ];


Suggested change

];

]);

… year.

MirilT added 5 commits January 21, 2024 19:35

Albanian National Holidays

3926bee

- Add Albanian national holidays including tentative dates for islamic holidays that are TBD. - Test coverage.

Albanian National Holidays

0cfd45c

- Add test coverage for holidays with standard dates.

Enhancements

97486d0

- Add empty line in the end of the testing file.

Enhancements

565f580

- Fix empty line warning in the end of the file.

Fixes

c5cf0e8

- Fix php stan error.

fitimvata suggested changes Jan 23, 2024

View reviewed changes

Fix holiday TYPO.

384dc3a

Language support

2042fd6

- Translation for German, English, Spanish, French, Greek, Italian, Portughese, Russian, Turkish.

Nielsvanpach reviewed Jan 29, 2024

View reviewed changes

fitimvata suggested changes Jan 30, 2024

View reviewed changes

Filter out some variable holidays when they are not set for the given…

41a01b1

… year.

fitimvata approved these changes Jan 31, 2024

View reviewed changes

Nielsvanpach merged commit feda8ec into spatie:main Jan 31, 2024
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Albanian National Holidays #157

Albanian National Holidays #157

MirilTerolli commented Jan 22, 2024 •

edited

Loading

fitimvata Jan 23, 2024

MirilTerolli Jan 23, 2024

Nielsvanpach commented Jan 24, 2024

MirilTerolli commented Jan 28, 2024

Nielsvanpach Jan 29, 2024

MirilTerolli Jan 29, 2024

Nielsvanpach Jan 29, 2024

MirilTerolli Jan 29, 2024

Nielsvanpach Jan 30, 2024

fitimvata left a comment

fitimvata Jan 30, 2024

MirilTerolli Jan 30, 2024

fitimvata Jan 30, 2024

MirilTerolli Jan 30, 2024

fitimvata Jan 30, 2024

MirilTerolli Jan 30, 2024

fitimvata Jan 30, 2024

MirilTerolli Jan 30, 2024

fitimvata Jan 30, 2024

fitimvata Jan 30, 2024

	private function getEidAlFitrHoliday(int $year): string
	private function getEidAlFitrHoliday(int $year): ?string

	default => '01-01' // Temporary placeholder; requires ongoing maintenance.
	default => null // Temporary placeholder; requires ongoing maintenance.

	private function getEidAlAdhaHoliday(int $year): string
	private function getEidAlAdhaHoliday(int $year): ?string

Albanian National Holidays #157

Albanian National Holidays #157

Conversation

MirilTerolli commented Jan 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Nielsvanpach commented Jan 24, 2024

MirilTerolli commented Jan 28, 2024

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

fitimvata 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

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

Choose a reason for hiding this comment

MirilTerolli commented Jan 22, 2024 •

edited

Loading