Skip to content
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

Feature/switzerland with regions #173

Conversation

herpaderpaldent
Copy link

@herpaderpaldent herpaderpaldent commented Jan 23, 2024

DRAFT: Switzerland with cantons (regions)

this proof of concept is extending @Martin-Welte's work #49.

Additional information

this pull request adds:

i hope i can get some feedback whether either of the implementations are considered valid to move forward or adapt?

patressz and others added 30 commits January 18, 2024 21:19
Co-authored-by: matusk <[email protected]>
Co-authored-by: matusk <[email protected]>
Co-authored-by: matusk <[email protected]>
not using this for country and year either
* Adding Colombia Holidays

Added the Colombia's holidays. There's a situation with some holidays due to the "Emiliany Law" they are moved to the following monday.

* Adding Colombia Holidays

Added the Colombia's holidays. There's a situation with some holidays due to the "Emiliany Law" they are moved to the following monday.

* Update Colombia.php

Deleted the line as suggested by @Nielsvanpach

* Update Colombia.php

* Added changes to Colombia.php and to the test file

- Suggestions from @luisprmat were incorporated.
- All the work of emiliani holiday generation was included into the emilianiHoliday method to achieve code readability
- The order of the holidays was updated to ensure that the next emiliani holiday that appears can be included at the end of the list.
- The test was updated because it's "colombian holidays" not "colombia holidays"
Nielsvanpach and others added 16 commits January 24, 2024 12:44
* Add holidays for Finland

* Use createFromDate instead of create

* Add holidays for Finland in Swedish
* Add Japan country support

* Tested: it can calculate japanese holidays → Snapshot created
* Add Serbian holidays

* Calculate orthodox easter

* Improve phpstan

* Fix test

* Expand list with Christmas and Easter
* add El Salvador holidays

* fix styling
…into feature/switzerland-with-regions

# Conflicts:
#	src/Countries/Switzerland.php
#	tests/Countries/SwitzerlandTest.php
@Nielsvanpach
Copy link
Member

I think something went wrong with rebasing, there shouldn't be commits of others in this PR

@herpaderpaldent
Copy link
Author

I think something went wrong with rebasing, there shouldn't be commits of others in this PR

Oh gosh yes. I was too tired yesterday to fix it xD. Very sorry you have to witness this massacre

@Nielsvanpach
Copy link
Member

Nielsvanpach commented Jan 29, 2024

Thanks for your work, but a PR for Switzerland has already been merged. Feel free to send a new PR with fixes to the current implementation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.