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.

Sign up for GitHub

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

Jump to bottom

Added support for New Zealand #13

Merged
merged 21 commits into from
Apr 9, 2016
Merged

Added support for New Zealand #13

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
da46215
Adding base New Zealand holiday provider
badams Apr 6, 2016
19b67cb
Adding tests for ANZAC day, fixed ANZAC start date and "Mondayisation"
badams Apr 6, 2016
eba6df9
Fixing start date of Queens birthdat celebration
badams Apr 6, 2016
7ec4151
Adding tests for Queens Birthday
badams Apr 6, 2016
42e9b0a
Adding Tests for Labour Day
badams Apr 6, 2016
477929e
Adding NewZealand testsuite config
badams Apr 6, 2016
f06d7f6
Updating Waitangi Day calculation and adding tests
badams Apr 6, 2016
535f0b9
Adding NotHoliday tests to national holidays
badams Apr 6, 2016
2db27f3
Merge branch 'master' into new_zealand_holiday_provider
badams Apr 6, 2016
90822be
Refactored New Year Holidays, Adding tests
badams Apr 6, 2016
1817028
Refactoring xmas holiday calculations and added tests.
badams Apr 6, 2016
ff95546
cleaned up NewZealand::calculateNewYearHolidays()
badams Apr 6, 2016
c02f284
updating doc blocks
badams Apr 6, 2016
b84a8a5
More tests
badams Apr 6, 2016
e092a68
Adding translations for unique holiday names
badams Apr 7, 2016
b3b0f27
Merging upstream changes
badams Apr 7, 2016
21a402d
Replacing hardcoded list of ANZAC dates
badams Apr 7, 2016
07010c2
Refactoring HolidayDataProvider implementations in NZ test suite
badams Apr 7, 2016
4c89184
Merging changes from upstream
badams Apr 7, 2016
4537cb7
Merge branch 'master' into new_zealand_holiday_provider
badams Apr 8, 2016
8b42aa6
Code style fixes
badams Apr 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 15 additions & 101 deletions tests/NewZealand/AnzacDayTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,106 +67,20 @@ public function testTranslation()
*/
public function HolidayDataProvider()
{
return [
['2148', '2148-04-25'],
['2002', '2002-04-25'],
['2105', '2105-04-27'],
['2065', '2065-04-27'],
['2052', '2052-04-25'],
['2039', '2039-04-25'],
['2047', '2047-04-25'],
['2117', '2117-04-26'],
['2122', '2122-04-27'],
['2007', '2007-04-25'],
['2089', '2089-04-25'],
['2063', '2063-04-25'],
['1992', '1992-04-25'],
['1931', '1931-04-25'],
['1941', '1941-04-25'],
['1935', '1935-04-25'],
['2044', '2044-04-25'],
['2069', '2069-04-25'],
['2101', '2101-04-25'],
['2086', '2086-04-25'],
['2094', '2094-04-26'],
['2012', '2012-04-25'],
['2082', '2082-04-27'],
['2028', '2028-04-25'],
['1934', '1934-04-25'],
['2121', '2121-04-25'],
['2107', '2107-04-25'],
['2019', '2019-04-25'],
['1999', '1999-04-25'],
['2058', '2058-04-25'],
['2033', '2033-04-25'],
['2079', '2079-04-25'],
['2069', '2069-04-25'],
['2079', '2079-04-25'],
['2105', '2105-04-27'],
['2109', '2109-04-25'],
['2065', '2065-04-27'],
['2076', '2076-04-27'],
['2017', '2017-04-25'],
['2079', '2079-04-25'],
['1963', '1963-04-25'],
['2019', '2019-04-25'],
['2109', '2109-04-25'],
['2077', '2077-04-26'],
['2058', '2058-04-25'],
['2120', '2120-04-25'],
['1960', '1960-04-25'],
['2093', '2093-04-27'],
['2011', '2011-04-25'],
['2106', '2106-04-26'],
['1946', '1946-04-25'],
['1995', '1995-04-25'],
['2005', '2005-04-25'],
['1932', '1932-04-25'],
['2030', '2030-04-25'],
['2124', '2124-04-25'],
['1980', '1980-04-25'],
['1962', '1962-04-25'],
['2136', '2136-04-25'],
['2017', '2017-04-25'],
['2098', '2098-04-25'],
['2015', '2015-04-27'],
['2016', '2016-04-25'],
['2069', '2069-04-25'],
['2102', '2102-04-25'],
['2044', '2044-04-25'],
['2008', '2008-04-25'],
['2045', '2045-04-25'],
['2093', '2093-04-27'],
['2084', '2084-04-25'],
['2052', '2052-04-25'],
['2136', '2136-04-25'],
['2034', '2034-04-25'],
['2033', '2033-04-25'],
['1924', '1924-04-25'],
['1977', '1977-04-25'],
['2024', '2024-04-25'],
['2095', '2095-04-25'],
['2087', '2087-04-25'],
['2117', '2117-04-26'],
['2003', '2003-04-25'],
['2116', '2116-04-27'],
['1986', '1986-04-25'],
['1968', '1968-04-25'],
['2068', '2068-04-25'],
['2007', '2007-04-25'],
['2068', '2068-04-25'],
['2095', '2095-04-25'],
['2013', '2013-04-25'],
['1986', '1986-04-25'],
['2032', '2032-04-26'],
['1925', '1925-04-25'],
['1969', '1969-04-25'],
['2063', '2063-04-25'],
['2043', '2043-04-27'],
['2009', '2009-04-25'],
['1939', '1939-04-25'],
['2031', '2031-04-25'],
['1929', '1929-04-25'],
];
$data = [];

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@stelgenhof does this look okay?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, looks great! BTW There have been some new commits after your created this PR, so might want to sync up your PR :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok I'll update the rest of the tests

for ($i = 0; $i < 100; $i++) {
$year = $this->generateRandomYear(1921, 2100);
$date = new DateTime("$year-04-25", new DateTimeZone(self::TIMEZONE));

// in 2015 some policy was introduced to make sure this holiday was celebrated during the working week.
if ($year >= 2015 && in_array($date->format('w'), [0, 6])) {
$date->modify('next monday');
}

$data[] = [$year, $date->format('Y-m-d')];
}

return $data;
}
}