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

Add Estonian holidays #47

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Add Estonian holidays #47

merged 2 commits into from
Jan 19, 2024

Conversation

hulkur
Copy link
Contributor

@hulkur hulkur commented Jan 17, 2024

Copy link
Member

@Nielsvanpach Nielsvanpach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Coul you rebase on our main branch, that way we can run the tests.

return 'ee';
}

/** @return array<string, string|CarbonImmutable> */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be removed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

/** @return array<string, CarbonImmutable> */
protected function variableHolidays(int $year): array
{
$easter = CarbonImmutable::createFromTimestamp(easter_date($year))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use $this->easter($year) instead. Only available after rebasing your branch on our main branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@hulkur
Copy link
Contributor Author

hulkur commented Jan 19, 2024

rebased, north macedonia test fails

@Nielsvanpach Nielsvanpach merged commit aad7d49 into spatie:main Jan 19, 2024
8 checks passed
@Nielsvanpach
Copy link
Member

Thanks!

Crawford30 pushed a commit to Crawford30/holidays that referenced this pull request Jan 19, 2024
* Add Estonian holidays

* Use easter() method for easter date
ssmusoke pushed a commit to ssmusoke/holidays that referenced this pull request Jan 20, 2024
* Add Estonian holidays

* Use easter() method for easter date
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.

None yet

2 participants