From d06ce02e23efa8e4c57137a799079ad57c486080 Mon Sep 17 00:00:00 2001 From: Sacha Telgenhof Date: Wed, 10 Apr 2024 14:49:09 +0000 Subject: [PATCH] style: fix code styling and formatting issues (#338) Using the latest version of the PHP CS configuration, update all source code to use the most recent code style and formatting rules. For the most part this updates the header comment and the strict type declaration. It should not have any affect on the working of the tests nor the main code. Signed-off-by: Sacha Telgenhof --- .php-cs-fixer.php | 14 ++++++-- composer.json | 3 +- examples/basic.php | 33 +++++++++++++------ examples/between_filter.php | 25 ++++++++++---- examples/custom_provider.php | 21 +++++++++--- examples/filters.php | 19 +++++++++-- phpinsights.php | 15 ++++++++- rector.php | 19 +++++++++-- src/Yasumi/Exception/Exception.php | 8 +++-- src/Yasumi/Exception/InvalidYearException.php | 8 +++-- .../Exception/MissingTranslationException.php | 8 +++-- .../Exception/ProviderNotFoundException.php | 8 +++-- .../Exception/UnknownLocaleException.php | 8 +++-- src/Yasumi/Filters/AbstractFilter.php | 8 +++-- src/Yasumi/Filters/BankHolidaysFilter.php | 8 +++-- src/Yasumi/Filters/BetweenFilter.php | 8 +++-- src/Yasumi/Filters/ObservedHolidaysFilter.php | 8 +++-- src/Yasumi/Filters/OfficialHolidaysFilter.php | 8 +++-- src/Yasumi/Filters/OnFilter.php | 8 +++-- src/Yasumi/Filters/OtherHolidaysFilter.php | 8 +++-- src/Yasumi/Filters/SeasonalHolidaysFilter.php | 8 +++-- src/Yasumi/Holiday.php | 10 +++--- src/Yasumi/Provider/AbstractProvider.php | 8 +++-- src/Yasumi/Provider/Argentina.php | 8 +++-- src/Yasumi/Provider/Australia.php | 8 +++-- .../Australia/AustralianCapitalTerritory.php | 14 ++++---- .../Provider/Australia/NewSouthWales.php | 12 ++++--- .../Provider/Australia/NorthernTerritory.php | 12 ++++--- src/Yasumi/Provider/Australia/Queensland.php | 12 ++++--- .../Australia/Queensland/Brisbane.php | 10 +++--- .../Provider/Australia/SouthAustralia.php | 14 ++++---- src/Yasumi/Provider/Australia/Tasmania.php | 12 ++++--- .../Australia/Tasmania/CentralNorth.php | 10 +++--- .../Australia/Tasmania/FlindersIsland.php | 10 +++--- .../Australia/Tasmania/KingIsland.php | 10 +++--- .../Provider/Australia/Tasmania/Northeast.php | 10 +++--- .../Provider/Australia/Tasmania/Northwest.php | 10 +++--- .../Tasmania/Northwest/CircularHead.php | 10 +++--- .../Provider/Australia/Tasmania/South.php | 10 +++--- .../Australia/Tasmania/South/Southeast.php | 10 +++--- src/Yasumi/Provider/Australia/Victoria.php | 12 ++++--- .../Provider/Australia/WesternAustralia.php | 12 ++++--- src/Yasumi/Provider/Austria.php | 12 ++++--- src/Yasumi/Provider/Austria/Burgenland.php | 8 +++-- src/Yasumi/Provider/Austria/Carinthia.php | 10 +++--- src/Yasumi/Provider/Austria/LowerAustria.php | 8 +++-- src/Yasumi/Provider/Austria/Salzburg.php | 10 +++--- src/Yasumi/Provider/Austria/Styria.php | 8 +++-- src/Yasumi/Provider/Austria/Tyrol.php | 8 +++-- src/Yasumi/Provider/Austria/UpperAustria.php | 10 +++--- src/Yasumi/Provider/Austria/Vienna.php | 8 +++-- src/Yasumi/Provider/Austria/Vorarlberg.php | 8 +++-- src/Yasumi/Provider/Belgium.php | 8 +++-- src/Yasumi/Provider/Bosnia.php | 8 +++-- src/Yasumi/Provider/Brazil.php | 8 +++-- src/Yasumi/Provider/Canada.php | 12 ++++--- src/Yasumi/Provider/Canada/Alberta.php | 8 +++-- .../Provider/Canada/BritishColumbia.php | 8 +++-- src/Yasumi/Provider/Canada/Manitoba.php | 8 +++-- src/Yasumi/Provider/Canada/NewBrunswick.php | 8 +++-- .../Canada/NewfoundlandAndLabrador.php | 12 ++++--- .../Provider/Canada/NorthwestTerritories.php | 8 +++-- src/Yasumi/Provider/Canada/NovaScotia.php | 8 +++-- src/Yasumi/Provider/Canada/Nunavut.php | 8 +++-- src/Yasumi/Provider/Canada/Ontario.php | 8 +++-- .../Provider/Canada/PrinceEdwardIsland.php | 8 +++-- src/Yasumi/Provider/Canada/Quebec.php | 8 +++-- src/Yasumi/Provider/Canada/Saskatchewan.php | 8 +++-- src/Yasumi/Provider/Canada/Yukon.php | 8 +++-- src/Yasumi/Provider/ChristianHolidays.php | 10 +++--- src/Yasumi/Provider/CommonHolidays.php | 8 +++-- src/Yasumi/Provider/Croatia.php | 8 +++-- src/Yasumi/Provider/CzechRepublic.php | 20 ++++++----- src/Yasumi/Provider/DateTimeZoneFactory.php | 8 +++-- src/Yasumi/Provider/Denmark.php | 8 +++-- src/Yasumi/Provider/Estonia.php | 8 +++-- src/Yasumi/Provider/Finland.php | 8 +++-- src/Yasumi/Provider/France.php | 8 +++-- src/Yasumi/Provider/France/BasRhin.php | 8 +++-- src/Yasumi/Provider/France/HautRhin.php | 8 +++-- src/Yasumi/Provider/France/Moselle.php | 8 +++-- src/Yasumi/Provider/Georgia.php | 8 +++-- src/Yasumi/Provider/Germany.php | 10 +++--- .../Provider/Germany/BadenWurttemberg.php | 8 +++-- src/Yasumi/Provider/Germany/Berlin.php | 9 +++-- src/Yasumi/Provider/Germany/Brandenburg.php | 9 +++-- src/Yasumi/Provider/Germany/Bremen.php | 9 +++-- src/Yasumi/Provider/Germany/Hamburg.php | 9 +++-- src/Yasumi/Provider/Germany/Hesse.php | 9 +++-- src/Yasumi/Provider/Germany/LowerSaxony.php | 9 +++-- .../Germany/MecklenburgWesternPomerania.php | 9 +++-- .../Provider/Germany/NorthRhineWestphalia.php | 9 +++-- .../Provider/Germany/RhinelandPalatinate.php | 9 +++-- src/Yasumi/Provider/Germany/Saarland.php | 9 +++-- src/Yasumi/Provider/Germany/Saxony.php | 9 +++-- src/Yasumi/Provider/Germany/SaxonyAnhalt.php | 9 +++-- .../Provider/Germany/SchleswigHolstein.php | 9 +++-- src/Yasumi/Provider/Germany/Thuringia.php | 9 +++-- src/Yasumi/Provider/Greece.php | 8 +++-- src/Yasumi/Provider/Hungary.php | 8 +++-- src/Yasumi/Provider/Ireland.php | 14 ++++---- src/Yasumi/Provider/Italy.php | 8 +++-- src/Yasumi/Provider/Japan.php | 10 +++--- src/Yasumi/Provider/Latvia.php | 8 +++-- src/Yasumi/Provider/Lithuania.php | 8 +++-- src/Yasumi/Provider/Luxembourg.php | 15 ++++++++- src/Yasumi/Provider/Mexico.php | 6 ++-- src/Yasumi/Provider/Netherlands.php | 8 +++-- src/Yasumi/Provider/NewZealand.php | 10 +++--- src/Yasumi/Provider/Norway.php | 8 +++-- src/Yasumi/Provider/Poland.php | 8 +++-- src/Yasumi/Provider/Portugal.php | 8 +++-- src/Yasumi/Provider/Romania.php | 12 ++++--- src/Yasumi/Provider/Russia.php | 10 +++--- src/Yasumi/Provider/Slovakia.php | 20 ++++++----- src/Yasumi/Provider/SouthAfrica.php | 20 ++++++----- src/Yasumi/Provider/SouthKorea.php | 10 +++--- src/Yasumi/Provider/Spain.php | 8 +++-- src/Yasumi/Provider/Spain/Andalusia.php | 9 +++-- src/Yasumi/Provider/Spain/Aragon.php | 9 +++-- src/Yasumi/Provider/Spain/Asturias.php | 9 +++-- src/Yasumi/Provider/Spain/BalearicIslands.php | 9 +++-- src/Yasumi/Provider/Spain/BasqueCountry.php | 9 +++-- src/Yasumi/Provider/Spain/CanaryIslands.php | 9 +++-- src/Yasumi/Provider/Spain/Cantabria.php | 9 +++-- src/Yasumi/Provider/Spain/CastileAndLeon.php | 8 +++-- .../Provider/Spain/CastillaLaMancha.php | 8 +++-- src/Yasumi/Provider/Spain/Catalonia.php | 9 +++-- src/Yasumi/Provider/Spain/Ceuta.php | 9 +++-- .../Provider/Spain/CommunityOfMadrid.php | 9 +++-- src/Yasumi/Provider/Spain/Extremadura.php | 9 +++-- src/Yasumi/Provider/Spain/Galicia.php | 9 +++-- src/Yasumi/Provider/Spain/LaRioja.php | 9 +++-- src/Yasumi/Provider/Spain/Melilla.php | 9 +++-- src/Yasumi/Provider/Spain/RegionOfMurcia.php | 9 +++-- .../Provider/Spain/ValencianCommunity.php | 9 +++-- src/Yasumi/Provider/Sweden.php | 8 +++-- src/Yasumi/Provider/Switzerland.php | 16 +++++---- src/Yasumi/Provider/Switzerland/Aargau.php | 9 +++-- .../Switzerland/AppenzellAusserrhoden.php | 9 +++-- .../Switzerland/AppenzellInnerrhoden.php | 9 +++-- .../Provider/Switzerland/BaselLandschaft.php | 9 +++-- .../Provider/Switzerland/BaselStadt.php | 9 +++-- src/Yasumi/Provider/Switzerland/Bern.php | 9 +++-- src/Yasumi/Provider/Switzerland/Fribourg.php | 11 ++++--- src/Yasumi/Provider/Switzerland/Geneva.php | 13 +++++--- src/Yasumi/Provider/Switzerland/Glarus.php | 11 ++++--- src/Yasumi/Provider/Switzerland/Grisons.php | 9 +++-- src/Yasumi/Provider/Switzerland/Jura.php | 11 ++++--- src/Yasumi/Provider/Switzerland/Lucerne.php | 9 +++-- src/Yasumi/Provider/Switzerland/Neuchatel.php | 15 +++++---- src/Yasumi/Provider/Switzerland/Nidwalden.php | 9 +++-- src/Yasumi/Provider/Switzerland/Obwalden.php | 13 +++++--- .../Provider/Switzerland/Schaffhausen.php | 9 +++-- src/Yasumi/Provider/Switzerland/Schwyz.php | 9 +++-- src/Yasumi/Provider/Switzerland/Solothurn.php | 9 +++-- src/Yasumi/Provider/Switzerland/StGallen.php | 9 +++-- src/Yasumi/Provider/Switzerland/Thurgau.php | 9 +++-- src/Yasumi/Provider/Switzerland/Ticino.php | 11 ++++--- src/Yasumi/Provider/Switzerland/Uri.php | 9 +++-- src/Yasumi/Provider/Switzerland/Valais.php | 9 +++-- src/Yasumi/Provider/Switzerland/Vaud.php | 9 +++-- src/Yasumi/Provider/Switzerland/Zug.php | 9 +++-- src/Yasumi/Provider/Switzerland/Zurich.php | 9 +++-- src/Yasumi/Provider/Turkey.php | 8 +++-- src/Yasumi/Provider/USA.php | 10 +++--- src/Yasumi/Provider/Ukraine.php | 8 +++-- src/Yasumi/Provider/UnitedKingdom.php | 8 +++-- src/Yasumi/Provider/UnitedKingdom/England.php | 9 +++-- .../UnitedKingdom/NorthernIreland.php | 13 +++++--- .../Provider/UnitedKingdom/Scotland.php | 11 ++++--- src/Yasumi/Provider/UnitedKingdom/Wales.php | 9 +++-- src/Yasumi/ProviderInterface.php | 8 +++-- src/Yasumi/SubstituteHoliday.php | 10 +++--- src/Yasumi/Translations.php | 14 ++++---- src/Yasumi/TranslationsInterface.php | 8 +++-- src/Yasumi/Yasumi.php | 14 ++++---- src/Yasumi/data/locales.php | 9 +++-- src/Yasumi/data/translations/allSaintsDay.php | 8 +++-- src/Yasumi/data/translations/allSaintsEve.php | 8 +++-- src/Yasumi/data/translations/allSoulsDay.php | 8 +++-- src/Yasumi/data/translations/annunciation.php | 8 +++-- src/Yasumi/data/translations/anzacDay.php | 8 +++-- src/Yasumi/data/translations/armisticeDay.php | 8 +++-- src/Yasumi/data/translations/ascensionDay.php | 8 +++-- src/Yasumi/data/translations/ashWednesday.php | 8 +++-- .../data/translations/assumptionOfMary.php | 8 +++-- src/Yasumi/data/translations/australiaDay.php | 8 +++-- src/Yasumi/data/translations/canadaDay.php | 8 +++-- .../translations/carnationRevolutionDay.php | 8 +++-- src/Yasumi/data/translations/christmasDay.php | 8 +++-- src/Yasumi/data/translations/christmasEve.php | 8 +++-- src/Yasumi/data/translations/civicHoliday.php | 8 +++-- .../data/translations/corpusChristi.php | 8 +++-- .../data/translations/dayAfterNewYearsDay.php | 8 +++-- .../data/translations/dayOfLiberation.php | 9 +++-- .../data/translations/dayOfReformation.php | 8 +++-- src/Yasumi/data/translations/discoveryDay.php | 8 +++-- src/Yasumi/data/translations/easter.php | 8 +++-- src/Yasumi/data/translations/easterMonday.php | 8 +++-- src/Yasumi/data/translations/epiphany.php | 8 +++-- src/Yasumi/data/translations/epiphanyEve.php | 8 +++-- src/Yasumi/data/translations/familyDay.php | 8 +++-- src/Yasumi/data/translations/fathersDay.php | 8 +++-- .../data/translations/goldCupParadeDay.php | 8 +++-- src/Yasumi/data/translations/goodFriday.php | 8 +++-- src/Yasumi/data/translations/heritageDay.php | 8 +++-- .../translations/immaculateConception.php | 8 +++-- .../translations/internationalWomensDay.php | 8 +++-- .../translations/internationalWorkersDay.php | 8 +++-- src/Yasumi/data/translations/islanderDay.php | 8 +++-- src/Yasumi/data/translations/labourDay.php | 8 +++-- src/Yasumi/data/translations/louisRielDay.php | 8 +++-- .../data/translations/maundyThursday.php | 8 +++-- src/Yasumi/data/translations/mothersDay.php | 8 +++-- src/Yasumi/data/translations/natalHoliday.php | 8 +++-- .../nationalIndigenousPeoplesDay.php | 8 +++-- .../data/translations/nationalPatriotsDay.php | 8 +++-- src/Yasumi/data/translations/newYearsDay.php | 8 +++-- src/Yasumi/data/translations/newYearsEve.php | 8 +++-- .../translations/novaScotiaHeritageDay.php | 8 +++-- .../data/translations/orangemensDay.php | 8 +++-- src/Yasumi/data/translations/pentecost.php | 8 +++-- .../data/translations/pentecostMonday.php | 8 +++-- .../data/translations/plebisciteDay.php | 8 +++-- src/Yasumi/data/translations/portugalDay.php | 8 +++-- .../translations/portugueseRepublicDay.php | 8 +++-- .../data/translations/queensBirthday.php | 8 +++-- .../data/translations/reformationDay.php | 8 +++-- .../data/translations/remembranceDay.php | 8 +++-- .../translations/restorationOfIndepence.php | 8 +++-- .../translations/saintJeanBaptisteDay.php | 8 +++-- .../data/translations/saskatchewanDay.php | 8 +++-- .../data/translations/secondChristmasDay.php | 8 +++-- .../data/translations/secondNewYearsDay.php | 8 +++-- src/Yasumi/data/translations/stAndrewsDay.php | 8 +++-- src/Yasumi/data/translations/stDavidsDay.php | 8 +++-- .../data/translations/stFloriansDay.php | 8 +++-- src/Yasumi/data/translations/stGeorgesDay.php | 8 +++-- src/Yasumi/data/translations/stJohnsDay.php | 8 +++-- src/Yasumi/data/translations/stJohnsEve.php | 8 +++-- src/Yasumi/data/translations/stJosephsDay.php | 8 +++-- .../data/translations/stLeopoldsDay.php | 8 +++-- src/Yasumi/data/translations/stMartinsDay.php | 8 +++-- src/Yasumi/data/translations/stRupertsDay.php | 8 +++-- .../data/translations/stStephensDay.php | 8 +++-- .../data/translations/substituteHoliday.php | 8 +++-- src/Yasumi/data/translations/summerTime.php | 8 +++-- src/Yasumi/data/translations/terryFoxDay.php | 8 +++-- .../data/translations/thanksgivingDay.php | 8 +++-- .../truthAndReconciliationDay.php | 8 +++-- .../data/translations/valentinesDay.php | 8 +++-- src/Yasumi/data/translations/victoriaDay.php | 8 +++-- .../data/translations/victoryInEuropeDay.php | 8 +++-- src/Yasumi/data/translations/waitangiDay.php | 8 +++-- src/Yasumi/data/translations/walpurgisEve.php | 8 +++-- src/Yasumi/data/translations/winterTime.php | 8 +++-- .../data/translations/worldAnimalDay.php | 8 +++-- .../data/translations/yukonHeritageDay.php | 8 +++-- tests/Argentina/ArgentinaBaseTestCase.php | 9 +++-- tests/Argentina/ArgentinaTest.php | 9 +++-- tests/Argentina/CarnavalMondayTest.php | 9 +++-- tests/Argentina/CarnavalTuesdayTest.php | 9 +++-- tests/Argentina/ChristmasDayTest.php | 9 +++-- tests/Argentina/EasterTest.php | 9 +++-- tests/Argentina/FlagDayTest.php | 9 +++-- .../Argentina/GeneralJoseSanMartinDayTest.php | 9 +++-- .../GeneralMartinMigueldeGuemesDayTest.php | 9 +++-- tests/Argentina/GoodFridayTest.php | 9 +++-- .../Argentina/ImmaculateConceptionDayTest.php | 9 +++-- tests/Argentina/IndependenceDayTest.php | 9 +++-- .../Argentina/InternationalWorkersDayTest.php | 9 +++-- tests/Argentina/MalvinasDayTest.php | 9 +++-- tests/Argentina/MayRevolutionTest.php | 9 +++-- .../Argentina/NationalSovereigntyDayTest.php | 9 +++-- tests/Argentina/NewYearsDayTest.php | 9 +++-- tests/Argentina/RaceDayTest.php | 9 +++-- tests/Argentina/RemembranceDayTest.php | 9 +++-- tests/Australia/AnzacDayTest.php | 9 +++-- tests/Australia/AustraliaBaseTestCase.php | 9 +++-- tests/Australia/AustraliaDayTest.php | 9 +++-- tests/Australia/AustraliaTest.php | 9 +++-- .../AnzacDayTest.php | 9 +++-- .../AustraliaDayTest.php | 9 +++-- ...AustralianCapitalTerritoryBaseTestCase.php | 9 +++-- .../AustralianCapitalTerritoryTest.php | 9 +++-- .../BoxingDayTest.php | 9 +++-- .../CanberraDayTest.php | 9 +++-- .../ChristmasDayTest.php | 9 +++-- .../EasterMondayTest.php | 9 +++-- .../EasterSaturdayTest.php | 9 +++-- .../EasterSundayTest.php | 9 +++-- .../GoodFridayTest.php | 9 +++-- .../LabourDayTest.php | 9 +++-- .../NationalDayOfMourningTest.php | 9 +++-- .../NewYearsDayTest.php | 9 +++-- .../QueensBirthdayTest.php | 9 +++-- .../ReconciliationDayTest.php | 9 +++-- tests/Australia/BoxingDayTest.php | 9 +++-- tests/Australia/ChristmasDayTest.php | 9 +++-- tests/Australia/EasterMondayTest.php | 9 +++-- tests/Australia/GoodFridayTest.php | 9 +++-- tests/Australia/NationalDayOfMourningTest.php | 9 +++-- .../Australia/NewSouthWales/AnzacDayTest.php | 9 +++-- .../NewSouthWales/AustraliaDayTest.php | 9 +++-- .../NewSouthWales/BankHolidayTest.php | 9 +++-- .../Australia/NewSouthWales/BoxingDayTest.php | 9 +++-- .../NewSouthWales/ChristmasDayTest.php | 9 +++-- .../NewSouthWales/EasterMondayTest.php | 9 +++-- .../NewSouthWales/EasterSaturdayTest.php | 9 +++-- .../NewSouthWales/EasterSundayTest.php | 9 +++-- .../NewSouthWales/GoodFridayTest.php | 9 +++-- .../Australia/NewSouthWales/LabourDayTest.php | 9 +++-- .../NationalDayOfMourningTest.php | 9 +++-- .../NewSouthWalesBaseTestCase.php | 9 +++-- .../NewSouthWales/NewSouthWalesTest.php | 9 +++-- .../NewSouthWales/NewYearsDayTest.php | 9 +++-- .../NewSouthWales/QueensBirthdayTest.php | 9 +++-- tests/Australia/NewYearsDayTest.php | 9 +++-- .../NorthernTerritory/AnzacDayTest.php | 9 +++-- .../NorthernTerritory/AustraliaDayTest.php | 9 +++-- .../NorthernTerritory/BoxingDayTest.php | 9 +++-- .../NorthernTerritory/ChristmasDayTest.php | 9 +++-- .../NorthernTerritory/EasterMondayTest.php | 9 +++-- .../NorthernTerritory/EasterSaturdayTest.php | 9 +++-- .../NorthernTerritory/GoodFridayTest.php | 9 +++-- .../NorthernTerritory/MayDayTest.php | 9 +++-- .../NationalDayOfMourningTest.php | 9 +++-- .../NorthernTerritory/NewYearsDayTest.php | 9 +++-- .../NorthernTerritoryBaseTestCase.php | 9 +++-- .../NorthernTerritoryTest.php | 9 +++-- .../NorthernTerritory/PicnicDayTest.php | 9 +++-- .../NorthernTerritory/QueensBirthdayTest.php | 9 +++-- tests/Australia/Queensland/AnzacDayTest.php | 9 +++-- .../Australia/Queensland/AustraliaDayTest.php | 9 +++-- tests/Australia/Queensland/BoxingDayTest.php | 9 +++-- .../Queensland/Brisbane/AnzacDayTest.php | 9 +++-- .../Queensland/Brisbane/AustraliaDayTest.php | 9 +++-- .../Queensland/Brisbane/BoxingDayTest.php | 9 +++-- .../Brisbane/BrisbaneBaseTestCase.php | 9 +++-- .../Queensland/Brisbane/BrisbaneTest.php | 9 +++-- .../Queensland/Brisbane/ChristmasDayTest.php | 9 +++-- .../Queensland/Brisbane/EasterMondayTest.php | 9 +++-- .../Queensland/Brisbane/GoodFridayTest.php | 9 +++-- .../Queensland/Brisbane/LabourDayTest.php | 9 +++-- .../Brisbane/NationalDayOfMourningTest.php | 9 +++-- .../Queensland/Brisbane/NewYearsDayTest.php | 9 +++-- .../Queensland/Brisbane/PeoplesDayTest.php | 9 +++-- .../Brisbane/QueensBirthdayTest.php | 9 +++-- .../Australia/Queensland/ChristmasDayTest.php | 9 +++-- .../Australia/Queensland/EasterMondayTest.php | 9 +++-- tests/Australia/Queensland/GoodFridayTest.php | 9 +++-- tests/Australia/Queensland/LabourDayTest.php | 9 +++-- .../Queensland/NationalDayOfMourningTest.php | 9 +++-- .../Australia/Queensland/NewYearsDayTest.php | 9 +++-- .../Queensland/QueensBirthdayTest.php | 9 +++-- .../Queensland/QueenslandBaseTestCase.php | 9 +++-- tests/Australia/Queensland/QueenslandTest.php | 9 +++-- .../SouthAustralia/AdelaideCupDayTest.php | 9 +++-- .../Australia/SouthAustralia/AnzacDayTest.php | 9 +++-- .../SouthAustralia/AustraliaDayTest.php | 9 +++-- .../SouthAustralia/ChristmasDayTest.php | 9 +++-- .../SouthAustralia/EasterMondayTest.php | 9 +++-- .../SouthAustralia/EasterSaturdayTest.php | 9 +++-- .../SouthAustralia/GoodFridayTest.php | 9 +++-- .../SouthAustralia/LabourDayTest.php | 9 +++-- .../NationalDayOfMourningTest.php | 9 +++-- .../SouthAustralia/NewYearsDayTest.php | 9 +++-- .../SouthAustralia/ProclamationDayTest.php | 9 +++-- .../SouthAustralia/QueensBirthdayTest.php | 9 +++-- .../SouthAustraliaBaseTestCase.php | 9 +++-- .../SouthAustralia/SouthAustraliaTest.php | 9 +++-- tests/Australia/Tasmania/AnzacDayTest.php | 9 +++-- tests/Australia/Tasmania/AustraliaDayTest.php | 9 +++-- tests/Australia/Tasmania/BoxingDayTest.php | 9 +++-- .../Tasmania/CentralNorth/AnzacDayTest.php | 9 +++-- .../CentralNorth/AustraliaDayTest.php | 9 +++-- .../Tasmania/CentralNorth/BoxingDayTest.php | 9 +++-- .../CentralNorth/CentralNorthBaseTestCase.php | 9 +++-- .../CentralNorth/CentralNorthTest.php | 9 +++-- .../CentralNorth/ChristmasDayTest.php | 9 +++-- .../CentralNorth/DevonportShowTest.php | 9 +++-- .../CentralNorth/EasterMondayTest.php | 9 +++-- .../CentralNorth/EightHourDayTest.php | 9 +++-- .../Tasmania/CentralNorth/GoodFridayTest.php | 9 +++-- .../NationalDayOfMourningTest.php | 9 +++-- .../Tasmania/CentralNorth/NewYearsDayTest.php | 9 +++-- .../CentralNorth/QueensBirthdayTest.php | 9 +++-- .../CentralNorth/RecreationDayTest.php | 9 +++-- tests/Australia/Tasmania/ChristmasDayTest.php | 9 +++-- tests/Australia/Tasmania/EasterMondayTest.php | 9 +++-- tests/Australia/Tasmania/EightHourDayTest.php | 9 +++-- .../Tasmania/FlindersIsland/AnzacDayTest.php | 9 +++-- .../FlindersIsland/AustraliaDayTest.php | 9 +++-- .../Tasmania/FlindersIsland/BoxingDayTest.php | 9 +++-- .../FlindersIsland/ChristmasDayTest.php | 9 +++-- .../FlindersIsland/EasterMondayTest.php | 9 +++-- .../FlindersIsland/EightHourDayTest.php | 9 +++-- .../FlindersIslandBaseTestCase.php | 9 +++-- .../FlindersIsland/FlindersIslandShowTest.php | 9 +++-- .../FlindersIsland/FlindersIslandTest.php | 9 +++-- .../FlindersIsland/GoodFridayTest.php | 9 +++-- .../NationalDayOfMourningTest.php | 9 +++-- .../FlindersIsland/NewYearsDayTest.php | 9 +++-- .../FlindersIsland/QueensBirthdayTest.php | 9 +++-- .../FlindersIsland/RecreationDayTest.php | 9 +++-- tests/Australia/Tasmania/GoodFridayTest.php | 9 +++-- .../Tasmania/KingIsland/AnzacDayTest.php | 9 +++-- .../Tasmania/KingIsland/AustraliaDayTest.php | 9 +++-- .../Tasmania/KingIsland/BoxingDayTest.php | 9 +++-- .../Tasmania/KingIsland/ChristmasDayTest.php | 9 +++-- .../Tasmania/KingIsland/EasterMondayTest.php | 9 +++-- .../Tasmania/KingIsland/EightHourDayTest.php | 9 +++-- .../Tasmania/KingIsland/GoodFridayTest.php | 9 +++-- .../KingIsland/KingIslandBaseTestCase.php | 9 +++-- .../KingIsland/KingIslandShowTest.php | 9 +++-- .../Tasmania/KingIsland/KingIslandTest.php | 9 +++-- .../KingIsland/NationalDayOfMourningTest.php | 9 +++-- .../Tasmania/KingIsland/NewYearsDayTest.php | 9 +++-- .../KingIsland/QueensBirthdayTest.php | 9 +++-- .../Tasmania/KingIsland/RecreationDayTest.php | 9 +++-- .../Tasmania/NationalDayOfMourningTest.php | 9 +++-- tests/Australia/Tasmania/NewYearsDayTest.php | 9 +++-- .../Tasmania/Northeast/AnzacDayTest.php | 9 +++-- .../Tasmania/Northeast/AustraliaDayTest.php | 9 +++-- .../Tasmania/Northeast/BoxingDayTest.php | 9 +++-- .../Tasmania/Northeast/ChristmasDayTest.php | 9 +++-- .../Tasmania/Northeast/EasterMondayTest.php | 9 +++-- .../Tasmania/Northeast/EightHourDayTest.php | 9 +++-- .../Tasmania/Northeast/GoodFridayTest.php | 9 +++-- .../Tasmania/Northeast/LauncestonShowTest.php | 9 +++-- .../Northeast/NationalDayOfMourningTest.php | 9 +++-- .../Tasmania/Northeast/NewYearsDayTest.php | 9 +++-- .../Northeast/NortheastBaseTestCase.php | 9 +++-- .../Tasmania/Northeast/NortheastTest.php | 9 +++-- .../Tasmania/Northeast/QueensBirthdayTest.php | 9 +++-- .../Tasmania/Northeast/RecreationDayTest.php | 9 +++-- .../Tasmania/Northwest/AnzacDayTest.php | 9 +++-- .../Tasmania/Northwest/AustraliaDayTest.php | 9 +++-- .../Tasmania/Northwest/BoxingDayTest.php | 9 +++-- .../Tasmania/Northwest/BurnieShowTest.php | 9 +++-- .../Tasmania/Northwest/ChristmasDayTest.php | 9 +++-- .../Northwest/CircularHead/AGFESTTest.php | 9 +++-- .../Northwest/CircularHead/AnzacDayTest.php | 9 +++-- .../CircularHead/AustraliaDayTest.php | 9 +++-- .../Northwest/CircularHead/BoxingDayTest.php | 9 +++-- .../Northwest/CircularHead/BurnieShowTest.php | 9 +++-- .../CircularHead/ChristmasDayTest.php | 9 +++-- .../CircularHead/CircularHeadBaseTestCase.php | 9 +++-- .../CircularHead/CircularHeadTest.php | 9 +++-- .../CircularHead/EasterMondayTest.php | 9 +++-- .../CircularHead/EightHourDayTest.php | 9 +++-- .../Northwest/CircularHead/GoodFridayTest.php | 9 +++-- .../NationalDayOfMourningTest.php | 9 +++-- .../CircularHead/NewYearsDayTest.php | 9 +++-- .../CircularHead/QueensBirthdayTest.php | 9 +++-- .../CircularHead/RecreationDayTest.php | 9 +++-- .../Tasmania/Northwest/EasterMondayTest.php | 9 +++-- .../Tasmania/Northwest/EightHourDayTest.php | 9 +++-- .../Tasmania/Northwest/GoodFridayTest.php | 9 +++-- .../Northwest/NationalDayOfMourningTest.php | 9 +++-- .../Tasmania/Northwest/NewYearsDayTest.php | 9 +++-- .../Northwest/NorthwestBaseTestCase.php | 9 +++-- .../Tasmania/Northwest/NorthwestTest.php | 9 +++-- .../Tasmania/Northwest/QueensBirthdayTest.php | 9 +++-- .../Tasmania/Northwest/RecreationDayTest.php | 9 +++-- .../Australia/Tasmania/QueensBirthdayTest.php | 9 +++-- .../Australia/Tasmania/RecreationDayTest.php | 9 +++-- .../Australia/Tasmania/South/AnzacDayTest.php | 9 +++-- .../Tasmania/South/AustraliaDayTest.php | 9 +++-- .../Tasmania/South/BoxingDayTest.php | 9 +++-- .../Tasmania/South/ChristmasDayTest.php | 9 +++-- .../Tasmania/South/EasterMondayTest.php | 9 +++-- .../Tasmania/South/EightHourDayTest.php | 9 +++-- .../Tasmania/South/GoodFridayTest.php | 9 +++-- .../Tasmania/South/HobartShowTest.php | 9 +++-- .../South/NationalDayOfMourningTest.php | 9 +++-- .../Tasmania/South/NewYearsDayTest.php | 9 +++-- .../Tasmania/South/QueensBirthdayTest.php | 9 +++-- .../Tasmania/South/RecreationDayTest.php | 9 +++-- .../Tasmania/South/SouthBaseTestCase.php | 9 +++-- tests/Australia/Tasmania/South/SouthTest.php | 9 +++-- .../Tasmania/South/Southeast/AnzacDayTest.php | 9 +++-- .../South/Southeast/AustraliaDayTest.php | 9 +++-- .../South/Southeast/BoxingDayTest.php | 9 +++-- .../South/Southeast/ChristmasDayTest.php | 9 +++-- .../South/Southeast/EasterMondayTest.php | 9 +++-- .../South/Southeast/EightHourDayTest.php | 9 +++-- .../South/Southeast/GoodFridayTest.php | 9 +++-- .../South/Southeast/HobartRegattaTest.php | 9 +++-- .../South/Southeast/HobartShowTest.php | 9 +++-- .../Southeast/NationalDayOfMourningTest.php | 9 +++-- .../South/Southeast/NewYearsDayTest.php | 9 +++-- .../South/Southeast/QueensBirthdayTest.php | 9 +++-- .../South/Southeast/SoutheastBaseTestCase.php | 9 +++-- .../South/Southeast/SoutheastTest.php | 9 +++-- .../Tasmania/TasmaniaBaseTestCase.php | 9 +++-- tests/Australia/Tasmania/TasmaniaTest.php | 9 +++-- .../Victoria/AFLGrandFinalFridayTest.php | 9 +++-- tests/Australia/Victoria/AnzacDayTest.php | 9 +++-- tests/Australia/Victoria/AustraliaDayTest.php | 9 +++-- tests/Australia/Victoria/BoxingDayTest.php | 9 +++-- tests/Australia/Victoria/ChristmasDayTest.php | 9 +++-- tests/Australia/Victoria/EasterMondayTest.php | 9 +++-- .../Australia/Victoria/EasterSaturdayTest.php | 9 +++-- tests/Australia/Victoria/EasterSundayTest.php | 9 +++-- tests/Australia/Victoria/GoodFridayTest.php | 9 +++-- tests/Australia/Victoria/LabourDayTest.php | 9 +++-- .../Victoria/MelbourneCupDayTest.php | 9 +++-- .../Victoria/NationalDayOfMourningTest.php | 9 +++-- tests/Australia/Victoria/NewYearsDayTest.php | 9 +++-- .../Australia/Victoria/QueensBirthdayTest.php | 9 +++-- .../Victoria/VictoriaBaseTestCase.php | 9 +++-- tests/Australia/Victoria/VictoriaTest.php | 9 +++-- .../WesternAustralia/AnzacDayTest.php | 9 +++-- .../WesternAustralia/AustraliaDayTest.php | 9 +++-- .../WesternAustralia/BoxingDayTest.php | 9 +++-- .../WesternAustralia/ChristmasDayTest.php | 9 +++-- .../WesternAustralia/EasterMondayTest.php | 9 +++-- .../WesternAustralia/GoodFridayTest.php | 9 +++-- .../WesternAustralia/LabourDayTest.php | 9 +++-- .../NationalDayOfMourningTest.php | 9 +++-- .../WesternAustralia/NewYearsDayTest.php | 9 +++-- .../WesternAustralia/QueensBirthdayTest.php | 9 +++-- .../WesternAustraliaBaseTestCase.php | 9 +++-- .../WesternAustraliaDayTest.php | 9 +++-- .../WesternAustralia/WesternAustraliaTest.php | 9 +++-- tests/Austria/AllSaintsDayTest.php | 9 +++-- tests/Austria/AscensionDayTest.php | 9 +++-- tests/Austria/AssumptionOfMaryTest.php | 9 +++-- tests/Austria/AustriaBaseTestCase.php | 9 +++-- tests/Austria/AustriaTest.php | 9 +++-- .../Burgenland/BurgenlandBaseTestCase.php | 9 +++-- tests/Austria/Burgenland/BurgenlandTest.php | 9 +++-- tests/Austria/Burgenland/stMartinsDayTest.php | 9 +++-- .../Carinthia/CarinthiaBaseTestCase.php | 9 +++-- tests/Austria/Carinthia/CarinthiaTest.php | 9 +++-- tests/Austria/Carinthia/PlebisciteDayTest.php | 9 +++-- tests/Austria/Carinthia/StJosephsDayTest.php | 9 +++-- tests/Austria/ChristmasTest.php | 9 +++-- tests/Austria/CorpusChristiTest.php | 9 +++-- tests/Austria/EasterMondayTest.php | 9 +++-- tests/Austria/EasterTest.php | 9 +++-- tests/Austria/EpiphanyTest.php | 9 +++-- tests/Austria/ImmaculateConceptionTest.php | 9 +++-- tests/Austria/InternationalWorkersDayTest.php | 9 +++-- .../LowerAustria/LowerAustriaBaseTestCase.php | 9 +++-- .../Austria/LowerAustria/LowerAustriaTest.php | 9 +++-- .../LowerAustria/StLeopoldsDayTest.php | 9 +++-- tests/Austria/NationalDayTest.php | 9 +++-- tests/Austria/NewYearsDayTest.php | 9 +++-- tests/Austria/PentecostMondayTest.php | 9 +++-- tests/Austria/PentecostTest.php | 9 +++-- .../Austria/Salzburg/SalzburgBaseTestCase.php | 9 +++-- tests/Austria/Salzburg/SalzburgTest.php | 9 +++-- tests/Austria/Salzburg/StRupertsDayTest.php | 9 +++-- tests/Austria/SecondChristmasDayTest.php | 9 +++-- tests/Austria/Styria/StJosephsDayTest.php | 9 +++-- tests/Austria/Styria/StyriaBaseTestCase.php | 9 +++-- tests/Austria/Styria/StyriaTest.php | 9 +++-- tests/Austria/Tyrol/StJosephsDayTest.php | 9 +++-- tests/Austria/Tyrol/TyrolBaseTestCase.php | 9 +++-- tests/Austria/Tyrol/TyrolTest.php | 9 +++-- .../UpperAustria/StFloriansDayTest.php | 9 +++-- .../UpperAustria/UpperAustriaBaseTestCase.php | 9 +++-- .../Austria/UpperAustria/UpperAustriaTest.php | 9 +++-- tests/Austria/Vienna/StLeopoldsDayTest.php | 9 +++-- tests/Austria/Vienna/ViennaBaseTestCase.php | 9 +++-- tests/Austria/Vienna/ViennaTest.php | 9 +++-- tests/Austria/Vorarlberg/StJosephsDayTest.php | 9 +++-- .../Vorarlberg/VorarlbergBaseTestCase.php | 9 +++-- tests/Austria/Vorarlberg/VorarlbergTest.php | 9 +++-- tests/Base/HolidayBetweenFilterTest.php | 33 ++++++++++--------- tests/Base/HolidayFiltersTest.php | 9 +++-- tests/Base/HolidayOnFilterTest.php | 9 +++-- tests/Base/HolidayTest.php | 9 +++-- tests/Base/SubstituteHolidayTest.php | 11 ++++--- tests/Base/TranslationsTest.php | 19 ++++++----- tests/Base/TypographyTest.php | 8 +++-- tests/Base/WeekendTest.php | 8 +++-- tests/Base/YasumiExternalProvider.php | 9 +++-- tests/Base/YasumiTest.php | 17 ++++++---- tests/Base/YasumiWorkdayTest.php | 9 +++-- tests/Belgium/AllSaintsDayTest.php | 9 +++-- tests/Belgium/ArmisticeDayTest.php | 9 +++-- tests/Belgium/AscensionDayTest.php | 9 +++-- tests/Belgium/AssumptionOfMaryTest.php | 9 +++-- tests/Belgium/BelgiumBaseTestCase.php | 9 +++-- tests/Belgium/BelgiumTest.php | 9 +++-- tests/Belgium/ChristmasTest.php | 9 +++-- tests/Belgium/EasterMondayTest.php | 9 +++-- tests/Belgium/EasterTest.php | 9 +++-- tests/Belgium/InternationalWorkersDayTest.php | 9 +++-- tests/Belgium/NationalDayTest.php | 9 +++-- tests/Belgium/NewYearsDayTest.php | 9 +++-- tests/Belgium/PentecostTest.php | 9 +++-- tests/Belgium/pentecostMondayTest.php | 9 +++-- tests/Bosnia/BosniaBaseTestCase.php | 9 +++-- tests/Bosnia/BosniaTest.php | 9 +++-- tests/Bosnia/ChristmasDayTest.php | 9 +++-- tests/Bosnia/DayAfterNewYearsDay.php | 9 +++-- tests/Bosnia/EasterTest.php | 9 +++-- tests/Bosnia/IndependenceDayTest.php | 9 +++-- tests/Bosnia/InternationalWorkersDayTest.php | 9 +++-- tests/Bosnia/NewYearsDayTest.php | 9 +++-- tests/Bosnia/OrthodoxChristmasDay.php | 9 +++-- tests/Bosnia/SecondLabourDay.php | 9 +++-- tests/Bosnia/StatehoodDayTest.php | 9 +++-- tests/Brazil/AllSoulsDayTest.php | 9 +++-- tests/Brazil/AshWednesdayTest.php | 9 +++-- tests/Brazil/BrazilBaseTestCase.php | 9 +++-- tests/Brazil/BrazilTest.php | 9 +++-- tests/Brazil/CarnavalMondayTest.php | 9 +++-- tests/Brazil/CarnavalTuesdayTest.php | 9 +++-- tests/Brazil/ChristmasDayTest.php | 9 +++-- tests/Brazil/CorpusChristiTest.php | 9 +++-- tests/Brazil/EasterTest.php | 9 +++-- tests/Brazil/GoodFridayTest.php | 9 +++-- tests/Brazil/IndependenceDayTest.php | 9 +++-- tests/Brazil/InternationalWorkersDayTest.php | 9 +++-- tests/Brazil/NewYearsDayTest.php | 9 +++-- tests/Brazil/OurLadyOfAparecidaDayTest.php | 9 +++-- .../Brazil/ProclamationOfRepublicDayTest.php | 9 +++-- tests/Brazil/TiradentesDayTest.php | 9 +++-- tests/Canada/Alberta/AlbertaBaseTestCase.php | 9 +++-- tests/Canada/Alberta/AlbertaTest.php | 9 +++-- .../BritishColumbiaBaseTestCase.php | 9 +++-- .../BritishColumbia/BritishColumbiaTest.php | 9 +++-- tests/Canada/CanadaBaseTestCase.php | 9 +++-- tests/Canada/CanadaDayTest.php | 9 +++-- tests/Canada/CanadaTest.php | 9 +++-- tests/Canada/ChristmasDayTest.php | 9 +++-- tests/Canada/LabourDayTest.php | 9 +++-- .../Canada/Manitoba/ManitobaBaseTestCase.php | 9 +++-- tests/Canada/Manitoba/ManitobaTest.php | 9 +++-- .../NewBrunswick/NewBrunswickBaseTestCase.php | 9 +++-- .../Canada/NewBrunswick/NewBrunswickTest.php | 9 +++-- tests/Canada/NewYearsDayTest.php | 9 +++-- .../NewfoundlandAndLabradorBaseTestCase.php | 9 +++-- .../NewfoundlandAndLabradorTest.php | 9 +++-- .../NorthwestTerritoriesBaseTestCase.php | 9 +++-- .../NorthwestTerritoriesTest.php | 9 +++-- .../NovaScotia/NovaScotiaBaseTestCase.php | 9 +++-- tests/Canada/NovaScotia/NovaScotiaTest.php | 9 +++-- tests/Canada/Nunavut/NunavutBaseTestCase.php | 9 +++-- tests/Canada/Nunavut/NunavutTest.php | 9 +++-- tests/Canada/Ontario/OntarioBaseTestCase.php | 9 +++-- tests/Canada/Ontario/OntarioTest.php | 9 +++-- .../PrinceEdwardIslandBaseTestCase.php | 9 +++-- .../PrinceEdwardIslandTest.php | 9 +++-- tests/Canada/Quebec/QuebecBaseTestCase.php | 9 +++-- tests/Canada/Quebec/QuebecTest.php | 9 +++-- tests/Canada/RemembranceDayTest.php | 9 +++-- .../Saskatchewan/SaskatchewanBaseTestCase.php | 9 +++-- .../Canada/Saskatchewan/SaskatchewanTest.php | 9 +++-- tests/Canada/ThanksgivingDayTest.php | 9 +++-- .../Canada/TruthAndReconciliationDayTest.php | 9 +++-- tests/Canada/Yukon/YukonBaseTestCase.php | 9 +++-- tests/Canada/Yukon/YukonTest.php | 9 +++-- tests/Croatia/AllSaintsDayTest.php | 9 +++-- tests/Croatia/AntifascistStruggleDayTest.php | 9 +++-- tests/Croatia/AssumptionOfMaryTest.php | 9 +++-- tests/Croatia/ChristmasDayTest.php | 9 +++-- tests/Croatia/CorpusChristiTest.php | 9 +++-- tests/Croatia/CroatiaBaseTestCase.php | 9 +++-- tests/Croatia/CroatiaTest.php | 9 +++-- tests/Croatia/EasterMondayTest.php | 9 +++-- tests/Croatia/EasterTest.php | 9 +++-- tests/Croatia/EpiphanyTest.php | 9 +++-- tests/Croatia/HomelandThanksgivingDayTest.php | 9 +++-- tests/Croatia/IndependenceDayTest.php | 9 +++-- tests/Croatia/InternationalWorkersDayTest.php | 9 +++-- tests/Croatia/NewYearsDayTest.php | 9 +++-- tests/Croatia/RemembranceDayTest.php | 9 +++-- tests/Croatia/StStephensDayTest.php | 9 +++-- tests/Croatia/StatehoodDayTest.php | 9 +++-- tests/CzechRepublic/ChristmasDayTest.php | 9 +++-- tests/CzechRepublic/ChristmasEveTest.php | 9 +++-- .../CzechRepublicBaseTestCase.php | 9 +++-- tests/CzechRepublic/CzechRepublicTest.php | 9 +++-- tests/CzechRepublic/CzechStateHoodDayTest.php | 9 +++-- tests/CzechRepublic/EasterMondayTest.php | 9 +++-- tests/CzechRepublic/GoodFridayTest.php | 9 +++-- .../IndependentCzechoslovakStateDayTest.php | 9 +++-- .../InternationalWorkersDayTest.php | 9 +++-- tests/CzechRepublic/JanHusDayTest.php | 9 +++-- tests/CzechRepublic/NewYearsDayTest.php | 9 +++-- .../RenewalOfIndependentCzechStateDayTest.php | 9 +++-- .../SaintsCyrilAndMethodiusDayTest.php | 9 +++-- .../CzechRepublic/SecondChristmasDayTest.php | 9 +++-- .../StruggleForFreedomAndDemocracyDayTest.php | 9 +++-- .../CzechRepublic/VictoryInEuropeDayTest.php | 9 +++-- tests/Denmark/AscensionDayTest.php | 9 +++-- tests/Denmark/ChristmasDayTest.php | 9 +++-- tests/Denmark/ChristmasEveTest.php | 9 +++-- tests/Denmark/ConstitutionDayTest.php | 9 +++-- tests/Denmark/DaylightSavingTime.php | 8 +++-- tests/Denmark/DenmarkBaseTestCase.php | 9 +++-- tests/Denmark/DenmarkTest.php | 9 +++-- tests/Denmark/EasterMondayTest.php | 9 +++-- tests/Denmark/EasterTest.php | 9 +++-- tests/Denmark/GoodFridayTest.php | 9 +++-- tests/Denmark/GreatPrayerDayTest.php | 9 +++-- tests/Denmark/InternationalWorkersDayTest.php | 9 +++-- tests/Denmark/MaundyThursdayTest.php | 9 +++-- tests/Denmark/NewYearsDayTest.php | 9 +++-- tests/Denmark/NewYearsEveTest.php | 9 +++-- tests/Denmark/PentecostMondayTest.php | 9 +++-- tests/Denmark/PentecostTest.php | 9 +++-- tests/Denmark/SecondChristmasDayTest.php | 9 +++-- tests/Estonia/ChristmasDayTest.php | 8 +++-- tests/Estonia/ChristmasEveDayTest.php | 8 +++-- tests/Estonia/EasterDayTest.php | 8 +++-- tests/Estonia/EstoniaBaseTestCase.php | 8 +++-- tests/Estonia/EstoniaTest.php | 8 +++-- tests/Estonia/GoodFridayDayTest.php | 8 +++-- tests/Estonia/IndependenceDayTest.php | 8 +++-- tests/Estonia/InternationalWorkersDayTest.php | 8 +++-- tests/Estonia/NewYearsDayTest.php | 8 +++-- tests/Estonia/PentecostTest.php | 8 +++-- .../RestorationOfIndependenceDayTest.php | 8 +++-- tests/Estonia/SecondChristmasDayTest.php | 8 +++-- tests/Estonia/StJohnsDayTest.php | 8 +++-- tests/Estonia/VictoryDayTest.php | 8 +++-- tests/Finland/AllSaintsDayTest.php | 9 +++-- tests/Finland/AscensionDayTest.php | 9 +++-- tests/Finland/ChristmasDayTest.php | 9 +++-- tests/Finland/EasterMondayTest.php | 9 +++-- tests/Finland/EasterTest.php | 9 +++-- tests/Finland/EpiphanyTest.php | 9 +++-- tests/Finland/FinlandBaseTestCase.php | 9 +++-- tests/Finland/FinlandTest.php | 9 +++-- tests/Finland/GoodFridayTest.php | 9 +++-- tests/Finland/IndependenceDayTest.php | 9 +++-- tests/Finland/InternationalWorkersDayTest.php | 9 +++-- tests/Finland/NewYearsDayTest.php | 9 +++-- tests/Finland/PentecostTest.php | 9 +++-- tests/Finland/SecondChristmasDayTest.php | 9 +++-- tests/Finland/stJohnsDayTest.php | 9 +++-- tests/France/AllSaintsDayTest.php | 9 +++-- tests/France/ArmisticeDayTest.php | 9 +++-- tests/France/AscensionDayTest.php | 9 +++-- tests/France/AssumptionOfMaryTest.php | 9 +++-- tests/France/BasRhin/BasRhinBaseTestCase.php | 9 +++-- tests/France/BasRhin/BasRhinTest.php | 9 +++-- tests/France/BasRhin/GoodFridayTest.php | 9 +++-- tests/France/BasRhin/stStephensDayTest.php | 9 +++-- tests/France/BastilleDayTest.php | 9 +++-- tests/France/ChristmasDayTest.php | 9 +++-- tests/France/EasterMondayTest.php | 9 +++-- tests/France/FranceBaseTestCase.php | 9 +++-- tests/France/FranceTest.php | 9 +++-- tests/France/HautRhin/GoodFridayTest.php | 9 +++-- .../France/HautRhin/HautRhinBaseTestCase.php | 9 +++-- tests/France/HautRhin/HautRhinTest.php | 9 +++-- tests/France/HautRhin/stStephensDayTest.php | 9 +++-- tests/France/InternationalWorkersDayTest.php | 9 +++-- tests/France/Moselle/GoodFridayTest.php | 9 +++-- tests/France/Moselle/MoselleBaseTestCase.php | 9 +++-- tests/France/Moselle/MoselleTest.php | 9 +++-- tests/France/Moselle/stStephensDayTest.php | 9 +++-- tests/France/NewYearsDayTest.php | 9 +++-- tests/France/PentecostMondayTest.php | 9 +++-- tests/France/VictoryInEuropeDayTest.php | 9 +++-- tests/Georgia/EasterTest.php | 15 ++++++++- tests/Georgia/GeorgiaBaseTestCase.php | 8 +++-- tests/Georgia/GeorgiaTest.php | 8 +++-- tests/Georgia/IndependenceDayTest.php | 8 +++-- tests/Georgia/InternationalWomensDayTest.php | 8 +++-- tests/Georgia/MtskhetobaDayTest.php | 8 +++-- tests/Georgia/NewYearsDayTest.php | 8 +++-- tests/Georgia/OrthodoxChristmasDayTest.php | 8 +++-- tests/Georgia/OrthodoxEpiphanyDayTest.php | 8 +++-- tests/Georgia/SecondNewYearDayTest.php | 8 +++-- tests/Georgia/StAndrewsDayTest.php | 8 +++-- tests/Georgia/StGeorgesDayTest.php | 8 +++-- tests/Georgia/StMarysDayTest.php | 8 +++-- tests/Georgia/UnityDayTest.php | 8 +++-- tests/Georgia/VictoryDayTest.php | 8 +++-- tests/Germany/AscensionDayTest.php | 9 +++-- .../BadenWurttemberg/AllSaintsDayTest.php | 9 +++-- .../BadenWurttembergBaseTestCase.php | 9 +++-- .../BadenWurttemberg/BadenWurttembergTest.php | 9 +++-- .../BadenWurttemberg/CorpusChristiTest.php | 9 +++-- .../Germany/BadenWurttemberg/EpiphanyTest.php | 9 +++-- .../BadenWurttemberg/GermanUnityDayTest.php | 9 +++-- .../ReformationDay2017Test.php | 9 +++-- tests/Germany/Bavaria/AllSaintsDayTest.php | 9 +++-- tests/Germany/Bavaria/BavariaBaseTestCase.php | 9 +++-- tests/Germany/Bavaria/BavariaTest.php | 9 +++-- tests/Germany/Bavaria/CorpusChristiTest.php | 9 +++-- tests/Germany/Bavaria/EpiphanyTest.php | 9 +++-- tests/Germany/Bavaria/GermanUnityDayTest.php | 9 +++-- .../Bavaria/ReformationDay2017Test.php | 9 +++-- tests/Germany/Berlin/BerlinBaseTestCase.php | 9 +++-- tests/Germany/Berlin/BerlinTest.php | 9 +++-- .../Berlin/DayOfLiberation2020Test.php | 11 ++++--- tests/Germany/Berlin/GermanUnityDayTest.php | 9 +++-- .../Berlin/InternationalWomensDay2019Test.php | 11 ++++--- .../Germany/Berlin/ReformationDay2017Test.php | 9 +++-- .../Brandenburg/BrandenburgBaseTestCase.php | 9 +++-- tests/Germany/Brandenburg/BrandenburgTest.php | 9 +++-- .../Brandenburg/GermanUnityDayTest.php | 9 +++-- .../Brandenburg/ReformationDayTest.php | 9 +++-- tests/Germany/Bremen/BremenBaseTestCase.php | 9 +++-- tests/Germany/Bremen/BremenTest.php | 9 +++-- tests/Germany/Bremen/GermanUnityDayTest.php | 9 +++-- .../Germany/Bremen/ReformationDay2017Test.php | 9 +++-- tests/Germany/Bremen/ReformationDayTest.php | 9 +++-- tests/Germany/ChristmasTest.php | 9 +++-- tests/Germany/EasterMondayTest.php | 9 +++-- tests/Germany/GermanUnityDayTest.php | 9 +++-- tests/Germany/GermanyBaseTestCase.php | 9 +++-- tests/Germany/GermanyTest.php | 9 +++-- tests/Germany/GoodFridayTest.php | 9 +++-- .../Germany/Hamburg/DayOfReformationTest.php | 9 +++-- tests/Germany/Hamburg/GermanUnityDay.php | 9 +++-- tests/Germany/Hamburg/HamburgBaseTestCase.php | 9 +++-- tests/Germany/Hamburg/HamburgTest.php | 9 +++-- .../Hamburg/ReformationDay2017Test.php | 9 +++-- tests/Germany/Hesse/CorpusChristiTest.php | 9 +++-- tests/Germany/Hesse/GermanUnityDayTest.php | 9 +++-- tests/Germany/Hesse/HesseBaseTestCase.php | 9 +++-- tests/Germany/Hesse/HesseTest.php | 9 +++-- .../Germany/Hesse/ReformationDay2017Test.php | 9 +++-- tests/Germany/InternationalWorkersDayTest.php | 9 +++-- .../LowerSaxony/GermanUnityDayTest.php | 9 +++-- .../LowerSaxony/LowerSaxonyBaseTestCase.php | 9 +++-- tests/Germany/LowerSaxony/LowerSaxonyTest.php | 9 +++-- .../LowerSaxony/ReformationDay2017Test.php | 9 +++-- .../LowerSaxony/ReformationDayTest.php | 9 +++-- .../GermanUnityDayTest.php | 9 +++-- .../InternationalWomensDayTest.php | 11 ++++--- ...ecklenburgWesternPomeraniaBaseTestCase.php | 9 +++-- .../MecklenburgWesternPomeraniaTest.php | 9 +++-- .../ReformationDayTest.php | 9 +++-- tests/Germany/NewYearsDayTest.php | 9 +++-- tests/Germany/NewYearsEveTest.php | 9 +++-- .../NorthRhineWestphalia/AllSaintsDayTest.php | 9 +++-- .../CorpusChristiTest.php | 9 +++-- .../GermanUnityDayTest.php | 9 +++-- .../NorthRhineWestphaliaBaseTestCase.php | 9 +++-- .../NorthRhineWestphaliaTest.php | 9 +++-- .../ReformationDay2017Test.php | 9 +++-- tests/Germany/PentecostMondayTest.php | 9 +++-- tests/Germany/PentecostTest.php | 11 ++++--- tests/Germany/ReformationDay2017Test.php | 11 ++++--- .../RhinelandPalatinate/AllSaintsDayTest.php | 9 +++-- .../RhinelandPalatinate/CorpusChristiTest.php | 9 +++-- .../GermanUnityDayTest.php | 9 +++-- .../ReformationDay2017Test.php | 9 +++-- .../RhinelandPalatinateBaseTestCase.php | 9 +++-- .../RhinelandPalatinateTest.php | 9 +++-- tests/Germany/Saarland/AllSaintsDayTest.php | 9 +++-- .../Germany/Saarland/AssumptionOfMaryTest.php | 9 +++-- tests/Germany/Saarland/CorpusChristiTest.php | 9 +++-- tests/Germany/Saarland/GermanUnityDayTest.php | 9 +++-- .../Saarland/ReformationDay2017Test.php | 9 +++-- .../Germany/Saarland/SaarlandBaseTestCase.php | 9 +++-- tests/Germany/Saarland/SaarlandTest.php | 9 +++-- tests/Germany/Saxony/GermanUnityDayTest.php | 9 +++-- tests/Germany/Saxony/ReformationDayTest.php | 9 +++-- .../Saxony/RepentanceAndPrayerDayTest.php | 9 +++-- tests/Germany/Saxony/SaxonyBaseTestCase.php | 9 +++-- tests/Germany/Saxony/SaxonyTest.php | 9 +++-- tests/Germany/SaxonyAnhalt/EpiphanyTest.php | 9 +++-- .../SaxonyAnhalt/GermanUnityDayTest.php | 9 +++-- .../SaxonyAnhalt/ReformationDayTest.php | 9 +++-- .../SaxonyAnhalt/SaxonyAnhaltBaseTestCase.php | 9 +++-- .../Germany/SaxonyAnhalt/SaxonyAnhaltTest.php | 9 +++-- .../SchleswigHolstein/GermanUnityDayTest.php | 9 +++-- .../ReformationDay2017Test.php | 9 +++-- .../SchleswigHolstein/ReformationDayTest.php | 9 +++-- .../SchleswigHolsteinBaseTestCase.php | 9 +++-- .../SchleswigHolsteinTest.php | 9 +++-- tests/Germany/SecondChristmasDayTest.php | 9 +++-- .../Germany/Thuringia/GermanUnityDayTest.php | 9 +++-- .../Germany/Thuringia/ReformationDayTest.php | 9 +++-- .../Thuringia/ThuringiaBaseTestCase.php | 9 +++-- tests/Germany/Thuringia/ThuringiaTest.php | 9 +++-- .../Thuringia/WorldChildrensDayTest.php | 9 +++-- tests/Greece/AnnunciationTest.php | 9 +++-- tests/Greece/AscensionDayTest.php | 9 +++-- tests/Greece/AssumptionOfMaryTest.php | 9 +++-- tests/Greece/ChristmasDayTest.php | 9 +++-- tests/Greece/CleanMondayTest.php | 9 +++-- tests/Greece/EasterMondayTest.php | 9 +++-- tests/Greece/EasterTest.php | 9 +++-- tests/Greece/EpiphanyTest.php | 9 +++-- tests/Greece/GreeceBaseTestCase.php | 9 +++-- tests/Greece/GreeceTest.php | 9 +++-- tests/Greece/IndependenceDayTest.php | 9 +++-- tests/Greece/InternationalWorkersDayTest.php | 9 +++-- tests/Greece/NewYearsDayTest.php | 9 +++-- tests/Greece/OhiDayTest.php | 9 +++-- tests/Greece/PentecostMondayTest.php | 9 +++-- tests/Greece/PentecostTest.php | 9 +++-- tests/Greece/PolytechnioTest.php | 9 +++-- tests/Greece/ThreeHolyHierarchsTest.php | 9 +++-- tests/Greece/goodFridayTest.php | 9 +++-- tests/HolidayTestCase.php | 9 +++-- tests/Hungary/AllSaintsDayTest.php | 9 +++-- tests/Hungary/ChristmasTest.php | 9 +++-- tests/Hungary/EasterMondayTest.php | 9 +++-- tests/Hungary/EasterTest.php | 9 +++-- tests/Hungary/HungaryBaseTestCase.php | 9 +++-- tests/Hungary/HungaryTest.php | 9 +++-- tests/Hungary/InternationalWorkersDayTest.php | 9 +++-- tests/Hungary/MemorialDay1848Test.php | 9 +++-- tests/Hungary/MemorialDay1956Test.php | 9 +++-- tests/Hungary/NewYearsDayTest.php | 9 +++-- tests/Hungary/PentecostMondayTest.php | 9 +++-- tests/Hungary/PentecostTest.php | 9 +++-- tests/Hungary/SecondChristmasDayTest.php | 9 +++-- tests/Hungary/StateFoundationDayTest.php | 9 +++-- tests/Ireland/AugustHolidayTest.php | 9 +++-- tests/Ireland/ChristmasDayTest.php | 11 ++++--- tests/Ireland/EasterMondayTest.php | 9 +++-- tests/Ireland/EasterTest.php | 9 +++-- tests/Ireland/GoodFridayTest.php | 9 +++-- tests/Ireland/IrelandBaseTestCase.php | 9 +++-- tests/Ireland/IrelandTest.php | 9 +++-- tests/Ireland/JuneHolidayTest.php | 9 +++-- tests/Ireland/MayDayTest.php | 9 +++-- tests/Ireland/NewYearsDayTest.php | 11 ++++--- tests/Ireland/OctoberHolidayTest.php | 9 +++-- tests/Ireland/PentecostTest.php | 9 +++-- tests/Ireland/StPatricksDayTest.php | 11 ++++--- tests/Ireland/StStephensDayTest.php | 11 ++++--- tests/Ireland/pentecostMondayTest.php | 9 +++-- tests/Italy/AllSaintsDayTest.php | 9 +++-- tests/Italy/AssumptionOfMaryTest.php | 9 +++-- tests/Italy/ChristmasTest.php | 9 +++-- tests/Italy/EasterMondayTest.php | 9 +++-- tests/Italy/EasterTest.php | 9 +++-- tests/Italy/EpiphanyTest.php | 9 +++-- tests/Italy/ImmaculateConceptionTest.php | 9 +++-- tests/Italy/InternationalWorkersDayTest.php | 9 +++-- tests/Italy/ItalyBaseTestCase.php | 9 +++-- tests/Italy/ItalyTest.php | 9 +++-- tests/Italy/LiberationDayTest.php | 9 +++-- tests/Italy/NewYearsDayTest.php | 9 +++-- tests/Italy/RepublicDayTest.php | 9 +++-- tests/Italy/stStephensDayTest.php | 9 +++-- tests/Japan/AutumnalEquinoxDayTest.php | 9 +++-- tests/Japan/ChildrensDayTest.php | 11 ++++--- tests/Japan/ComingOfAgeDayTest.php | 9 +++-- tests/Japan/ConstitutionMemorialDayTest.php | 11 ++++--- tests/Japan/CoronationDayTest.php | 9 +++-- tests/Japan/CultureDayTest.php | 11 ++++--- tests/Japan/EmperorsBirthdayTest.php | 11 ++++--- .../EnthronementProclamationCeremonyTest.php | 9 +++-- tests/Japan/GreeneryDayTest.php | 13 +++++--- tests/Japan/JapanBaseTestCase.php | 9 +++-- tests/Japan/JapanTest.php | 9 +++-- tests/Japan/LabourThanksgivingDayTest.php | 11 ++++--- tests/Japan/MarineDayTest.php | 11 ++++--- tests/Japan/MountainDayTest.php | 11 ++++--- tests/Japan/NationalFoundationDayTest.php | 11 ++++--- tests/Japan/NewYearsDayTest.php | 11 ++++--- tests/Japan/PublicBridgeDayTest.php | 17 ++++++---- tests/Japan/RespectForTheAgedDayTest.php | 11 ++++--- tests/Japan/ShowaDayTest.php | 11 ++++--- tests/Japan/SportsDayTest.php | 11 ++++--- tests/Japan/VernalEquinoxDayTest.php | 9 +++-- tests/Latvia/ChristmasDayTest.php | 8 +++-- tests/Latvia/ChristmasEveDayTest.php | 8 +++-- tests/Latvia/EasterDayTest.php | 8 +++-- tests/Latvia/EasterMondayDayTest.php | 8 +++-- tests/Latvia/GoodFridayDayTest.php | 8 +++-- tests/Latvia/InternationalWorkersDayTest.php | 8 +++-- tests/Latvia/LatviaBaseTestCase.php | 8 +++-- tests/Latvia/LatviaTest.php | 8 +++-- tests/Latvia/MidsummerEveDayTest.php | 8 +++-- tests/Latvia/NewYearsDayTest.php | 8 +++-- tests/Latvia/NewYearsEveDayTest.php | 8 +++-- ...oclamationOfTheRepublicOfLatviaDayTest.php | 8 +++-- .../RestorationOfIndependenceDayTest.php | 8 +++-- tests/Latvia/SecondChristmasDayTest.php | 8 +++-- tests/Latvia/StJohnsDayTest.php | 8 +++-- tests/Lithuania/AllSaintsDayTest.php | 8 +++-- tests/Lithuania/AllSoulsDayTest.php | 8 +++-- tests/Lithuania/AssumptionOfMaryDayTest.php | 8 +++-- tests/Lithuania/ChristmasDayTest.php | 8 +++-- tests/Lithuania/ChristmasEveDayTest.php | 8 +++-- tests/Lithuania/EasterDayTest.php | 8 +++-- tests/Lithuania/EasterMondayDayTest.php | 8 +++-- .../Lithuania/InternationalWorkersDayTest.php | 8 +++-- tests/Lithuania/LithuaniaBaseTestCase.php | 8 +++-- tests/Lithuania/LithuaniaTest.php | 8 +++-- tests/Lithuania/NewYearsDayTest.php | 8 +++-- ...rationOfIndependenceOfLithuaniaDayTest.php | 8 +++-- ...estorationOfTheStateOfLithuaniaDayTest.php | 8 +++-- tests/Lithuania/SecondChristmasDayTest.php | 8 +++-- tests/Lithuania/StJohnsDayTest.php | 8 +++-- tests/Lithuania/StatehoodDayTest.php | 8 +++-- tests/Luxembourg/AllSaintsDayTest.php | 9 +++-- tests/Luxembourg/AscensionDayTest.php | 9 +++-- tests/Luxembourg/AssumptionOfMaryTest.php | 9 +++-- tests/Luxembourg/ChristmasDayTest.php | 9 +++-- tests/Luxembourg/EasterMondayTest.php | 9 +++-- tests/Luxembourg/EuropeDayTest.php | 9 +++-- .../InternationalWorkersDayTest.php | 9 +++-- tests/Luxembourg/LuxembourgBaseTestCase.php | 9 +++-- tests/Luxembourg/LuxembourgTest.php | 9 +++-- tests/Luxembourg/NationalDayTest.php | 9 +++-- tests/Luxembourg/NewYearsDayTest.php | 9 +++-- tests/Luxembourg/PentecostMondayTest.php | 9 +++-- tests/Luxembourg/SecondChristmasDayTest.php | 9 +++-- tests/Mexico/AllSaintsDayTest.php | 9 +++-- tests/Mexico/AssumptionOfMaryTest.php | 9 +++-- tests/Mexico/BenitoJuarezBirthdayTest.php | 15 ++++++++- tests/Mexico/ChristmasTest.php | 9 +++-- tests/Mexico/EasterMondayTest.php | 9 +++-- tests/Mexico/EpiphanyTest.php | 9 +++-- tests/Mexico/GoodFridayTest.php | 9 +++-- tests/Mexico/ImmaculateConceptionTest.php | 9 +++-- tests/Mexico/IndependenceDayTest.php | 9 +++-- tests/Mexico/InternationalWorkersDayTest.php | 9 +++-- tests/Mexico/MexicoBaseTestCase.php | 9 +++-- tests/Mexico/NewYearsDayTest.php | 15 ++++++++- tests/Mexico/VirginOfGuadalupeTest.php | 15 ++++++++- tests/Netherlands/AscensionDayTest.php | 9 +++-- tests/Netherlands/AshWednesdayTest.php | 9 +++-- tests/Netherlands/ChristmasDayTest.php | 9 +++-- tests/Netherlands/CommemorationDayTest.php | 9 +++-- tests/Netherlands/DaylightSavingTime.php | 8 +++-- tests/Netherlands/EasterMondayTest.php | 9 +++-- tests/Netherlands/EasterTest.php | 9 +++-- tests/Netherlands/EpiphanyTest.php | 9 +++-- tests/Netherlands/FathersDayTest.php | 9 +++-- tests/Netherlands/GoodFridayTest.php | 9 +++-- tests/Netherlands/HalloweenTest.php | 9 +++-- .../InternationalWorkersDayTest.php | 9 +++-- tests/Netherlands/KingsDayTest.php | 9 +++-- tests/Netherlands/LiberationDayTest.php | 9 +++-- tests/Netherlands/MothersDayTest.php | 9 +++-- tests/Netherlands/NetherlandsBaseTestCase.php | 9 +++-- tests/Netherlands/NetherlandsTest.php | 9 +++-- tests/Netherlands/NewYearsDayTest.php | 9 +++-- tests/Netherlands/PentecostTest.php | 9 +++-- tests/Netherlands/QueensDayTest.php | 9 +++-- tests/Netherlands/ValentinesDayTest.php | 9 +++-- tests/Netherlands/WorldAnimalDayTest.php | 9 +++-- tests/Netherlands/carnivalDayTest.php | 9 +++-- tests/Netherlands/pentecostMondayTest.php | 9 +++-- tests/Netherlands/princesDayTest.php | 9 +++-- tests/Netherlands/secondCarnivalDay.php | 9 +++-- tests/Netherlands/secondChristmasdayTest.php | 9 +++-- tests/Netherlands/stMartinsDayTest.php | 9 +++-- tests/Netherlands/stNicholasDayTest.php | 9 +++-- tests/Netherlands/thirdCarnivalDay.php | 9 +++-- tests/NewZealand/AnzacDayTest.php | 9 +++-- tests/NewZealand/BoxingDayTest.php | 9 +++-- tests/NewZealand/ChristmasDayTest.php | 9 +++-- tests/NewZealand/DayAfterNewYearsDayTest.php | 9 +++-- tests/NewZealand/EasterMondayTest.php | 9 +++-- tests/NewZealand/GoodFridayTest.php | 9 +++-- tests/NewZealand/LabourDayTest.php | 11 ++++--- tests/NewZealand/NewYearsDayTest.php | 9 +++-- tests/NewZealand/NewZealandBaseTestCase.php | 9 +++-- tests/NewZealand/NewZealandTest.php | 9 +++-- tests/NewZealand/QueensBirthdayTest.php | 9 +++-- tests/NewZealand/WaitangiDayTest.php | 9 +++-- tests/Norway/AscensionDayTest.php | 9 +++-- tests/Norway/ChristmasDayTest.php | 9 +++-- tests/Norway/ConstitutionDayTest.php | 9 +++-- tests/Norway/EasterMondayTest.php | 9 +++-- tests/Norway/EasterTest.php | 9 +++-- tests/Norway/GoodFridayTest.php | 9 +++-- tests/Norway/InternationalWorkersDayTest.php | 9 +++-- tests/Norway/MaundyThursdayTest.php | 9 +++-- tests/Norway/NewYearsDayTest.php | 9 +++-- tests/Norway/NorwayBaseTestCase.php | 9 +++-- tests/Norway/NorwayTest.php | 9 +++-- tests/Norway/PentecostMondayTest.php | 9 +++-- tests/Norway/PentecostTest.php | 9 +++-- tests/Norway/SecondChristmasDayTest.php | 9 +++-- tests/Poland/AllSaintsDayTest.php | 9 +++-- tests/Poland/AssumptionOfMaryTest.php | 9 +++-- tests/Poland/ChristmasTest.php | 9 +++-- tests/Poland/ConstitutionDayTest.php | 9 +++-- tests/Poland/CorpusChristiTest.php | 9 +++-- tests/Poland/EasterMondayTest.php | 9 +++-- tests/Poland/EasterTest.php | 9 +++-- tests/Poland/EpiphanyTest.php | 9 +++-- tests/Poland/IndependenceDayTest.php | 9 +++-- tests/Poland/InternationalWorkersDayTest.php | 9 +++-- tests/Poland/NewYearsDayTest.php | 9 +++-- tests/Poland/PentecostTest.php | 9 +++-- tests/Poland/PolandBaseTestCase.php | 9 +++-- tests/Poland/PolandTest.php | 9 +++-- tests/Poland/SecondChristmasDayTest.php | 9 +++-- tests/Portugal/AllSaintsDayTest.php | 9 +++-- tests/Portugal/AssumptionOfMaryTest.php | 9 +++-- tests/Portugal/CarnationRevolutionDayTest.php | 9 +++-- tests/Portugal/ChristmasTest.php | 9 +++-- tests/Portugal/CorpusChristiTest.php | 9 +++-- tests/Portugal/EasterTest.php | 9 +++-- tests/Portugal/GoodFridayTest.php | 9 +++-- tests/Portugal/ImmaculateConceptionTest.php | 9 +++-- .../Portugal/InternationalWorkersDayTest.php | 9 +++-- tests/Portugal/NewYearsDayTest.php | 9 +++-- tests/Portugal/PortugalBaseTestCase.php | 9 +++-- tests/Portugal/PortugalDayTest.php | 9 +++-- tests/Portugal/PortugalTest.php | 9 +++-- tests/Portugal/PortugueseRepublicDayTest.php | 9 +++-- .../RestorationOfIndependenceTest.php | 9 +++-- tests/ProviderTestCase.php | 9 +++-- tests/Randomizer.php | 12 ++++--- tests/Romania/AssumptionOfMaryTest.php | 9 +++-- tests/Romania/ChildrensDayTest.php | 9 +++-- tests/Romania/ChristmasDayTest.php | 9 +++-- tests/Romania/ConstantinBrancusiDayTest.php | 9 +++-- tests/Romania/DayAfterNewYearsDayTest.php | 9 +++-- tests/Romania/EasterMondayTest.php | 9 +++-- tests/Romania/EasterTest.php | 9 +++-- tests/Romania/EpiphanyTest.php | 9 +++-- tests/Romania/InternationalWorkersDayTest.php | 9 +++-- tests/Romania/NationalDayTest.php | 9 +++-- tests/Romania/NewYearsDayTest.php | 9 +++-- tests/Romania/PentecostMondayTest.php | 9 +++-- tests/Romania/PentecostTest.php | 9 +++-- tests/Romania/RomaniaBaseTestCase.php | 9 +++-- tests/Romania/RomaniaTest.php | 8 +++-- tests/Romania/SecondChristmasDayTest.php | 9 +++-- tests/Romania/StAndrewsDayTest.php | 9 +++-- tests/Romania/StJohnsDayTest.php | 9 +++-- tests/Romania/UnitedPrincipalitiesDayTest.php | 9 +++-- .../Russia/DefenceOfTheFatherlandDayTest.php | 9 +++-- tests/Russia/InternationalWomensDayTest.php | 8 +++-- tests/Russia/NewYearHolidaysDay2Test.php | 8 +++-- tests/Russia/NewYearHolidaysDay3Test.php | 8 +++-- tests/Russia/NewYearHolidaysDay4Test.php | 9 +++-- tests/Russia/NewYearHolidaysDay5Test.php | 8 +++-- tests/Russia/NewYearHolidaysDay6Test.php | 8 +++-- tests/Russia/NewYearHolidaysDay8Test.php | 9 +++-- tests/Russia/NewYearsDayTest.php | 8 +++-- tests/Russia/OrthodoxChristmasDayTest.php | 8 +++-- tests/Russia/RussiaBaseTestCase.php | 8 +++-- tests/Russia/RussiaDayTest.php | 8 +++-- tests/Russia/RussiaTest.php | 8 +++-- tests/Russia/SpringAndLabourDayTest.php | 8 +++-- tests/Russia/UnityDayTest.php | 8 +++-- tests/Russia/VictoryDayTest.php | 8 +++-- tests/Slovakia/AllSaintsDayTest.php | 8 +++-- tests/Slovakia/ChristmasDayTest.php | 8 +++-- tests/Slovakia/ChristmasEveTest.php | 8 +++-- tests/Slovakia/EasterMondayTest.php | 8 +++-- tests/Slovakia/EpiphanyTest.php | 8 +++-- tests/Slovakia/GoodFridayTest.php | 8 +++-- .../Slovakia/InternationalWorkersDayTest.php | 8 +++-- tests/Slovakia/OurLadyOfSorrowsDayTest.php | 8 +++-- .../SaintsCyrilAndMethodiusDayTest.php | 8 +++-- tests/Slovakia/SecondChristmasDayTest.php | 8 +++-- tests/Slovakia/SlovakConstitutionDayTest.php | 8 +++-- tests/Slovakia/SlovakIndependenceDayTest.php | 8 +++-- .../SlovakNationalUprisingDayTest.php | 8 +++-- tests/Slovakia/SlovakiaBaseTestCase.php | 8 +++-- tests/Slovakia/SlovakiaTest.php | 8 +++-- .../StruggleForFreedomAndDemocracyDayTest.php | 8 +++-- tests/Slovakia/VictoryInEuropeDayTest.php | 8 +++-- tests/SouthAfrica/ChristmasDayTest.php | 11 ++++--- tests/SouthAfrica/FamilyDayTest.php | 9 +++-- tests/SouthAfrica/FreedomDayTest.php | 11 ++++--- tests/SouthAfrica/GoodFridayTest.php | 9 +++-- tests/SouthAfrica/HeritageDayTest.php | 11 ++++--- tests/SouthAfrica/HumanRightsDayTest.php | 11 ++++--- .../MunicipalElections2016DayTest.php | 11 ++++--- tests/SouthAfrica/NationalWomensDayTest.php | 11 ++++--- tests/SouthAfrica/NewYearsDayTest.php | 11 ++++--- tests/SouthAfrica/ReconciliationDayTest.php | 11 ++++--- tests/SouthAfrica/SecondChristmasDayTest.php | 11 ++++--- tests/SouthAfrica/SouthAfricaBaseTestCase.php | 8 +++-- tests/SouthAfrica/SouthAfricaTest.php | 8 +++-- .../SubstituteDayOfGoodwillTest.php | 11 ++++--- tests/SouthAfrica/WorkersDayTest.php | 11 ++++--- tests/SouthAfrica/YouthDayTest.php | 11 ++++--- tests/SouthKorea/ArborDayTest.php | 8 +++-- tests/SouthKorea/ArmedForcesDayTest.php | 8 +++-- tests/SouthKorea/BuddhasBirthdayTest.php | 8 +++-- tests/SouthKorea/ChildrensDayTest.php | 8 +++-- tests/SouthKorea/ChristmasDayTest.php | 8 +++-- tests/SouthKorea/ChuseokTest.php | 8 +++-- tests/SouthKorea/ConstitutionDayTest.php | 8 +++-- tests/SouthKorea/GaecheonjeolTest.php | 8 +++-- tests/SouthKorea/HangulDayTest.php | 8 +++-- .../IndependenceMovementDayTest.php | 8 +++-- tests/SouthKorea/LiberationDayTest.php | 8 +++-- tests/SouthKorea/MemorialDayTest.php | 8 +++-- tests/SouthKorea/NewYearsDayTest.php | 8 +++-- tests/SouthKorea/SeollalTest.php | 8 +++-- tests/SouthKorea/SouthKoreaBaseTestCase.php | 8 +++-- tests/SouthKorea/SouthKoreaTest.php | 8 +++-- tests/SouthKorea/UnitedNationsDayTest.php | 8 +++-- tests/Spain/AllSaintsDayTest.php | 9 +++-- .../Spain/Andalusia/AndalusiaBaseTestCase.php | 9 +++-- tests/Spain/Andalusia/AndalusiaDayTest.php | 9 +++-- tests/Spain/Andalusia/AndalusiaTest.php | 9 +++-- tests/Spain/Aragon/AragonBaseTestCase.php | 9 +++-- tests/Spain/Aragon/AragonTest.php | 9 +++-- tests/Spain/Aragon/StGeorgesDayTest.php | 9 +++-- tests/Spain/AssumptionOfMaryTest.php | 9 +++-- tests/Spain/Asturias/AsturiasBaseTestCase.php | 9 +++-- tests/Spain/Asturias/AsturiasDayTest.php | 9 +++-- tests/Spain/Asturias/AsturiasTest.php | 9 +++-- .../BalearicIslandsBaseTestCase.php | 9 +++-- .../BalearicIslandsDayTest.php | 9 +++-- .../BalearicIslands/BalearicIslandsTest.php | 9 +++-- .../BasqueCountryBaseTestCase.php | 9 +++-- .../BasqueCountry/BasqueCountryDayTest.php | 9 +++-- .../Spain/BasqueCountry/BasqueCountryTest.php | 9 +++-- .../CanaryIslandsBaseTestCase.php | 9 +++-- .../CanaryIslands/CanaryIslandsDayTest.php | 9 +++-- .../Spain/CanaryIslands/CanaryIslandsTest.php | 9 +++-- .../Spain/Cantabria/CantabriaBaseTestCase.php | 9 +++-- tests/Spain/Cantabria/CantabriaDayTest.php | 9 +++-- tests/Spain/Cantabria/CantabriaTest.php | 9 +++-- .../CastileAndLeonBaseTestCase.php | 9 +++-- .../CastileAndLeon/CastileAndLeonDayTest.php | 9 +++-- .../CastileAndLeon/CastileAndLeonTest.php | 9 +++-- .../CastillaLaManchaBaseTestCase.php | 9 +++-- .../CastillaLaManchaDayTest.php | 9 +++-- .../CastillaLaMancha/CastillaLaManchaTest.php | 9 +++-- .../Spain/Catalonia/CataloniaBaseTestCase.php | 9 +++-- tests/Spain/Catalonia/CataloniaTest.php | 9 +++-- .../Catalonia/nationalCataloniaDayTest.php | 9 +++-- tests/Spain/Catalonia/stJohnsDayTest.php | 9 +++-- tests/Spain/Ceuta/CeutaBaseTestCase.php | 9 +++-- tests/Spain/Ceuta/CeutaTest.php | 9 +++-- tests/Spain/Ceuta/ceutaDayTest.php | 9 +++-- tests/Spain/ChristmasTest.php | 9 +++-- .../CommunityOfMadridBaseTestCase.php | 9 +++-- .../CommunityOfMadridTest.php | 9 +++-- .../DosdeMayoUprisingDayTest.php | 9 +++-- tests/Spain/ConstitutionDayTest.php | 9 +++-- tests/Spain/EasterMondayTest.php | 9 +++-- tests/Spain/EpiphanyTest.php | 9 +++-- .../Extremadura/ExtremaduraBaseTestCase.php | 9 +++-- .../Spain/Extremadura/ExtremaduraDayTest.php | 9 +++-- tests/Spain/Extremadura/ExtremaduraTest.php | 9 +++-- tests/Spain/Galicia/GaliciaBaseTestCase.php | 9 +++-- tests/Spain/Galicia/GaliciaTest.php | 9 +++-- .../Galicia/GalicianLiteratureDayTest.php | 9 +++-- tests/Spain/Galicia/stJamesDayTest.php | 9 +++-- tests/Spain/GoodFridayTest.php | 9 +++-- tests/Spain/ImmaculateConceptionTest.php | 9 +++-- tests/Spain/InternationalWorkersDayTest.php | 9 +++-- tests/Spain/LaRioja/LaRiojaBaseTestCase.php | 9 +++-- tests/Spain/LaRioja/LaRiojaDayTest.php | 9 +++-- tests/Spain/LaRioja/LaRiojaTest.php | 9 +++-- tests/Spain/MaundyThursdayTest.php | 9 +++-- tests/Spain/Melilla/MelillaBaseTestCase.php | 9 +++-- tests/Spain/Melilla/MelillaTest.php | 9 +++-- tests/Spain/NationalDayTest.php | 9 +++-- tests/Spain/Navarre/NavarreBaseTestCase.php | 9 +++-- tests/Spain/Navarre/NavarreTest.php | 9 +++-- tests/Spain/NewYearsDayTest.php | 9 +++-- .../RegionOfMurciaBaseTestCase.php | 9 +++-- .../RegionOfMurcia/RegionOfMurciaDayTest.php | 9 +++-- .../RegionOfMurcia/RegionOfMurciaTest.php | 9 +++-- tests/Spain/SpainBaseTestCase.php | 9 +++-- tests/Spain/SpainTest.php | 9 +++-- .../ValencianCommunityBaseTestCase.php | 9 +++-- .../ValencianCommunityDayTest.php | 9 +++-- .../ValencianCommunityTest.php | 9 +++-- tests/Spain/ValentinesDayTest.php | 9 +++-- tests/Spain/stJosephsDayTest.php | 9 +++-- tests/Sweden/AllSaintsDayTest.php | 9 +++-- tests/Sweden/AllSaintsEveTest.php | 9 +++-- tests/Sweden/AscensionDayTest.php | 9 +++-- tests/Sweden/ChristmasDayTest.php | 9 +++-- tests/Sweden/ChristmasEveTest.php | 9 +++-- tests/Sweden/EasterMondayTest.php | 9 +++-- tests/Sweden/EasterTest.php | 9 +++-- tests/Sweden/EpiphanyEveTest.php | 9 +++-- tests/Sweden/EpiphanyTest.php | 9 +++-- tests/Sweden/GoodFridayTest.php | 9 +++-- tests/Sweden/InternationalWorkersDayTest.php | 9 +++-- tests/Sweden/NationalDayTest.php | 9 +++-- tests/Sweden/NewYearsDayTest.php | 9 +++-- tests/Sweden/NewYearsEveTest.php | 9 +++-- tests/Sweden/PentecostTest.php | 9 +++-- tests/Sweden/SecondChristmasDayTest.php | 9 +++-- tests/Sweden/StJohnsDayTest.php | 9 +++-- tests/Sweden/StJohnsEveTest.php | 9 +++-- tests/Sweden/SwedenBaseTestCase.php | 9 +++-- tests/Sweden/SwedenTest.php | 9 +++-- tests/Sweden/WalpurgisEveTest.php | 9 +++-- .../Switzerland/Aargau/AargauBaseTestCase.php | 9 +++-- tests/Switzerland/Aargau/AargauTest.php | 9 +++-- tests/Switzerland/Aargau/AscensionDayTest.php | 9 +++-- tests/Switzerland/Aargau/ChristmasDayTest.php | 9 +++-- tests/Switzerland/Aargau/GoodFridayTest.php | 9 +++-- tests/Switzerland/Aargau/NewYearsDayTest.php | 9 +++-- .../AppenzellAusserrhodenBaseTestCase.php | 9 +++-- .../AppenzellAusserrhodenTest.php | 9 +++-- .../AscensionDayTest.php | 9 +++-- .../ChristmasDayTest.php | 9 +++-- .../EasterMondayTest.php | 9 +++-- .../AppenzellAusserrhoden/GoodFridayTest.php | 9 +++-- .../AppenzellAusserrhoden/NewYearsDayTest.php | 9 +++-- .../PentecostMondayTest.php | 9 +++-- .../StStephensDayTest.php | 9 +++-- .../AppenzellInnerrhoden/AllSaintsDayTest.php | 9 +++-- .../AppenzellInnerrhodenBaseTestCase.php | 9 +++-- .../AppenzellInnerrhodenTest.php | 9 +++-- .../AppenzellInnerrhoden/AscensionDayTest.php | 9 +++-- .../AssumptionOfMaryTest.php | 9 +++-- .../AppenzellInnerrhoden/ChristmasDayTest.php | 9 +++-- .../CorpusChristiTest.php | 9 +++-- .../AppenzellInnerrhoden/EasterMondayTest.php | 9 +++-- .../AppenzellInnerrhoden/GoodFridayTest.php | 9 +++-- .../ImmaculateConceptionTest.php | 9 +++-- .../AppenzellInnerrhoden/NewYearsDayTest.php | 9 +++-- .../PentecostMondayTest.php | 9 +++-- .../StStephensDayTest.php | 9 +++-- .../BaselLandschaft/AscensionDayTest.php | 9 +++-- .../BaselLandschaftBaseTestCase.php | 9 +++-- .../BaselLandschaft/BaselLandschaftTest.php | 9 +++-- .../BaselLandschaft/ChristmasDayTest.php | 9 +++-- .../BaselLandschaft/EasterMondayTest.php | 9 +++-- .../BaselLandschaft/GoodFridayTest.php | 9 +++-- .../BaselLandschaft/NewYearsDayTest.php | 9 +++-- .../BaselLandschaft/PentecostMondayTest.php | 9 +++-- .../BaselLandschaft/StStephensDayTest.php | 9 +++-- .../BaselLandschaft/WorkersDayTest.php | 9 +++-- .../BaselStadt/AscensionDayTest.php | 9 +++-- .../BaselStadt/BaselStadtBaseTestCase.php | 9 +++-- .../Switzerland/BaselStadt/BaselStadtTest.php | 9 +++-- .../BaselStadt/ChristmasDayTest.php | 9 +++-- .../BaselStadt/EasterMondayTest.php | 9 +++-- .../Switzerland/BaselStadt/GoodFridayTest.php | 9 +++-- .../BaselStadt/NewYearsDayTest.php | 9 +++-- .../BaselStadt/PentecostMondayTest.php | 9 +++-- .../BaselStadt/StStephensDayTest.php | 9 +++-- .../Switzerland/BaselStadt/WorkersDayTest.php | 9 +++-- tests/Switzerland/Bern/AscensionDayTest.php | 9 +++-- tests/Switzerland/Bern/BerchtoldsTagTest.php | 11 ++++--- tests/Switzerland/Bern/BernBaseTestCase.php | 9 +++-- tests/Switzerland/Bern/BernTest.php | 9 +++-- tests/Switzerland/Bern/ChristmasDayTest.php | 9 +++-- tests/Switzerland/Bern/EasterMondayTest.php | 9 +++-- tests/Switzerland/Bern/GoodFridayTest.php | 9 +++-- tests/Switzerland/Bern/NewYearsDayTest.php | 9 +++-- .../Switzerland/Bern/PentecostMondayTest.php | 9 +++-- tests/Switzerland/Bern/StStephensDayTest.php | 9 +++-- .../Switzerland/Fribourg/AllSaintsDayTest.php | 9 +++-- .../Switzerland/Fribourg/AscensionDayTest.php | 9 +++-- .../Fribourg/AssumptionOfMaryTest.php | 9 +++-- .../Fribourg/BerchtoldsTagTest.php | 11 ++++--- .../Switzerland/Fribourg/ChristmasDayTest.php | 9 +++-- .../Fribourg/CorpusChristiTest.php | 9 +++-- .../Switzerland/Fribourg/December26thTest.php | 9 +++-- .../Switzerland/Fribourg/EasterMondayTest.php | 9 +++-- .../Fribourg/FribourgBaseTestCase.php | 9 +++-- tests/Switzerland/Fribourg/FribourgTest.php | 9 +++-- tests/Switzerland/Fribourg/GoodFridayTest.php | 9 +++-- .../Fribourg/ImmaculateConceptionTest.php | 9 +++-- .../Switzerland/Fribourg/NewYearsDayTest.php | 9 +++-- .../Fribourg/PentecostMondayTest.php | 9 +++-- tests/Switzerland/Geneva/AscensionDayTest.php | 9 +++-- tests/Switzerland/Geneva/ChristmasDayTest.php | 9 +++-- tests/Switzerland/Geneva/EasterMondayTest.php | 9 +++-- .../Switzerland/Geneva/GenevaBaseTestCase.php | 9 +++-- tests/Switzerland/Geneva/GenevaTest.php | 9 +++-- tests/Switzerland/Geneva/GoodFridayTest.php | 9 +++-- .../Switzerland/Geneva/JeuneGenevoisTest.php | 13 +++++--- tests/Switzerland/Geneva/NewYearsDayTest.php | 9 +++-- .../Geneva/PentecostMondayTest.php | 9 +++-- .../Geneva/RestaurationGenevoiseTest.php | 11 ++++--- tests/Switzerland/Glarus/AllSaintsDayTest.php | 9 +++-- tests/Switzerland/Glarus/AscensionDayTest.php | 9 +++-- .../Switzerland/Glarus/BerchtoldsTagTest.php | 11 ++++--- tests/Switzerland/Glarus/ChristmasDayTest.php | 9 +++-- tests/Switzerland/Glarus/EasterMondayTest.php | 9 +++-- .../Switzerland/Glarus/GlarusBaseTestCase.php | 9 +++-- tests/Switzerland/Glarus/GlarusTest.php | 9 +++-- tests/Switzerland/Glarus/GoodFridayTest.php | 9 +++-- .../Switzerland/Glarus/NafelserFahrtTest.php | 11 ++++--- tests/Switzerland/Glarus/NewYearsDayTest.php | 9 +++-- .../Glarus/PentecostMondayTest.php | 9 +++-- .../Switzerland/Glarus/StStephensDayTest.php | 9 +++-- .../Switzerland/Grisons/AscensionDayTest.php | 9 +++-- .../Switzerland/Grisons/ChristmasDayTest.php | 9 +++-- .../Switzerland/Grisons/EasterMondayTest.php | 9 +++-- tests/Switzerland/Grisons/GoodFridayTest.php | 9 +++-- .../Grisons/GrisonsBaseTestCase.php | 9 +++-- tests/Switzerland/Grisons/GrisonsTest.php | 9 +++-- tests/Switzerland/Grisons/NewYearsDayTest.php | 9 +++-- .../Grisons/PentecostMondayTest.php | 9 +++-- .../Switzerland/Grisons/StStephensDayTest.php | 9 +++-- tests/Switzerland/Jura/AllSaintsDayTest.php | 9 +++-- tests/Switzerland/Jura/AscensionDayTest.php | 9 +++-- .../Switzerland/Jura/AssumptionOfMaryTest.php | 9 +++-- tests/Switzerland/Jura/BerchtoldsTagTest.php | 11 ++++--- tests/Switzerland/Jura/BettagsMontagTest.php | 11 ++++--- tests/Switzerland/Jura/ChristmasDayTest.php | 9 +++-- tests/Switzerland/Jura/CorpusChristiTest.php | 9 +++-- tests/Switzerland/Jura/EasterMondayTest.php | 9 +++-- tests/Switzerland/Jura/EasterTest.php | 9 +++-- tests/Switzerland/Jura/GoodFridayTest.php | 9 +++-- tests/Switzerland/Jura/JuraBaseTestCase.php | 9 +++-- tests/Switzerland/Jura/JuraTest.php | 9 +++-- tests/Switzerland/Jura/NewYearsDayTest.php | 9 +++-- .../Switzerland/Jura/PentecostMondayTest.php | 9 +++-- tests/Switzerland/Jura/PentecostTest.php | 9 +++-- .../Jura/PlebisciteJurassienTest.php | 9 +++-- tests/Switzerland/Jura/WorkersDayTest.php | 9 +++-- .../Switzerland/Lucerne/AllSaintsDayTest.php | 9 +++-- .../Switzerland/Lucerne/AscensionDayTest.php | 9 +++-- .../Lucerne/AssumptionOfMaryTest.php | 9 +++-- .../Switzerland/Lucerne/BerchtoldsTagTest.php | 11 ++++--- .../Switzerland/Lucerne/ChristmasDayTest.php | 9 +++-- .../Switzerland/Lucerne/CorpusChristiTest.php | 9 +++-- .../Switzerland/Lucerne/EasterMondayTest.php | 9 +++-- tests/Switzerland/Lucerne/GoodFridayTest.php | 9 +++-- .../Lucerne/ImmaculateConceptionTest.php | 9 +++-- .../Lucerne/LucerneBaseTestCase.php | 9 +++-- tests/Switzerland/Lucerne/LucerneTest.php | 9 +++-- tests/Switzerland/Lucerne/NewYearsDayTest.php | 9 +++-- .../Lucerne/PentecostMondayTest.php | 9 +++-- .../Switzerland/Lucerne/StStephensDayTest.php | 9 +++-- .../Neuchatel/AscensionDayTest.php | 9 +++-- .../Neuchatel/BettagsMontagTest.php | 11 ++++--- .../Neuchatel/ChristmasDayTest.php | 9 +++-- .../Neuchatel/December26thTest.php | 11 ++++--- .../Neuchatel/EasterMondayTest.php | 9 +++-- .../Switzerland/Neuchatel/GoodFridayTest.php | 9 +++-- .../Neuchatel/InstaurationRepubliqueTest.php | 9 +++-- .../Switzerland/Neuchatel/January2ndTest.php | 11 ++++--- .../Neuchatel/NeuchatelBaseTestCase.php | 9 +++-- tests/Switzerland/Neuchatel/NeuchatelTest.php | 9 +++-- .../Switzerland/Neuchatel/NewYearsDayTest.php | 9 +++-- .../Neuchatel/PentecostMondayTest.php | 9 +++-- .../Switzerland/Neuchatel/WorkersDayTest.php | 9 +++-- .../Nidwalden/AllSaintsDayTest.php | 9 +++-- .../Nidwalden/AscensionDayTest.php | 9 +++-- .../Nidwalden/AssumptionOfMaryTest.php | 9 +++-- .../Nidwalden/ChristmasDayTest.php | 9 +++-- .../Nidwalden/CorpusChristiTest.php | 9 +++-- .../Nidwalden/EasterMondayTest.php | 9 +++-- .../Switzerland/Nidwalden/GoodFridayTest.php | 9 +++-- .../Nidwalden/ImmaculateConceptionTest.php | 9 +++-- .../Switzerland/Nidwalden/NewYearsDayTest.php | 9 +++-- .../Nidwalden/NidwaldenBaseTestCase.php | 9 +++-- tests/Switzerland/Nidwalden/NidwaldenTest.php | 9 +++-- .../Nidwalden/PentecostMondayTest.php | 9 +++-- .../Switzerland/Nidwalden/StJosephDayTest.php | 9 +++-- .../Nidwalden/StStephensDayTest.php | 9 +++-- .../Switzerland/Obwalden/AllSaintsDayTest.php | 9 +++-- .../Switzerland/Obwalden/AscensionDayTest.php | 9 +++-- .../Obwalden/AssumptionOfMaryTest.php | 9 +++-- .../Obwalden/BerchtoldsTagTest.php | 11 ++++--- .../Obwalden/BruderKlausenFestTest.php | 13 +++++--- .../Switzerland/Obwalden/ChristmasDayTest.php | 9 +++-- .../Obwalden/CorpusChristiTest.php | 9 +++-- .../Switzerland/Obwalden/EasterMondayTest.php | 9 +++-- tests/Switzerland/Obwalden/GoodFridayTest.php | 9 +++-- .../Obwalden/ImmaculateConceptionTest.php | 9 +++-- .../Switzerland/Obwalden/NewYearsDayTest.php | 9 +++-- .../Obwalden/ObwaldenBaseTestCase.php | 9 +++-- tests/Switzerland/Obwalden/ObwaldenTest.php | 9 +++-- .../Obwalden/PentecostMondayTest.php | 9 +++-- .../Obwalden/StStephensDayTest.php | 9 +++-- .../Schaffhausen/AscensionDayTest.php | 9 +++-- .../Schaffhausen/BerchtoldsTagTest.php | 11 ++++--- .../Schaffhausen/ChristmasDayTest.php | 9 +++-- .../Schaffhausen/EasterMondayTest.php | 9 +++-- .../Schaffhausen/GoodFridayTest.php | 9 +++-- .../Schaffhausen/NewYearsDayTest.php | 9 +++-- .../Schaffhausen/PentecostMondayTest.php | 9 +++-- .../Schaffhausen/SchaffhausenBaseTestCase.php | 9 +++-- .../Schaffhausen/SchaffhausenTest.php | 9 +++-- .../Schaffhausen/StStephensDayTest.php | 9 +++-- .../Schaffhausen/WorkersDayTest.php | 9 +++-- tests/Switzerland/Schwyz/AllSaintsDayTest.php | 9 +++-- tests/Switzerland/Schwyz/AscensionDayTest.php | 9 +++-- .../Schwyz/AssumptionOfMaryTest.php | 9 +++-- tests/Switzerland/Schwyz/ChristmasDayTest.php | 9 +++-- .../Switzerland/Schwyz/CorpusChristiTest.php | 9 +++-- tests/Switzerland/Schwyz/EasterMondayTest.php | 9 +++-- tests/Switzerland/Schwyz/EpiphanyTest.php | 9 +++-- tests/Switzerland/Schwyz/GoodFridayTest.php | 9 +++-- .../Schwyz/ImmaculateConceptionTest.php | 9 +++-- tests/Switzerland/Schwyz/NewYearsDayTest.php | 9 +++-- .../Schwyz/PentecostMondayTest.php | 9 +++-- .../Switzerland/Schwyz/SchwyzBaseTestCase.php | 9 +++-- tests/Switzerland/Schwyz/SchwyzTest.php | 9 +++-- tests/Switzerland/Schwyz/StJosephDayTest.php | 9 +++-- .../Switzerland/Schwyz/StStephensDayTest.php | 9 +++-- .../Solothurn/AscensionDayTest.php | 9 +++-- .../Solothurn/BerchtoldsTagTest.php | 11 ++++--- .../Solothurn/ChristmasDayTest.php | 9 +++-- .../Switzerland/Solothurn/GoodFridayTest.php | 9 +++-- .../Switzerland/Solothurn/NewYearsDayTest.php | 9 +++-- .../Solothurn/SolothurnBaseTestCase.php | 9 +++-- tests/Switzerland/Solothurn/SolothurnTest.php | 9 +++-- .../Switzerland/StGallen/AllSaintsDayTest.php | 9 +++-- .../Switzerland/StGallen/AscensionDayTest.php | 9 +++-- .../Switzerland/StGallen/ChristmasDayTest.php | 9 +++-- .../Switzerland/StGallen/EasterMondayTest.php | 9 +++-- tests/Switzerland/StGallen/GoodFridayTest.php | 9 +++-- .../Switzerland/StGallen/NewYearsDayTest.php | 9 +++-- .../StGallen/PentecostMondayTest.php | 9 +++-- .../StGallen/StGallenBaseTestCase.php | 9 +++-- tests/Switzerland/StGallen/StGallenTest.php | 9 +++-- .../StGallen/StStephensDayTest.php | 9 +++-- tests/Switzerland/SwissNationalDayTest.php | 9 +++-- tests/Switzerland/SwitzerlandBaseTestCase.php | 9 +++-- tests/Switzerland/SwitzerlandTest.php | 9 +++-- .../Switzerland/Thurgau/AscensionDayTest.php | 9 +++-- .../Switzerland/Thurgau/BerchtoldsTagTest.php | 11 ++++--- .../Switzerland/Thurgau/ChristmasDayTest.php | 9 +++-- .../Switzerland/Thurgau/EasterMondayTest.php | 9 +++-- tests/Switzerland/Thurgau/GoodFridayTest.php | 9 +++-- tests/Switzerland/Thurgau/NewYearsDayTest.php | 9 +++-- .../Thurgau/PentecostMondayTest.php | 9 +++-- .../Switzerland/Thurgau/StStephensDayTest.php | 9 +++-- .../Thurgau/ThurgauBaseTestCase.php | 9 +++-- tests/Switzerland/Thurgau/ThurgauTest.php | 9 +++-- tests/Switzerland/Thurgau/WorkersDayTest.php | 9 +++-- tests/Switzerland/Ticino/AllSaintsDayTest.php | 9 +++-- tests/Switzerland/Ticino/AscensionDayTest.php | 9 +++-- .../Ticino/AssumptionOfMaryTest.php | 9 +++-- tests/Switzerland/Ticino/ChristmasDayTest.php | 9 +++-- .../Switzerland/Ticino/CorpusChristiTest.php | 9 +++-- tests/Switzerland/Ticino/EasterMondayTest.php | 9 +++-- tests/Switzerland/Ticino/EpiphanyTest.php | 9 +++-- .../Ticino/ImmaculateConceptionTest.php | 9 +++-- tests/Switzerland/Ticino/NewYearsDayTest.php | 9 +++-- .../Ticino/PentecostMondayTest.php | 9 +++-- tests/Switzerland/Ticino/StJosephDayTest.php | 9 +++-- tests/Switzerland/Ticino/StPeterPaulTest.php | 9 +++-- .../Switzerland/Ticino/StStephensDayTest.php | 9 +++-- .../Switzerland/Ticino/TicinoBaseTestCase.php | 9 +++-- tests/Switzerland/Ticino/TicinoTest.php | 9 +++-- tests/Switzerland/Ticino/WorkersDayTest.php | 9 +++-- tests/Switzerland/Uri/AllSaintsDayTest.php | 9 +++-- tests/Switzerland/Uri/AscensionDayTest.php | 9 +++-- .../Switzerland/Uri/AssumptionOfMaryTest.php | 9 +++-- tests/Switzerland/Uri/ChristmasDayTest.php | 9 +++-- tests/Switzerland/Uri/CorpusChristiTest.php | 9 +++-- tests/Switzerland/Uri/EasterMondayTest.php | 9 +++-- tests/Switzerland/Uri/EpiphanyTest.php | 9 +++-- tests/Switzerland/Uri/GoodFridayTest.php | 9 +++-- .../Uri/ImmaculateConceptionTest.php | 9 +++-- tests/Switzerland/Uri/NewYearsDayTest.php | 9 +++-- tests/Switzerland/Uri/PentecostMondayTest.php | 9 +++-- tests/Switzerland/Uri/StJosephDayTest.php | 9 +++-- tests/Switzerland/Uri/StStephensDayTest.php | 9 +++-- tests/Switzerland/Uri/UriBaseTestCase.php | 9 +++-- tests/Switzerland/Uri/UriTest.php | 9 +++-- tests/Switzerland/Valais/AllSaintsDayTest.php | 9 +++-- tests/Switzerland/Valais/AscensionDayTest.php | 9 +++-- .../Valais/AssumptionOfMaryTest.php | 9 +++-- tests/Switzerland/Valais/ChristmasDayTest.php | 9 +++-- .../Switzerland/Valais/CorpusChristiTest.php | 9 +++-- .../Valais/ImmaculateConceptionTest.php | 9 +++-- tests/Switzerland/Valais/NewYearsDayTest.php | 9 +++-- tests/Switzerland/Valais/StJosephDayTest.php | 9 +++-- .../Switzerland/Valais/ValaisBaseTestCase.php | 9 +++-- tests/Switzerland/Valais/ValaisTest.php | 9 +++-- tests/Switzerland/Vaud/AscensionDayTest.php | 9 +++-- tests/Switzerland/Vaud/BerchtoldsTagTest.php | 11 ++++--- tests/Switzerland/Vaud/BettagsMontagTest.php | 11 ++++--- tests/Switzerland/Vaud/ChristmasDayTest.php | 9 +++-- tests/Switzerland/Vaud/EasterMondayTest.php | 9 +++-- tests/Switzerland/Vaud/GoodFridayTest.php | 9 +++-- tests/Switzerland/Vaud/NewYearsDayTest.php | 9 +++-- .../Switzerland/Vaud/PentecostMondayTest.php | 9 +++-- tests/Switzerland/Vaud/VaudBaseTestCase.php | 9 +++-- tests/Switzerland/Vaud/VaudTest.php | 9 +++-- tests/Switzerland/Zug/AllSaintsDayTest.php | 9 +++-- tests/Switzerland/Zug/AscensionDayTest.php | 9 +++-- .../Switzerland/Zug/AssumptionOfMaryTest.php | 9 +++-- tests/Switzerland/Zug/BerchtoldsTagTest.php | 11 ++++--- tests/Switzerland/Zug/ChristmasDayTest.php | 9 +++-- tests/Switzerland/Zug/CorpusChristiTest.php | 9 +++-- tests/Switzerland/Zug/EasterMondayTest.php | 9 +++-- tests/Switzerland/Zug/GoodFridayTest.php | 9 +++-- .../Zug/ImmaculateConceptionTest.php | 9 +++-- tests/Switzerland/Zug/NewYearsDayTest.php | 9 +++-- tests/Switzerland/Zug/PentecostMondayTest.php | 9 +++-- tests/Switzerland/Zug/StStephensDayTest.php | 9 +++-- tests/Switzerland/Zug/ZugBaseTestCase.php | 9 +++-- tests/Switzerland/Zug/ZugTest.php | 9 +++-- tests/Switzerland/Zurich/AscensionDayTest.php | 9 +++-- tests/Switzerland/Zurich/ChristmasDayTest.php | 9 +++-- tests/Switzerland/Zurich/EasterMondayTest.php | 9 +++-- tests/Switzerland/Zurich/GoodFridayTest.php | 9 +++-- tests/Switzerland/Zurich/NewYearsDayTest.php | 9 +++-- .../Zurich/PentecostMondayTest.php | 9 +++-- .../Switzerland/Zurich/StStephensDayTest.php | 9 +++-- tests/Switzerland/Zurich/WorkersDayTest.php | 9 +++-- .../Switzerland/Zurich/ZurichBaseTestCase.php | 9 +++-- tests/Switzerland/Zurich/ZurichTest.php | 9 +++-- tests/Turkey/CommemorationOfAtaturkTest.php | 9 +++-- tests/Turkey/DemocracyDayTest.php | 9 +++-- tests/Turkey/LabourDayTest.php | 9 +++-- tests/Turkey/NationalSovereigntyDayTest.php | 9 +++-- tests/Turkey/NewYearsDayTest.php | 9 +++-- tests/Turkey/RepublicDayTest.php | 9 +++-- tests/Turkey/TurkeyBaseTestCase.php | 9 +++-- tests/Turkey/TurkeyTest.php | 8 +++-- tests/Turkey/VictoryDayTest.php | 9 +++-- tests/USA/ChristmasDayTest.php | 9 +++-- tests/USA/ColumbusDayTest.php | 9 +++-- tests/USA/IndependenceDayTest.php | 9 +++-- tests/USA/JuneteenthTest.php | 9 +++-- tests/USA/LabourDayTest.php | 9 +++-- tests/USA/MartinLutherKingDayTest.php | 9 +++-- tests/USA/MemorialDayTest.php | 9 +++-- tests/USA/NewYearsDayTest.php | 9 +++-- tests/USA/ThanksgivingDayTest.php | 9 +++-- tests/USA/USABaseTestCase.php | 9 +++-- tests/USA/USATest.php | 9 +++-- tests/USA/VeteransDayTest.php | 9 +++-- tests/USA/WashingtonsBirthdayTest.php | 9 +++-- tests/Ukraine/CatholicChristmasDayTest.php | 8 +++-- tests/Ukraine/ChristmasDayTest.php | 9 +++-- tests/Ukraine/ConstitutionDayTest.php | 9 +++-- tests/Ukraine/DefenderOfUkraineDayTest.php | 9 +++-- tests/Ukraine/EasterTest.php | 9 +++-- tests/Ukraine/IndependenceDayTest.php | 9 +++-- tests/Ukraine/InternationalWomensDayTest.php | 9 +++-- tests/Ukraine/InternationalWorkersDayTest.php | 9 +++-- tests/Ukraine/NewYearsDayTest.php | 9 +++-- tests/Ukraine/PentecostTest.php | 9 +++-- .../SecondInternationalWorkersDayTest.php | 8 +++-- tests/Ukraine/SubstitutedHolidayTest.php | 10 +++--- tests/Ukraine/UkraineBaseTestCase.php | 9 +++-- tests/Ukraine/UkraineTest.php | 8 +++-- tests/Ukraine/VictoryDayTest.php | 9 +++-- tests/UnitedKingdom/BoxingDayTest.php | 13 +++++--- tests/UnitedKingdom/ChristmasDayTest.php | 13 +++++--- tests/UnitedKingdom/EasterMondayTest.php | 9 +++-- tests/UnitedKingdom/England/BoxingDayTest.php | 13 +++++--- .../England/ChristmasDayTest.php | 13 +++++--- .../England/EasterMondayTest.php | 9 +++-- .../England/EnglandBaseTestCase.php | 9 +++-- tests/UnitedKingdom/England/EnglandTest.php | 9 +++-- .../UnitedKingdom/England/GoodFridayTest.php | 9 +++-- .../England/MayDayBankHolidayTest.php | 9 +++-- .../UnitedKingdom/England/NewYearsDayTest.php | 9 +++-- .../England/SpringBankHolidayTest.php | 9 +++-- .../England/SummerBankHolidayTest.php | 9 +++-- tests/UnitedKingdom/GoodFridayTest.php | 9 +++-- .../KingCharlesCoronationBankHolidayTest.php | 9 +++-- tests/UnitedKingdom/MayDayBankHolidayTest.php | 9 +++-- tests/UnitedKingdom/MotheringSundayTest.php | 8 +++-- tests/UnitedKingdom/NewYearsDayTest.php | 9 +++-- .../NorthernIreland/BattleOfTheBoyneTest.php | 11 ++++--- .../NorthernIreland/BoxingDayTest.php | 13 +++++--- .../NorthernIreland/ChristmasDayTest.php | 13 +++++--- .../NorthernIreland/EasterMondayTest.php | 9 +++-- .../NorthernIreland/GoodFridayTest.php | 9 +++-- .../NorthernIreland/MayDayBankHolidayTest.php | 9 +++-- .../NorthernIreland/NewYearsDayTest.php | 9 +++-- .../NorthernIrelandBaseTestCase.php | 9 +++-- .../NorthernIreland/NorthernIrelandTest.php | 9 +++-- .../NorthernIreland/SpringBankHolidayTest.php | 9 +++-- .../NorthernIreland/StPatricksDayTest.php | 11 ++++--- .../NorthernIreland/SummerBankHolidayTest.php | 9 +++-- .../PlatinumJubileeBankHolidayTest.php | 9 +++-- .../QueenElizabethFuneralBankHolidayTest.php | 9 +++-- .../UnitedKingdom/Scotland/BoxingDayTest.php | 13 +++++--- .../Scotland/ChristmasDayTest.php | 13 +++++--- .../UnitedKingdom/Scotland/GoodFridayTest.php | 9 +++-- .../Scotland/MayDayBankHolidayTest.php | 9 +++-- .../Scotland/NewYearsDayTest.php | 11 ++++--- .../Scotland/ScotlandBaseTestCase.php | 9 +++-- tests/UnitedKingdom/Scotland/ScotlandTest.php | 9 +++-- .../Scotland/SecondNewYearsDayTest.php | 11 ++++--- .../Scotland/SpringBankHolidayTest.php | 9 +++-- .../Scotland/StAndrewsDayTest.php | 11 ++++--- .../Scotland/SummerBankHolidayTest.php | 9 +++-- tests/UnitedKingdom/SpringBankHolidayTest.php | 9 +++-- tests/UnitedKingdom/SummerBankHolidayTest.php | 9 +++-- .../UnitedKingdomBaseTestCase.php | 9 +++-- tests/UnitedKingdom/UnitedKingdomTest.php | 11 ++++--- tests/UnitedKingdom/Wales/BoxingDayTest.php | 13 +++++--- .../UnitedKingdom/Wales/ChristmasDayTest.php | 13 +++++--- .../UnitedKingdom/Wales/EasterMondayTest.php | 9 +++-- tests/UnitedKingdom/Wales/GoodFridayTest.php | 9 +++-- .../Wales/MayDayBankHolidayTest.php | 9 +++-- tests/UnitedKingdom/Wales/NewYearsDayTest.php | 9 +++-- .../Wales/SpringBankHolidayTest.php | 9 +++-- .../Wales/SummerBankHolidayTest.php | 9 +++-- .../UnitedKingdom/Wales/WalesBaseTestCase.php | 9 +++-- tests/UnitedKingdom/Wales/WalesTest.php | 9 +++-- tests/YasumiBase.php | 12 ++++--- 1692 files changed, 10157 insertions(+), 5281 deletions(-) diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index b84347c26..206439d0d 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -1,9 +1,11 @@ */ -$config = new AzuyaLabs\PhpCsFixerConfig\Config(); +$config = new AzuyaLabs\PhpCsFixerConfig\Config('2015', null, 'Yasumi'); $config->getFinder()->in(__DIR__)->notPath('var'); +$defaults = $config->getRules(); + +$config->setRules(array_merge($defaults, [ + 'php_unit_method_casing' => ['case' => 'camel_case'], +])); + return $config; diff --git a/composer.json b/composer.json index 1b06f3622..8db19a93d 100644 --- a/composer.json +++ b/composer.json @@ -40,8 +40,7 @@ }, "require-dev": { "ext-intl": "*", - "azuyalabs/php-cs-fixer-config": "^0.1", - "friendsofphp/php-cs-fixer": "^2.19 || 3.48", + "azuyalabs/php-cs-fixer-config": "^0.3", "mikey179/vfsstream": "^1.6", "phan/phan": "^5.4", "phpstan/phpstan": "^1.10", diff --git a/examples/basic.php b/examples/basic.php index 4407f7351..9cf5b8f98 100644 --- a/examples/basic.php +++ b/examples/basic.php @@ -2,7 +2,20 @@ // This file demonstrates the general use of Yasumi and its basic methods. -declare(strict_types=1); +declare(strict_types = 1); + +/** + * This file is part of the 'Yasumi' package. + * + * The easy PHP Library for calculating holidays. + * + * Copyright (c) 2015 - 2024 AzuyaLabs + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @author Sacha Telgenhof + */ require 'vendor/autoload.php'; @@ -10,20 +23,20 @@ $holidays = Yasumi\Yasumi::create('USA', (int) date('Y')); // Show the number of defined holidays -echo 'Number of defined holidays: '.$holidays->count().PHP_EOL; +echo 'Number of defined holidays: ' . $holidays->count() . PHP_EOL; echo PHP_EOL; // Display a list all of the holiday names (short names) -echo 'List of all the holiday names: '.PHP_EOL; +echo 'List of all the holiday names: ' . PHP_EOL; foreach ($holidays->getHolidayNames() as $name) { - echo $name.PHP_EOL; + echo $name . PHP_EOL; } echo PHP_EOL; // Display a list all of the holiday dates -echo 'List of all the holiday dates:'.PHP_EOL; +echo 'List of all the holiday dates:' . PHP_EOL; foreach ($holidays->getHolidayDates() as $date) { - echo $date.PHP_EOL; + echo $date . PHP_EOL; } echo PHP_EOL; @@ -31,17 +44,17 @@ $independenceDay = $holidays->getHoliday('independenceDay'); // Show the localized name -echo 'Name of the holiday : '.$independenceDay->getName().PHP_EOL; +echo 'Name of the holiday : ' . $independenceDay->getName() . PHP_EOL; // Show the date -echo 'Date of the holiday : '.$independenceDay.PHP_EOL; +echo 'Date of the holiday : ' . $independenceDay . PHP_EOL; // Show the type of holiday -echo 'Type of holiday : '.$independenceDay->getType().PHP_EOL; +echo 'Type of holiday : ' . $independenceDay->getType() . PHP_EOL; echo PHP_EOL; // Dump the holiday as a JSON object -echo 'Holiday as a JSON object:'.PHP_EOL; +echo 'Holiday as a JSON object:' . PHP_EOL; echo json_encode($independenceDay, JSON_PRETTY_PRINT); echo PHP_EOL; diff --git a/examples/between_filter.php b/examples/between_filter.php index 4b1358c9a..4b8b46f7c 100644 --- a/examples/between_filter.php +++ b/examples/between_filter.php @@ -3,7 +3,20 @@ // This file demonstrates the use of the `between` filter, selecting only a number of holidays // that fall in the given date range. -declare(strict_types=1); +declare(strict_types = 1); + +/** + * This file is part of the 'Yasumi' package. + * + * The easy PHP Library for calculating holidays. + * + * Copyright (c) 2015 - 2024 AzuyaLabs + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @author Sacha Telgenhof + */ require 'vendor/autoload.php'; @@ -12,16 +25,16 @@ // Use the factory to create a new holiday provider instance $holidays = Yasumi\Yasumi::create('Italy', $year); $holidaysInDecember = $holidays->between( - new DateTime('12/01/'.$year), - new DateTime('12/31/'.$year) + new DateTime('12/01/' . $year), + new DateTime('12/31/' . $year) ); // Show all holidays in Italy for December -echo 'List of all the holidays in December: '.PHP_EOL; +echo 'List of all the holidays in December: ' . PHP_EOL; foreach ($holidaysInDecember as $holiday) { - echo $holiday.' - '.$holiday->getName().PHP_EOL; + echo $holiday . ' - ' . $holiday->getName() . PHP_EOL; } echo PHP_EOL; // Show the number of filtered holidays -echo 'Number of filtered holidays: '.$holidaysInDecember->count().PHP_EOL; +echo 'Number of filtered holidays: ' . $holidaysInDecember->count() . PHP_EOL; diff --git a/examples/custom_provider.php b/examples/custom_provider.php index 773f93cc3..57f514d63 100644 --- a/examples/custom_provider.php +++ b/examples/custom_provider.php @@ -4,7 +4,20 @@ // those scenarios where you would need only a subset of holidays of an existing provider. Or, if you you like to // extend an existing provider with additional, non-standard holidays. -declare(strict_types=1); +declare(strict_types = 1); + +/** + * This file is part of the 'Yasumi' package. + * + * The easy PHP Library for calculating holidays. + * + * Copyright (c) 2015 - 2024 AzuyaLabs + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @author Sacha Telgenhof + */ require 'vendor/autoload.php'; @@ -33,11 +46,11 @@ public function initialize(): void $NYSEHolidays = Yasumi\Yasumi::create(NYSE::class, (int) date('Y')); // We then can retrieve the NYSE observed holidays in the usual manner: -echo 'List of all the holiday names: '.PHP_EOL; +echo 'List of all the holiday names: ' . PHP_EOL; foreach ($NYSEHolidays->getHolidayNames() as $day) { - echo $day.PHP_EOL; + echo $day . PHP_EOL; } echo PHP_EOL; // Use the count() method to show how many holidays are returned -echo 'Number of defined holidays: '.$NYSEHolidays->count().PHP_EOL; +echo 'Number of defined holidays: ' . $NYSEHolidays->count() . PHP_EOL; diff --git a/examples/filters.php b/examples/filters.php index 3a82af460..5e85543ab 100644 --- a/examples/filters.php +++ b/examples/filters.php @@ -4,7 +4,20 @@ // based on certain conditions. In this examples we show only the holidays that are // marked as 'official'. -declare(strict_types=1); +declare(strict_types = 1); + +/** + * This file is part of the 'Yasumi' package. + * + * The easy PHP Library for calculating holidays. + * + * Copyright (c) 2015 - 2024 AzuyaLabs + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @author Sacha Telgenhof + */ require 'vendor/autoload.php'; @@ -14,7 +27,7 @@ // Create a filter instance for the official holidays $official = new Yasumi\Filters\OfficialHolidaysFilter($holidays->getIterator()); -echo 'List of all official holidays: '.PHP_EOL; +echo 'List of all official holidays: ' . PHP_EOL; foreach ($official as $day) { - echo $day->getName().PHP_EOL; + echo $day->getName() . PHP_EOL; } diff --git a/phpinsights.php b/phpinsights.php index 4b5520d8b..9dbda25a8 100644 --- a/phpinsights.php +++ b/phpinsights.php @@ -1,6 +1,19 @@ + */ return [ /* diff --git a/rector.php b/rector.php index a75a58ab8..112903d93 100644 --- a/rector.php +++ b/rector.php @@ -1,6 +1,19 @@ + */ use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector; use Rector\Config\RectorConfig; @@ -8,8 +21,8 @@ return static function (RectorConfig $rectorConfig): void { $rectorConfig->paths([ - __DIR__.'/src', - __DIR__.'/tests', + __DIR__ . '/src', + __DIR__ . '/tests', ]); // single rules diff --git a/src/Yasumi/Exception/Exception.php b/src/Yasumi/Exception/Exception.php index fe9254e73..4faee05ea 100644 --- a/src/Yasumi/Exception/Exception.php +++ b/src/Yasumi/Exception/Exception.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'queensBirthday', [], - new \DateTime('second monday of june '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('second monday of june ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); @@ -190,10 +192,10 @@ protected function calculateReconciliationDay(): void return; } - $date = new \DateTime($this->year.'-05-27', DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime($this->year . '-05-27', DateTimeZoneFactory::getDateTimeZone($this->timezone)); $day = (int) $date->format('w'); if (1 !== $day) { - $date = $date->add(0 === $day ? new \DateInterval('P1D') : new \DateInterval('P'.(8 - $day).'D')); + $date = $date->add(0 === $day ? new \DateInterval('P1D') : new \DateInterval('P' . (8 - $day) . 'D')); } $this->addHoliday(new Holiday('reconciliationDay', ['en' => 'Reconciliation Day'], $date, $this->locale)); } diff --git a/src/Yasumi/Provider/Australia/NewSouthWales.php b/src/Yasumi/Provider/Australia/NewSouthWales.php index 54366a841..eb72ded0a 100644 --- a/src/Yasumi/Provider/Australia/NewSouthWales.php +++ b/src/Yasumi/Provider/Australia/NewSouthWales.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'queensBirthday', [], - new \DateTime('second monday of june '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('second monday of june ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); @@ -138,7 +140,7 @@ protected function calculateBankHoliday(): void $this->addHoliday(new Holiday( 'bankHoliday', ['en' => 'Bank Holiday'], - new \DateTime('first monday of august '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('first monday of august ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_BANK )); diff --git a/src/Yasumi/Provider/Australia/NorthernTerritory.php b/src/Yasumi/Provider/Australia/NorthernTerritory.php index 55c69d125..b9c88d4c0 100644 --- a/src/Yasumi/Provider/Australia/NorthernTerritory.php +++ b/src/Yasumi/Provider/Australia/NorthernTerritory.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'queensBirthday', [], - new \DateTime('second monday of june '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('second monday of june ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); @@ -139,7 +141,7 @@ protected function calculatePicnicDay(): void $this->addHoliday(new Holiday( 'picnicDay', ['en' => 'Picnic Day'], - new \DateTime('first monday of august '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('first monday of august ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); diff --git a/src/Yasumi/Provider/Australia/Queensland.php b/src/Yasumi/Provider/Australia/Queensland.php index 0c6e38dc7..6becbfd38 100644 --- a/src/Yasumi/Provider/Australia/Queensland.php +++ b/src/Yasumi/Provider/Australia/Queensland.php @@ -1,9 +1,11 @@ year; + $birthDay = 'first monday of october ' . $this->year; if ($this->year < 2012 || 2013 === $this->year || 2014 === $this->year || 2015 === $this->year) { - $birthDay = 'second monday of june '.$this->year; + $birthDay = 'second monday of june ' . $this->year; } $this->addHoliday(new Holiday( diff --git a/src/Yasumi/Provider/Australia/Queensland/Brisbane.php b/src/Yasumi/Provider/Australia/Queensland/Brisbane.php index b63d8f2dd..96c6c66be 100644 --- a/src/Yasumi/Provider/Australia/Queensland/Brisbane.php +++ b/src/Yasumi/Provider/Australia/Queensland/Brisbane.php @@ -1,9 +1,11 @@ year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime('first friday of august ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); if ($date->format('d') < 5) { $date = $date->add(new \DateInterval('P7D')); } diff --git a/src/Yasumi/Provider/Australia/SouthAustralia.php b/src/Yasumi/Provider/Australia/SouthAustralia.php index a08713fc0..d27e69f33 100644 --- a/src/Yasumi/Provider/Australia/SouthAustralia.php +++ b/src/Yasumi/Provider/Australia/SouthAustralia.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'queensBirthday', [], - new \DateTime('second monday of june '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('second monday of june ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); @@ -145,10 +147,10 @@ protected function calculateLabourDay(): void protected function calculateAdelaideCupDay(): void { if ($this->year >= 1973) { - $cupDay = 'second monday of march '.$this->year; + $cupDay = 'second monday of march ' . $this->year; if ($this->year < 2006) { - $cupDay = 'third monday of may '.$this->year; + $cupDay = 'third monday of may ' . $this->year; } $this->addHoliday(new Holiday( diff --git a/src/Yasumi/Provider/Australia/Tasmania.php b/src/Yasumi/Provider/Australia/Tasmania.php index 7d97aa80f..9dce59344 100644 --- a/src/Yasumi/Provider/Australia/Tasmania.php +++ b/src/Yasumi/Provider/Australia/Tasmania.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'queensBirthday', [], - new \DateTime('second monday of june '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('second monday of june ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); @@ -100,7 +102,7 @@ protected function calculateRecreationDay(): void $this->addHoliday(new Holiday( 'recreationDay', ['en' => 'Recreation Day'], - new \DateTime('first monday of november '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('first monday of november ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); diff --git a/src/Yasumi/Provider/Australia/Tasmania/CentralNorth.php b/src/Yasumi/Provider/Australia/Tasmania/CentralNorth.php index 3701c94b9..5134add2f 100644 --- a/src/Yasumi/Provider/Australia/Tasmania/CentralNorth.php +++ b/src/Yasumi/Provider/Australia/Tasmania/CentralNorth.php @@ -1,9 +1,11 @@ year.'-12-02', DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime($this->year . '-12-02', DateTimeZoneFactory::getDateTimeZone($this->timezone)); $date = $date->modify('previous friday'); if (! $date instanceof \DateTime) { diff --git a/src/Yasumi/Provider/Australia/Tasmania/FlindersIsland.php b/src/Yasumi/Provider/Australia/Tasmania/FlindersIsland.php index 7f50e4579..91f9d227b 100644 --- a/src/Yasumi/Provider/Australia/Tasmania/FlindersIsland.php +++ b/src/Yasumi/Provider/Australia/Tasmania/FlindersIsland.php @@ -1,9 +1,11 @@ year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime('third saturday of october ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); $date = $date->sub(new \DateInterval('P1D')); $this->addHoliday(new Holiday('flindersIslandShow', ['en' => 'Flinders Island Show'], $date, $this->locale)); } diff --git a/src/Yasumi/Provider/Australia/Tasmania/KingIsland.php b/src/Yasumi/Provider/Australia/Tasmania/KingIsland.php index 78e4abc43..1916b3ce2 100644 --- a/src/Yasumi/Provider/Australia/Tasmania/KingIsland.php +++ b/src/Yasumi/Provider/Australia/Tasmania/KingIsland.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'kingIslandShow', ['en' => 'King Island Show'], - new \DateTime('first tuesday of march '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('first tuesday of march ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); diff --git a/src/Yasumi/Provider/Australia/Tasmania/Northeast.php b/src/Yasumi/Provider/Australia/Tasmania/Northeast.php index b2aca1fd9..46fcf2dce 100644 --- a/src/Yasumi/Provider/Australia/Tasmania/Northeast.php +++ b/src/Yasumi/Provider/Australia/Tasmania/Northeast.php @@ -1,9 +1,11 @@ year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime('second saturday of october ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); $date = $date->sub(new \DateInterval('P2D')); $this->addHoliday(new Holiday('launcestonShow', ['en' => 'Royal Launceston Show'], $date, $this->locale)); } diff --git a/src/Yasumi/Provider/Australia/Tasmania/Northwest.php b/src/Yasumi/Provider/Australia/Tasmania/Northwest.php index be6fe7582..395204930 100644 --- a/src/Yasumi/Provider/Australia/Tasmania/Northwest.php +++ b/src/Yasumi/Provider/Australia/Tasmania/Northwest.php @@ -1,9 +1,11 @@ year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime('first saturday of october ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); $date = $date->sub(new \DateInterval('P1D')); $this->addHoliday(new Holiday('burnieShow', ['en' => 'Burnie Show'], $date, $this->locale)); } diff --git a/src/Yasumi/Provider/Australia/Tasmania/Northwest/CircularHead.php b/src/Yasumi/Provider/Australia/Tasmania/Northwest/CircularHead.php index 160e966a0..e6da79a16 100644 --- a/src/Yasumi/Provider/Australia/Tasmania/Northwest/CircularHead.php +++ b/src/Yasumi/Provider/Australia/Tasmania/Northwest/CircularHead.php @@ -1,9 +1,11 @@ year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime('first thursday of may ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); $date = $date->add(new \DateInterval('P1D')); $this->addHoliday(new Holiday('agfest', ['en' => 'AGFEST'], $date, $this->locale)); } diff --git a/src/Yasumi/Provider/Australia/Tasmania/South.php b/src/Yasumi/Provider/Australia/Tasmania/South.php index 512815daa..ee54acd74 100644 --- a/src/Yasumi/Provider/Australia/Tasmania/South.php +++ b/src/Yasumi/Provider/Australia/Tasmania/South.php @@ -1,9 +1,11 @@ year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime('fourth saturday of october ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)); $date = $date->sub(new \DateInterval('P2D')); $this->addHoliday(new Holiday('hobartShow', ['en' => 'Royal Hobart Show'], $date, $this->locale)); } diff --git a/src/Yasumi/Provider/Australia/Tasmania/South/Southeast.php b/src/Yasumi/Provider/Australia/Tasmania/South/Southeast.php index b489e4c53..08b73d70f 100644 --- a/src/Yasumi/Provider/Australia/Tasmania/South/Southeast.php +++ b/src/Yasumi/Provider/Australia/Tasmania/South/Southeast.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'hobartRegatta', ['en' => 'Royal Hobart Regatta'], - new \DateTime('second monday of february '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('second monday of february ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); diff --git a/src/Yasumi/Provider/Australia/Victoria.php b/src/Yasumi/Provider/Australia/Victoria.php index e0784de43..1757a0a85 100644 --- a/src/Yasumi/Provider/Australia/Victoria.php +++ b/src/Yasumi/Provider/Australia/Victoria.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'queensBirthday', [], - new \DateTime('second monday of june '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('second monday of june ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); @@ -167,7 +169,7 @@ protected function calculateQueensBirthday(): void */ protected function calculateMelbourneCupDay(): void { - $date = new \DateTime('first Tuesday of November'." {$this->year}", DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime('first Tuesday of November' . " {$this->year}", DateTimeZoneFactory::getDateTimeZone($this->timezone)); $this->addHoliday(new Holiday('melbourneCup', ['en' => 'Melbourne Cup'], $date, $this->locale)); } diff --git a/src/Yasumi/Provider/Australia/WesternAustralia.php b/src/Yasumi/Provider/Australia/WesternAustralia.php index 6727b2609..ffe2fd801 100644 --- a/src/Yasumi/Provider/Australia/WesternAustralia.php +++ b/src/Yasumi/Provider/Australia/WesternAustralia.php @@ -1,9 +1,11 @@ year; + $birthDay = 'last monday of september ' . $this->year; if (2011 === $this->year) { $birthDay = '2011-10-28'; } @@ -109,7 +111,7 @@ protected function calculateWesternAustraliaDay(): void $this->addHoliday(new Holiday( 'westernAustraliaDay', ['en' => 'Western Australia Day'], - new \DateTime('first monday of june '.$this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime('first monday of june ' . $this->year, DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); diff --git a/src/Yasumi/Provider/Austria.php b/src/Yasumi/Provider/Austria.php index 1e3c5516b..37898e399 100644 --- a/src/Yasumi/Provider/Austria.php +++ b/src/Yasumi/Provider/Austria.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'stLeopoldsDay', [], - new \DateTime($this->year.'-11-15', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-11-15', new \DateTimeZone($this->timezone)), $this->locale )); } @@ -125,7 +127,7 @@ protected function calculateNationalDay(): void $this->addHoliday(new Holiday( 'nationalDay', ['de' => 'Nationalfeiertag'], - new \DateTime($this->year.'-10-26', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-10-26', new \DateTimeZone($this->timezone)), $this->locale )); } diff --git a/src/Yasumi/Provider/Austria/Burgenland.php b/src/Yasumi/Provider/Austria/Burgenland.php index d9cf6c577..864c3314e 100644 --- a/src/Yasumi/Provider/Austria/Burgenland.php +++ b/src/Yasumi/Provider/Austria/Burgenland.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'plebisciteDay', [], - new \DateTime($this->year.'-10-10', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-10-10', new \DateTimeZone($this->timezone)), $this->locale )); } diff --git a/src/Yasumi/Provider/Austria/LowerAustria.php b/src/Yasumi/Provider/Austria/LowerAustria.php index 68696edc5..765ab054e 100644 --- a/src/Yasumi/Provider/Austria/LowerAustria.php +++ b/src/Yasumi/Provider/Austria/LowerAustria.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'stRupertsDay', [], - new \DateTime($this->year.'-9-24', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-9-24', new \DateTimeZone($this->timezone)), $this->locale )); } diff --git a/src/Yasumi/Provider/Austria/Styria.php b/src/Yasumi/Provider/Austria/Styria.php index bc88f2c0c..81b10f2fa 100644 --- a/src/Yasumi/Provider/Austria/Styria.php +++ b/src/Yasumi/Provider/Austria/Styria.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'stFloriansDay', [], - new \DateTime($this->year.'-5-4', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-5-4', new \DateTimeZone($this->timezone)), $this->locale )); } diff --git a/src/Yasumi/Provider/Austria/Vienna.php b/src/Yasumi/Provider/Austria/Vienna.php index 18f83e2a9..6cbc1f219 100644 --- a/src/Yasumi/Provider/Austria/Vienna.php +++ b/src/Yasumi/Provider/Austria/Vienna.php @@ -1,9 +1,11 @@ year < 1983) { return; } - $date = new \DateTime($this->year.'-07-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime($this->year . '-07-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)); if (7 === (int) $date->format('N')) { - $date = new \DateTime($this->year.'-07-02', DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime($this->year . '-07-02', DateTimeZoneFactory::getDateTimeZone($this->timezone)); } $this->addHoliday(new Holiday( 'canadaDay', diff --git a/src/Yasumi/Provider/Canada/Alberta.php b/src/Yasumi/Provider/Canada/Alberta.php index ef982cfa1..b827f8007 100644 --- a/src/Yasumi/Provider/Canada/Alberta.php +++ b/src/Yasumi/Provider/Canada/Alberta.php @@ -1,9 +1,11 @@ 'St. Patrick’s Day'], - new \DateTime($this->year.'-3-17', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-3-17', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_BANK ); @@ -122,7 +124,7 @@ protected function calculateOrangemensDay(): void $holiday = new Holiday( 'orangemensDay', [], - new \DateTime($this->year.'-7-12', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-7-12', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_BANK ); diff --git a/src/Yasumi/Provider/Canada/NorthwestTerritories.php b/src/Yasumi/Provider/Canada/NorthwestTerritories.php index ec1802d76..25662fa73 100644 --- a/src/Yasumi/Provider/Canada/NorthwestTerritories.php +++ b/src/Yasumi/Provider/Canada/NorthwestTerritories.php @@ -1,9 +1,11 @@ add(new \DateInterval('P'.$easterDays.'D')); + $easter->add(new \DateInterval('P' . $easterDays . 'D')); return $easter; } diff --git a/src/Yasumi/Provider/CommonHolidays.php b/src/Yasumi/Provider/CommonHolidays.php index e4006fb5f..762e84897 100644 --- a/src/Yasumi/Provider/CommonHolidays.php +++ b/src/Yasumi/Provider/CommonHolidays.php @@ -1,9 +1,11 @@ 'Den obnovy samostatného českého státu', 'en' => 'Day of renewal of the independent Czech state', ], - new \DateTime($this->year.'-01-01', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-01-01', new \DateTimeZone($this->timezone)), $this->locale )); } @@ -121,7 +123,7 @@ protected function calculateSaintsCyrilAndMethodiusDay(): void 'cs' => 'Den slovanských věrozvěstů Cyrila a Metoděje', 'en' => 'Saints Cyril and Methodius Day', ], - new \DateTime($this->year.'-07-5', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-07-5', new \DateTimeZone($this->timezone)), $this->locale )); } @@ -145,7 +147,7 @@ protected function calculateJanHusDay(): void $this->addHoliday(new Holiday( 'janHusDay', ['cs' => 'Den upálení mistra Jana Husa', 'en' => 'Jan Hus Day'], - new \DateTime($this->year.'-07-6', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-07-6', new \DateTimeZone($this->timezone)), $this->locale )); } @@ -175,7 +177,7 @@ protected function calculateCzechStatehoodDay(): void 'cs' => 'Den české státnosti', 'en' => 'St. Wenceslas Day (Czech Statehood Day)', ], - new \DateTime($this->year.'-09-28', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-09-28', new \DateTimeZone($this->timezone)), $this->locale )); } @@ -194,7 +196,7 @@ protected function calculateIndependentCzechoslovakStateDay(): void $this->addHoliday(new Holiday('independentCzechoslovakStateDay', [ 'cs' => 'Den vzniku samostatného československého státu', 'en' => 'Independent Czechoslovak State Day', - ], new \DateTime($this->year.'-10-28', new \DateTimeZone($this->timezone)), $this->locale)); + ], new \DateTime($this->year . '-10-28', new \DateTimeZone($this->timezone)), $this->locale)); } /** @@ -214,7 +216,7 @@ protected function calculateStruggleForFreedomAndDemocracyDay(): void 'cs' => 'Den boje za svobodu a demokracii', 'en' => 'Struggle for Freedom and Democracy Day', ], - new \DateTime($this->year.'-11-17', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-11-17', new \DateTimeZone($this->timezone)), $this->locale )); } diff --git a/src/Yasumi/Provider/DateTimeZoneFactory.php b/src/Yasumi/Provider/DateTimeZoneFactory.php index 537828770..f09ea23f8 100644 --- a/src/Yasumi/Provider/DateTimeZoneFactory.php +++ b/src/Yasumi/Provider/DateTimeZoneFactory.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'germanUnityDay', ['de' => 'Tag der Deutschen Einheit'], - new \DateTime($this->year.'-10-3', new \DateTimeZone($this->timezone)), + new \DateTime($this->year . '-10-3', new \DateTimeZone($this->timezone)), $this->locale )); } diff --git a/src/Yasumi/Provider/Germany/BadenWurttemberg.php b/src/Yasumi/Provider/Germany/BadenWurttemberg.php index 678710d4e..57eec668c 100644 --- a/src/Yasumi/Provider/Germany/BadenWurttemberg.php +++ b/src/Yasumi/Provider/Germany/BadenWurttemberg.php @@ -1,9 +1,11 @@ 'Christmas Day', 'ga' => 'Lá Nollag'], - new \DateTime($this->year.'-12-25', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-12-25', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale ); @@ -198,7 +200,7 @@ protected function calculateStStephensDay(): void $holiday = new Holiday( 'stStephensDay', [], - new \DateTime($this->year.'-12-26', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-12-26', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale ); @@ -241,7 +243,7 @@ protected function calculateStPatricksDay(): void $holiday = new Holiday( 'stPatricksDay', ['en' => 'St. Patrick’s Day', 'ga' => 'Lá Fhéile Pádraig'], - new \DateTime($this->year.'-3-17', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-3-17', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale ); diff --git a/src/Yasumi/Provider/Italy.php b/src/Yasumi/Provider/Italy.php index 8266fd9ab..fa1521b7b 100644 --- a/src/Yasumi/Provider/Italy.php +++ b/src/Yasumi/Provider/Italy.php @@ -1,9 +1,11 @@ add(new \DateInterval('P1D')); - $this->addHoliday(new Holiday('bridgeDay'.$counter, [ + $this->addHoliday(new Holiday('bridgeDay' . $counter, [ 'en' => 'Bridge Public holiday', 'ja' => '国民の休日', ], $bridgeDate, $this->locale)); diff --git a/src/Yasumi/Provider/Latvia.php b/src/Yasumi/Provider/Latvia.php index 9afe8d51e..fde07e6d2 100644 --- a/src/Yasumi/Provider/Latvia.php +++ b/src/Yasumi/Provider/Latvia.php @@ -1,9 +1,11 @@ */ -declare(strict_types=1); +declare(strict_types = 1); + +/** + * This file is part of the 'Yasumi' package. + * + * The easy PHP Library for calculating holidays. + * + * Copyright (c) 2015 - 2024 AzuyaLabs + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @author Sacha Telgenhof + */ namespace Yasumi\Provider; diff --git a/src/Yasumi/Provider/Mexico.php b/src/Yasumi/Provider/Mexico.php index d4bbffaff..971f59078 100644 --- a/src/Yasumi/Provider/Mexico.php +++ b/src/Yasumi/Provider/Mexico.php @@ -1,11 +1,11 @@ year < 1910 ? 'second wednesday of october' : 'fourth monday of october')." {$this->year}", + ($this->year < 1910 ? 'second wednesday of october' : 'fourth monday of october') . " {$this->year}", DateTimeZoneFactory::getDateTimeZone($this->timezone) ); diff --git a/src/Yasumi/Provider/Norway.php b/src/Yasumi/Provider/Norway.php index 894d5dc74..82c79806b 100644 --- a/src/Yasumi/Provider/Norway.php +++ b/src/Yasumi/Provider/Norway.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'stAndrewsDay', [], - new \DateTime($this->year.'-11-30', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-11-30', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale )); } @@ -222,7 +224,7 @@ protected function calculateStJohnsDay(): void $this->addHoliday(new Holiday( 'stJohnsDay', [], - new \DateTime($this->year.'-01-07', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-01-07', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale )); } diff --git a/src/Yasumi/Provider/Russia.php b/src/Yasumi/Provider/Russia.php index 8f9b94f13..90146706f 100644 --- a/src/Yasumi/Provider/Russia.php +++ b/src/Yasumi/Provider/Russia.php @@ -1,9 +1,11 @@ addHoliday(new Holiday('newYearHolidaysDay'.$day, [ + $this->addHoliday(new Holiday('newYearHolidaysDay' . $day, [ 'en' => 'New Year’s holidays', 'ru' => 'Новогодние каникулы', ], new \DateTime("{$this->year}-01-{$day}", new \DateTimeZone($this->timezone)), $this->locale)); diff --git a/src/Yasumi/Provider/Slovakia.php b/src/Yasumi/Provider/Slovakia.php index 62406f4d5..603d6eda1 100644 --- a/src/Yasumi/Provider/Slovakia.php +++ b/src/Yasumi/Provider/Slovakia.php @@ -1,9 +1,11 @@ 'Deň vzniku Slovenskej republiky', 'en' => 'Day of the Establishment of the Slovak Republic', ], - new \DateTime($this->year.'-01-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-01-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale )); } @@ -154,7 +156,7 @@ protected function calculateSaintsCyrilAndMethodiusDay(): void 'cs' => 'Den slovanských věrozvěstů Cyrila a Metoděje', 'en' => 'Saints Cyril and Methodius Day', ], - new \DateTime($this->year.'-07-05', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-07-05', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); @@ -177,7 +179,7 @@ protected function calculateSlovakNationalUprisingDay(): void 'sk' => 'Výročie Slovenského národného povstania', 'en' => 'Slovak National Uprising Day', ], - new \DateTime($this->year.'-08-29', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-08-29', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); @@ -200,7 +202,7 @@ protected function calculateSlovakConstitutionDay(): void 'sk' => 'Deň Ústavy Slovenskej republiky', 'en' => 'Day of the Constitution of the Slovak Republic', ], - new \DateTime($this->year.'-09-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-09-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); @@ -224,7 +226,7 @@ protected function calculateOurLadyOfSorrowsDay(): void $this->addHoliday(new Holiday('ourLadyOfSorrowsDay', [ 'sk' => 'Sviatok Sedembolestnej Panny Márie', 'en' => 'Our Lady of Sorrows Day', - ], new \DateTime($this->year.'-09-15', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_BANK)); + ], new \DateTime($this->year . '-09-15', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_BANK)); } /** @@ -245,7 +247,7 @@ protected function calculateStruggleForFreedomAndDemocracyDay(): void 'cs' => 'Den boje za svobodu a demokracii', 'en' => 'Struggle for Freedom and Democracy Day', ], - new \DateTime($this->year.'-11-17', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-11-17', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); diff --git a/src/Yasumi/Provider/SouthAfrica.php b/src/Yasumi/Provider/SouthAfrica.php index 42e14b406..5ce3d446c 100644 --- a/src/Yasumi/Provider/SouthAfrica.php +++ b/src/Yasumi/Provider/SouthAfrica.php @@ -1,9 +1,11 @@ addHoliday(new Holiday( 'humanRightsDay', ['en' => 'Human Rights Day'], - new \DateTime($this->year.'-3-21', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-3-21', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale )); } @@ -149,7 +151,7 @@ protected function calculateFreedomDay(): void $this->addHoliday(new Holiday( 'freedomDay', ['en' => 'Freedom Day'], - new \DateTime($this->year.'-4-27', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-4-27', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale )); } @@ -175,7 +177,7 @@ protected function calculateYouthDay(): void $this->addHoliday(new Holiday( 'youthDay', ['en' => 'Youth Day'], - new \DateTime($this->year.'-6-16', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-6-16', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale )); } @@ -225,7 +227,7 @@ protected function calculateNationalWomensDay(): void $this->addHoliday(new Holiday( 'nationalWomensDay', ['en' => 'National Women’s Day'], - new \DateTime($this->year.'-8-9', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-8-9', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale )); } @@ -249,7 +251,7 @@ protected function calculateHeritageDay(): void $this->addHoliday(new Holiday( 'heritageDay', ['en' => 'Heritage Day'], - new \DateTime($this->year.'-9-24', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-9-24', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale )); } @@ -275,7 +277,7 @@ protected function calculateDayOfReconciliation(): void $this->addHoliday(new Holiday( 'reconciliationDay', ['en' => 'Day of Reconciliation'], - new \DateTime($this->year.'-12-16', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-12-16', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale )); } diff --git a/src/Yasumi/Provider/SouthKorea.php b/src/Yasumi/Provider/SouthKorea.php index 4315758fc..c32ac9084 100644 --- a/src/Yasumi/Provider/SouthKorea.php +++ b/src/Yasumi/Provider/SouthKorea.php @@ -1,9 +1,11 @@ format('w'); if (\in_array($dayOfWeek, $acceptedHolidays[$name], true)) { - $dates[$day]['weekend:'.$day] = $name; + $dates[$day]['weekend:' . $day] = $name; } } diff --git a/src/Yasumi/Provider/Spain.php b/src/Yasumi/Provider/Spain.php index d5cf10c35..2a1007d17 100644 --- a/src/Yasumi/Provider/Spain.php +++ b/src/Yasumi/Provider/Spain.php @@ -1,9 +1,11 @@ 'Jour de la Saint-Berthold', 'en' => 'Berchtoldstag', ], - new \DateTime($this->year.'-01-02', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-01-02', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OTHER )); @@ -101,7 +103,7 @@ protected function calculateBettagsMontag(): void { if ($this->year >= 1832) { // Find third Sunday of September - $date = new \DateTime('Third Sunday of '.$this->year.'-09', DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime('Third Sunday of ' . $this->year . '-09', DateTimeZoneFactory::getDateTimeZone($this->timezone)); // Go to next Thursday $date->add(new \DateInterval('P1D')); @@ -139,7 +141,7 @@ protected function calculateNationalDay(): void $this->addHoliday(new Holiday( 'swissNationalDay', $translations, - new \DateTime($this->year.'-08-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-08-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OFFICIAL )); @@ -147,7 +149,7 @@ protected function calculateNationalDay(): void $this->addHoliday(new Holiday( 'swissNationalDay', $translations, - new \DateTime($this->year.'-08-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-08-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OBSERVANCE )); diff --git a/src/Yasumi/Provider/Switzerland/Aargau.php b/src/Yasumi/Provider/Switzerland/Aargau.php index 00a46c444..419415503 100644 --- a/src/Yasumi/Provider/Switzerland/Aargau.php +++ b/src/Yasumi/Provider/Switzerland/Aargau.php @@ -1,8 +1,11 @@ 'December 26th', 'fr' => '26 décembre', ], - new \DateTime($this->year.'-12-26', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-12-26', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OTHER )); diff --git a/src/Yasumi/Provider/Switzerland/Geneva.php b/src/Yasumi/Provider/Switzerland/Geneva.php index 44f97125a..d09489768 100644 --- a/src/Yasumi/Provider/Switzerland/Geneva.php +++ b/src/Yasumi/Provider/Switzerland/Geneva.php @@ -1,8 +1,11 @@ year.'-09', DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime('First Sunday of ' . $this->year . '-09', DateTimeZoneFactory::getDateTimeZone($this->timezone)); // Go to next Thursday $date->add(new \DateInterval('P4D')); @@ -115,7 +118,7 @@ protected function calculateRestaurationGenevoise(): void [ 'fr' => 'Restauration de la République', ], - new \DateTime($this->year.'-12-31', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-12-31', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OTHER )); diff --git a/src/Yasumi/Provider/Switzerland/Glarus.php b/src/Yasumi/Provider/Switzerland/Glarus.php index a364d9516..2f81a2495 100644 --- a/src/Yasumi/Provider/Switzerland/Glarus.php +++ b/src/Yasumi/Provider/Switzerland/Glarus.php @@ -1,8 +1,11 @@ year >= 1389) { - $date = new \DateTime('First Thursday of '.$this->year.'-04', DateTimeZoneFactory::getDateTimeZone($this->timezone)); + $date = new \DateTime('First Thursday of ' . $this->year . '-04', DateTimeZoneFactory::getDateTimeZone($this->timezone)); $this->addHoliday(new Holiday('nafelserFahrt', [ 'de' => 'Näfelser Fahrt', ], $date, $this->locale, Holiday::TYPE_OTHER)); diff --git a/src/Yasumi/Provider/Switzerland/Grisons.php b/src/Yasumi/Provider/Switzerland/Grisons.php index 36ffbeb69..6c33268fb 100644 --- a/src/Yasumi/Provider/Switzerland/Grisons.php +++ b/src/Yasumi/Provider/Switzerland/Grisons.php @@ -1,8 +1,11 @@ 'Commémoration du plébiscite jurassien', ], - new \DateTime($this->year.'-06-23', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-06-23', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OTHER )); diff --git a/src/Yasumi/Provider/Switzerland/Lucerne.php b/src/Yasumi/Provider/Switzerland/Lucerne.php index 30352ca47..a2ae96b48 100644 --- a/src/Yasumi/Provider/Switzerland/Lucerne.php +++ b/src/Yasumi/Provider/Switzerland/Lucerne.php @@ -1,8 +1,11 @@ 'Instauration de la République', ], - new \DateTime($this->year.'-03-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-03-01', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OTHER )); @@ -116,7 +119,7 @@ protected function calculateJanuary2nd(): void 'en' => 'January 2nd', 'fr' => '2 janvier', ], - new \DateTime($this->year.'-01-02', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-01-02', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OTHER )); @@ -137,7 +140,7 @@ protected function calculateDecember26th(): void 'en' => 'December 26th', 'fr' => '26 décembre', ], - new \DateTime($this->year.'-12-26', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-12-26', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OTHER )); diff --git a/src/Yasumi/Provider/Switzerland/Nidwalden.php b/src/Yasumi/Provider/Switzerland/Nidwalden.php index 0d0a42a73..d147fcce3 100644 --- a/src/Yasumi/Provider/Switzerland/Nidwalden.php +++ b/src/Yasumi/Provider/Switzerland/Nidwalden.php @@ -1,8 +1,11 @@ 'Bruder-Klausen-Fest', ], - new \DateTime($this->year.'-09-25', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-09-25', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OTHER )); @@ -94,7 +97,7 @@ protected function calculateBruderKlausenFest(): void [ 'de' => 'Bruder-Klausen-Fest', ], - new \DateTime($this->year.'-09-21', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-09-21', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OTHER )); diff --git a/src/Yasumi/Provider/Switzerland/Schaffhausen.php b/src/Yasumi/Provider/Switzerland/Schaffhausen.php index c15f4f638..0ffcc885c 100644 --- a/src/Yasumi/Provider/Switzerland/Schaffhausen.php +++ b/src/Yasumi/Provider/Switzerland/Schaffhausen.php @@ -1,8 +1,11 @@ 'Solennité des saints Pierre et Paul', 'de' => 'St. Peter und Paul', ], - new \DateTime($this->year.'-06-29', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-06-29', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_OTHER )); diff --git a/src/Yasumi/Provider/Switzerland/Uri.php b/src/Yasumi/Provider/Switzerland/Uri.php index 49358abc6..2b6f630e6 100644 --- a/src/Yasumi/Provider/Switzerland/Uri.php +++ b/src/Yasumi/Provider/Switzerland/Uri.php @@ -1,8 +1,11 @@ addHoliday(new SubstituteHoliday( $holiday, [ - 'en' => $label.' (observed)', + 'en' => $label . ' (observed)', ], $date, $this->locale diff --git a/src/Yasumi/Provider/Ukraine.php b/src/Yasumi/Provider/Ukraine.php index d08cb4cc3..2c37405f3 100644 --- a/src/Yasumi/Provider/Ukraine.php +++ b/src/Yasumi/Provider/Ukraine.php @@ -1,9 +1,11 @@ 'St. Patrick’s Day'], - new \DateTime($this->year.'-3-17', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-3-17', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_BANK ); @@ -120,7 +123,7 @@ protected function calculateBattleOfTheBoyne(): void $holiday = new Holiday( 'battleOfTheBoyne', ['en' => 'Battle of the Boyne'], - new \DateTime($this->year.'-7-12', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-7-12', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_BANK ); diff --git a/src/Yasumi/Provider/UnitedKingdom/Scotland.php b/src/Yasumi/Provider/UnitedKingdom/Scotland.php index 258d26b93..e0b14b02f 100644 --- a/src/Yasumi/Provider/UnitedKingdom/Scotland.php +++ b/src/Yasumi/Provider/UnitedKingdom/Scotland.php @@ -1,8 +1,11 @@ year.'-11-30', DateTimeZoneFactory::getDateTimeZone($this->timezone)), + new \DateTime($this->year . '-11-30', DateTimeZoneFactory::getDateTimeZone($this->timezone)), $this->locale, Holiday::TYPE_BANK ); diff --git a/src/Yasumi/Provider/UnitedKingdom/Wales.php b/src/Yasumi/Provider/UnitedKingdom/Wales.php index 21a6bc1f9..a59defc64 100644 --- a/src/Yasumi/Provider/UnitedKingdom/Wales.php +++ b/src/Yasumi/Provider/UnitedKingdom/Wales.php @@ -1,8 +1,11 @@ substitutedHoliday = $substitutedHoliday; - $key = 'substituteHoliday:'.$substitutedHoliday->getKey(); + $key = 'substituteHoliday:' . $substitutedHoliday->getKey(); if ($date == $substitutedHoliday) { throw new \InvalidArgumentException('Date must differ from the substituted holiday'); diff --git a/src/Yasumi/Translations.php b/src/Yasumi/Translations.php index 7d1f93ca8..e7ec9a248 100644 --- a/src/Yasumi/Translations.php +++ b/src/Yasumi/Translations.php @@ -1,9 +1,11 @@ getFilename(); - $key = $file->getBasename('.'.$extension); + $key = $file->getBasename('.' . $extension); - $translations = require $directoryPath.$filename; + $translations = require $directoryPath . $filename; if (\is_array($translations)) { foreach (array_keys($translations) as $locale) { diff --git a/src/Yasumi/TranslationsInterface.php b/src/Yasumi/TranslationsInterface.php index 717d848fd..4adfe4b50 100644 --- a/src/Yasumi/TranslationsInterface.php +++ b/src/Yasumi/TranslationsInterface.php @@ -1,9 +1,11 @@ loadTranslations(__DIR__.'/data/translations'); + self::$globalTranslations->loadTranslations(__DIR__ . '/data/translations'); } // Assert locale input @@ -158,7 +160,7 @@ public static function create(string $class, int $year = self::YEAR_LOWER_BOUND, */ public static function getAvailableLocales(): array { - return require __DIR__.'/data/locales.php'; + return require __DIR__ . '/data/locales.php'; } /** @@ -212,7 +214,7 @@ public static function getProviders(): array $providers = []; $filesIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator( - __DIR__.\DIRECTORY_SEPARATOR.'Provider', + __DIR__ . \DIRECTORY_SEPARATOR . 'Provider', \FilesystemIterator::SKIP_DOTS ), \RecursiveIteratorIterator::SELF_FIRST); diff --git a/src/Yasumi/data/locales.php b/src/Yasumi/data/locales.php index 35917a5d4..9e465b29e 100644 --- a/src/Yasumi/data/locales.php +++ b/src/Yasumi/data/locales.php @@ -1,8 +1,11 @@ between( new \DateTime('03/25/2011', new \DateTimeZone($timezone)), - new \DateTime('05/17/'.$year, new \DateTimeZone($timezone)) + new \DateTime('05/17/' . $year, new \DateTimeZone($timezone)) ); $betweenHolidays = iterator_to_array($between); @@ -232,7 +235,7 @@ public function testHolidaysBetweenDateRangeWithEndAfterInstanceYear(): void $holidays = Yasumi::create('Italy', $year); $between = $holidays->between( - new \DateTime('03/25/'.$year, new \DateTimeZone($timezone)), + new \DateTime('03/25/' . $year, new \DateTimeZone($timezone)), new \DateTime('09/21/2021', new \DateTimeZone($timezone)) ); @@ -269,8 +272,8 @@ public function testWrongDates(): void $holidays = Yasumi::create('USA', $year); $holidays->between( - new \DateTime('12/31/'.$year, new \DateTimeZone($timezone)), - new \DateTime('01/01/'.$year, new \DateTimeZone($timezone)) + new \DateTime('12/31/' . $year, new \DateTimeZone($timezone)), + new \DateTime('01/01/' . $year, new \DateTimeZone($timezone)) ); } @@ -289,8 +292,8 @@ public function testCountBetweenWithSubstitutes(): void $holidays = Yasumi::create('Ireland', $year); $between = $holidays->between( - new \DateTime('01/01/'.$year, new \DateTimeZone($timezone)), - new \DateTime('12/31/'.$year, new \DateTimeZone($timezone)) + new \DateTime('01/01/' . $year, new \DateTimeZone($timezone)), + new \DateTime('12/31/' . $year, new \DateTimeZone($timezone)) ); $betweenHolidays = iterator_to_array($between); @@ -329,8 +332,8 @@ public function testCountBetweenExcludingSubstituteHoliday(): void $holidays = Yasumi::create('Ireland', $year); $between = $holidays->between( - new \DateTime('01/01/'.$year, new \DateTimeZone($timezone)), - new \DateTime('03/20/'.$year, new \DateTimeZone($timezone)) + new \DateTime('01/01/' . $year, new \DateTimeZone($timezone)), + new \DateTime('03/20/' . $year, new \DateTimeZone($timezone)) ); $betweenHolidays = iterator_to_array($between); @@ -373,8 +376,8 @@ public function testCountBetweenExcludingSubstituteHolidayIncludingOriginalHolid $holidays = Yasumi::create('Ireland', $year); $between = $holidays->between( - new \DateTime('01/01/'.$year, new \DateTimeZone($timezone)), - new \DateTime('03/18/'.$year, new \DateTimeZone($timezone)) + new \DateTime('01/01/' . $year, new \DateTimeZone($timezone)), + new \DateTime('03/18/' . $year, new \DateTimeZone($timezone)) ); $betweenHolidays = iterator_to_array($between); @@ -418,8 +421,8 @@ public function testCountBetweenExcludingSubstituteHolidayAndOriginalHoliday(): $holidays = Yasumi::create('Ireland', $year); $between = $holidays->between( - new \DateTime('01/01/'.$year, new \DateTimeZone($timezone)), - new \DateTime('03/16/'.$year, new \DateTimeZone($timezone)) + new \DateTime('01/01/' . $year, new \DateTimeZone($timezone)), + new \DateTime('03/16/' . $year, new \DateTimeZone($timezone)) ); $betweenHolidays = iterator_to_array($between); diff --git a/tests/Base/HolidayFiltersTest.php b/tests/Base/HolidayFiltersTest.php index 3fbcd82fa..b9ce89597 100644 --- a/tests/Base/HolidayFiltersTest.php +++ b/tests/Base/HolidayFiltersTest.php @@ -1,8 +1,11 @@ getName()); - self::assertEquals('substituteHoliday:'.$name, $substitute->getName()); + self::assertEquals('substituteHoliday:' . $name, $substitute->getName()); } /** @throws \Exception */ diff --git a/tests/Base/TranslationsTest.php b/tests/Base/TranslationsTest.php index 0ef705eab..cd3640482 100644 --- a/tests/Base/TranslationsTest.php +++ b/tests/Base/TranslationsTest.php @@ -1,8 +1,11 @@ [$key.'.php' => $fileContents]]); + vfsStream::setup('root', null, ['lang' => [$key . '.php' => $fileContents]]); $translations = new Translations(self::LOCALES); $translations->loadTranslations(vfsStream::url('root/lang')); @@ -181,7 +184,7 @@ public function testNotLoadingTranslationsFromFileWithInvalidExtension(): void ]; FILE; - vfsStream::setup('root', null, ['lang' => [$key.'.translation' => $fileContents]]); + vfsStream::setup('root', null, ['lang' => [$key . '.translation' => $fileContents]]); $translations = new Translations(self::LOCALES); $translations->loadTranslations(vfsStream::url('root/lang')); @@ -203,7 +206,7 @@ public function testLoadingTranslationsFromDirectoryWithUnknownLocaleException() ]; FILE; - vfsStream::setup('root', null, ['lang' => [$key.'.php' => $fileContents]]); + vfsStream::setup('root', null, ['lang' => [$key . '.php' => $fileContents]]); $translations = new Translations(self::LOCALES); $translations->loadTranslations(vfsStream::url('root/lang')); @@ -242,8 +245,8 @@ public function testLoadingMultipleTranslationsFromDirectory(): void vfsStream::setup('root', null, [ 'lang' => [ - $firstIdentifier.'.php' => $firstFileContents, - $secondIdentifier.'.php' => $secondFileContents, + $firstIdentifier . '.php' => $firstFileContents, + $secondIdentifier . '.php' => $secondFileContents, ], ]); diff --git a/tests/Base/TypographyTest.php b/tests/Base/TypographyTest.php index 913bdbb6d..bcf9d3321 100644 --- a/tests/Base/TypographyTest.php +++ b/tests/Base/TypographyTest.php @@ -1,9 +1,11 @@ isHoliday(new \DateTime($date)); @@ -296,7 +299,7 @@ public function testIsNotHoliday(): void { $year = 5220; $provider = 'Japan'; - $date = $year.'-06-10'; + $date = $year . '-06-10'; // Assertion using a DateTime instance $isHoliday = Yasumi::create($provider, $year)->isHoliday(new \DateTime($date)); @@ -323,7 +326,7 @@ public function testIsWorkingDay(): void { $year = 2020; $provider = 'Netherlands'; - $date = $year.'-06-02'; + $date = $year . '-06-02'; // Assertion using a DateTime instance $isWorkingDay = Yasumi::create($provider, $year)->isWorkingDay(new \DateTime($date)); @@ -350,7 +353,7 @@ public function testIsNotWorkingDay(): void { $year = 2016; $provider = 'Japan'; - $date = $year.'-01-11'; + $date = $year . '-01-11'; // Assertion using a DateTime instance $isNotWorkingDay = Yasumi::create($provider, $year)->isWorkingDay(new \DateTime($date)); diff --git a/tests/Base/YasumiWorkdayTest.php b/tests/Base/YasumiWorkdayTest.php index c4a971d5c..e83fc34b9 100644 --- a/tests/Base/YasumiWorkdayTest.php +++ b/tests/Base/YasumiWorkdayTest.php @@ -1,8 +1,11 @@ + */ namespace Yasumi\tests\Georgia; diff --git a/tests/Georgia/GeorgiaBaseTestCase.php b/tests/Georgia/GeorgiaBaseTestCase.php index 98bbcde79..aba2854b9 100644 --- a/tests/Georgia/GeorgiaBaseTestCase.php +++ b/tests/Georgia/GeorgiaBaseTestCase.php @@ -1,9 +1,11 @@ generateRandomYear(); $time_stamp = strtotime( - $year.'-03-21'.easter_days($year).' day + 49 day' + $year . '-03-21' . easter_days($year) . ' day + 49 day' ); $date = date('Y-m-d', $time_stamp); diff --git a/tests/Germany/ReformationDay2017Test.php b/tests/Germany/ReformationDay2017Test.php index 52a876dfd..64f5d767c 100644 --- a/tests/Germany/ReformationDay2017Test.php +++ b/tests/Germany/ReformationDay2017Test.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->modify('next tuesday'); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/Ireland/EasterMondayTest.php b/tests/Ireland/EasterMondayTest.php index a5865fdd2..f035aeebb 100644 --- a/tests/Ireland/EasterMondayTest.php +++ b/tests/Ireland/EasterMondayTest.php @@ -1,8 +1,11 @@ format('w')) { $date->modify('next monday'); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/Ireland/OctoberHolidayTest.php b/tests/Ireland/OctoberHolidayTest.php index f1bb56ad7..1921bea4e 100644 --- a/tests/Ireland/OctoberHolidayTest.php +++ b/tests/Ireland/OctoberHolidayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->modify('next monday'); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/Ireland/StStephensDayTest.php b/tests/Ireland/StStephensDayTest.php index d3598fe28..7bacde176 100644 --- a/tests/Ireland/StStephensDayTest.php +++ b/tests/Ireland/StStephensDayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->modify('next monday'); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/Ireland/pentecostMondayTest.php b/tests/Ireland/pentecostMondayTest.php index ab6356079..49ccfaaef 100644 --- a/tests/Ireland/pentecostMondayTest.php +++ b/tests/Ireland/pentecostMondayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-5-6", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/ComingOfAgeDayTest.php b/tests/Japan/ComingOfAgeDayTest.php index b41d4864c..86a017c5a 100644 --- a/tests/Japan/ComingOfAgeDayTest.php +++ b/tests/Japan/ComingOfAgeDayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-5-6", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/CoronationDayTest.php b/tests/Japan/CoronationDayTest.php index 46891f10d..da3d5fb82 100644 --- a/tests/Japan/CoronationDayTest.php +++ b/tests/Japan/CoronationDayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-11-4", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/EmperorsBirthdayTest.php b/tests/Japan/EmperorsBirthdayTest.php index ccd57d219..068e8dab1 100644 --- a/tests/Japan/EmperorsBirthdayTest.php +++ b/tests/Japan/EmperorsBirthdayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-12-24", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/EnthronementProclamationCeremonyTest.php b/tests/Japan/EnthronementProclamationCeremonyTest.php index b7d9cafce..8a3c7b79b 100644 --- a/tests/Japan/EnthronementProclamationCeremonyTest.php +++ b/tests/Japan/EnthronementProclamationCeremonyTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-5-6", new \DateTimeZone(self::TIMEZONE)) ); @@ -92,7 +95,7 @@ public function testHolidayBetween1989And2007SubstitutedNextWorkingDay(): void $year = 2001; $this->assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-4-30", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/JapanBaseTestCase.php b/tests/Japan/JapanBaseTestCase.php index 4e1de357c..2f3632964 100644 --- a/tests/Japan/JapanBaseTestCase.php +++ b/tests/Japan/JapanBaseTestCase.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-11-24", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/MarineDayTest.php b/tests/Japan/MarineDayTest.php index 7cecbe5a5..ff800ba81 100644 --- a/tests/Japan/MarineDayTest.php +++ b/tests/Japan/MarineDayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-7-21", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/MountainDayTest.php b/tests/Japan/MountainDayTest.php index 82dff86e3..3e78396c1 100644 --- a/tests/Japan/MountainDayTest.php +++ b/tests/Japan/MountainDayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-8-12", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/NationalFoundationDayTest.php b/tests/Japan/NationalFoundationDayTest.php index 9b44ebac1..f2c44dd7e 100644 --- a/tests/Japan/NationalFoundationDayTest.php +++ b/tests/Japan/NationalFoundationDayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-2-12", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/NewYearsDayTest.php b/tests/Japan/NewYearsDayTest.php index 20ee8384d..de73f3880 100644 --- a/tests/Japan/NewYearsDayTest.php +++ b/tests/Japan/NewYearsDayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-1-2", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/PublicBridgeDayTest.php b/tests/Japan/PublicBridgeDayTest.php index 57888876a..ee83c4bd9 100644 --- a/tests/Japan/PublicBridgeDayTest.php +++ b/tests/Japan/PublicBridgeDayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::HOLIDAY.'1', + self::HOLIDAY . '1', $this->year, new \DateTime("{$this->year}-4-30", new \DateTimeZone(self::TIMEZONE)) ); $this->assertHoliday( self::REGION, - self::HOLIDAY.'2', + self::HOLIDAY . '2', $this->year, new \DateTime("{$this->year}-5-2", new \DateTimeZone(self::TIMEZONE)) ); @@ -66,7 +69,7 @@ public function testPublicBridgeDay(): void */ public function testTranslation(): void { - $this->assertTranslatedHolidayName(self::REGION, self::HOLIDAY.'1', $this->year, [self::LOCALE => '国民の休日']); + $this->assertTranslatedHolidayName(self::REGION, self::HOLIDAY . '1', $this->year, [self::LOCALE => '国民の休日']); } /** @@ -74,6 +77,6 @@ public function testTranslation(): void */ public function testHolidayType(): void { - $this->assertHolidayType(self::REGION, self::HOLIDAY.'1', $this->year, Holiday::TYPE_OFFICIAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY . '1', $this->year, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Japan/RespectForTheAgedDayTest.php b/tests/Japan/RespectForTheAgedDayTest.php index 3e22e866a..6049e054b 100644 --- a/tests/Japan/RespectForTheAgedDayTest.php +++ b/tests/Japan/RespectForTheAgedDayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-9-16", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/ShowaDayTest.php b/tests/Japan/ShowaDayTest.php index eab7e362f..0c81b4d1c 100644 --- a/tests/Japan/ShowaDayTest.php +++ b/tests/Japan/ShowaDayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-4-30", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/SportsDayTest.php b/tests/Japan/SportsDayTest.php index 5fc299a8b..a0310a248 100644 --- a/tests/Japan/SportsDayTest.php +++ b/tests/Japan/SportsDayTest.php @@ -1,8 +1,11 @@ assertHoliday( self::REGION, - self::SUBSTITUTE_PREFIX.self::HOLIDAY, + self::SUBSTITUTE_PREFIX . self::HOLIDAY, $year, new \DateTime("{$year}-10-11", new \DateTimeZone(self::TIMEZONE)) ); diff --git a/tests/Japan/VernalEquinoxDayTest.php b/tests/Japan/VernalEquinoxDayTest.php index 9eb842e8e..afb09dade 100644 --- a/tests/Japan/VernalEquinoxDayTest.php +++ b/tests/Japan/VernalEquinoxDayTest.php @@ -1,8 +1,11 @@ + */ namespace Yasumi\tests\Mexico; diff --git a/tests/Mexico/ChristmasTest.php b/tests/Mexico/ChristmasTest.php index 50d1f97de..2805ea2b9 100644 --- a/tests/Mexico/ChristmasTest.php +++ b/tests/Mexico/ChristmasTest.php @@ -1,8 +1,11 @@ + */ namespace Yasumi\tests\Mexico; diff --git a/tests/Mexico/VirginOfGuadalupeTest.php b/tests/Mexico/VirginOfGuadalupeTest.php index c8aa40089..f3ef2408e 100644 --- a/tests/Mexico/VirginOfGuadalupeTest.php +++ b/tests/Mexico/VirginOfGuadalupeTest.php @@ -1,6 +1,19 @@ + */ namespace Yasumi\tests\Mexico; diff --git a/tests/Netherlands/AscensionDayTest.php b/tests/Netherlands/AscensionDayTest.php index 7cd8a3195..fbd50b71f 100644 --- a/tests/Netherlands/AscensionDayTest.php +++ b/tests/Netherlands/AscensionDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(self::ESTABLISHMENT_YEAR); $expected = new \DateTime( - (($year < 1910) ? 'second wednesday of october' : 'fourth monday of october')." {$year}", + (($year < 1910) ? 'second wednesday of october' : 'fourth monday of october') . " {$year}", new \DateTimeZone(self::TIMEZONE) ); diff --git a/tests/NewZealand/NewYearsDayTest.php b/tests/NewZealand/NewYearsDayTest.php index 0235227af..fcfd109f8 100644 --- a/tests/NewZealand/NewYearsDayTest.php +++ b/tests/NewZealand/NewYearsDayTest.php @@ -1,8 +1,11 @@ add(new \DateInterval('P'.$easter_days.'D')); + $easter->add(new \DateInterval('P' . $easter_days . 'D')); return $easter; } diff --git a/tests/Romania/AssumptionOfMaryTest.php b/tests/Romania/AssumptionOfMaryTest.php index 62b6e71a7..8ec922302 100644 --- a/tests/Romania/AssumptionOfMaryTest.php +++ b/tests/Romania/AssumptionOfMaryTest.php @@ -1,8 +1,11 @@ format('w')) { $date->add(new \DateInterval('P1D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/SouthAfrica/FamilyDayTest.php b/tests/SouthAfrica/FamilyDayTest.php index 3ba096b5a..909f05e58 100644 --- a/tests/SouthAfrica/FamilyDayTest.php +++ b/tests/SouthAfrica/FamilyDayTest.php @@ -1,8 +1,11 @@ format('w')) { $date->add(new \DateInterval('P1D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/SouthAfrica/GoodFridayTest.php b/tests/SouthAfrica/GoodFridayTest.php index 60148fabe..9b35b3aaf 100644 --- a/tests/SouthAfrica/GoodFridayTest.php +++ b/tests/SouthAfrica/GoodFridayTest.php @@ -1,8 +1,11 @@ format('w')) { $date->add(new \DateInterval('P1D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/SouthAfrica/HumanRightsDayTest.php b/tests/SouthAfrica/HumanRightsDayTest.php index 140196022..05bd17211 100644 --- a/tests/SouthAfrica/HumanRightsDayTest.php +++ b/tests/SouthAfrica/HumanRightsDayTest.php @@ -1,8 +1,11 @@ format('w')) { $date->add(new \DateInterval('P1D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/SouthAfrica/MunicipalElections2016DayTest.php b/tests/SouthAfrica/MunicipalElections2016DayTest.php index 45ba0b67a..84513dfe5 100644 --- a/tests/SouthAfrica/MunicipalElections2016DayTest.php +++ b/tests/SouthAfrica/MunicipalElections2016DayTest.php @@ -1,8 +1,11 @@ format('w')) { $date->add(new \DateInterval('P1D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/SouthAfrica/NewYearsDayTest.php b/tests/SouthAfrica/NewYearsDayTest.php index f37033346..20f989c6c 100644 --- a/tests/SouthAfrica/NewYearsDayTest.php +++ b/tests/SouthAfrica/NewYearsDayTest.php @@ -1,8 +1,11 @@ format('w')) { $date->add(new \DateInterval('P1D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/SouthAfrica/ReconciliationDayTest.php b/tests/SouthAfrica/ReconciliationDayTest.php index 47199f0a9..9e9f1561c 100644 --- a/tests/SouthAfrica/ReconciliationDayTest.php +++ b/tests/SouthAfrica/ReconciliationDayTest.php @@ -1,8 +1,11 @@ format('w')) { $date->add(new \DateInterval('P1D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/SouthAfrica/SecondChristmasDayTest.php b/tests/SouthAfrica/SecondChristmasDayTest.php index 44f9f09a0..ba97fa6b1 100644 --- a/tests/SouthAfrica/SecondChristmasDayTest.php +++ b/tests/SouthAfrica/SecondChristmasDayTest.php @@ -1,8 +1,11 @@ format('w')) { $date->add(new \DateInterval('P1D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/SouthAfrica/SouthAfricaBaseTestCase.php b/tests/SouthAfrica/SouthAfricaBaseTestCase.php index eee3b1b57..e98efa0d5 100644 --- a/tests/SouthAfrica/SouthAfricaBaseTestCase.php +++ b/tests/SouthAfrica/SouthAfricaBaseTestCase.php @@ -1,9 +1,11 @@ format('w')) { $date->add(new \DateInterval('P1D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/SouthAfrica/YouthDayTest.php b/tests/SouthAfrica/YouthDayTest.php index a38271a88..1e8dd5e9a 100644 --- a/tests/SouthAfrica/YouthDayTest.php +++ b/tests/SouthAfrica/YouthDayTest.php @@ -1,8 +1,11 @@ format('w')) { $date->add(new \DateInterval('P1D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/SouthKorea/ArborDayTest.php b/tests/SouthKorea/ArborDayTest.php index c93ff92a4..9cdf7f4dc 100644 --- a/tests/SouthKorea/ArborDayTest.php +++ b/tests/SouthKorea/ArborDayTest.php @@ -1,9 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Bern/BernBaseTestCase.php b/tests/Switzerland/Bern/BernBaseTestCase.php index 16b755b95..526a7c5b9 100644 --- a/tests/Switzerland/Bern/BernBaseTestCase.php +++ b/tests/Switzerland/Bern/BernBaseTestCase.php @@ -1,8 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Fribourg/ChristmasDayTest.php b/tests/Switzerland/Fribourg/ChristmasDayTest.php index b403b28c2..189ecd63e 100644 --- a/tests/Switzerland/Fribourg/ChristmasDayTest.php +++ b/tests/Switzerland/Fribourg/ChristmasDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(1870, 1965); // Find first Sunday of September - $date = new \DateTime('First Sunday of '.$year.'-09', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime('First Sunday of ' . $year . '-09', new \DateTimeZone(self::TIMEZONE)); // Go to next Thursday $date->add(new \DateInterval('P4D')); @@ -54,7 +57,7 @@ public function testJeuneGenevoisBetween1840And1869(): void { $year = $this->generateRandomYear(Geneva::JEUNE_GENEVOIS_ESTABLISHMENT_YEAR, 1869); // Find first Sunday of September - $date = new \DateTime('First Sunday of '.$year.'-09', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime('First Sunday of ' . $year . '-09', new \DateTimeZone(self::TIMEZONE)); // Go to next Thursday $date->add(new \DateInterval('P4D')); diff --git a/tests/Switzerland/Geneva/NewYearsDayTest.php b/tests/Switzerland/Geneva/NewYearsDayTest.php index 7c02946a7..e17861f8b 100644 --- a/tests/Switzerland/Geneva/NewYearsDayTest.php +++ b/tests/Switzerland/Geneva/NewYearsDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Glarus/ChristmasDayTest.php b/tests/Switzerland/Glarus/ChristmasDayTest.php index f492a03b9..9a99a5b39 100644 --- a/tests/Switzerland/Glarus/ChristmasDayTest.php +++ b/tests/Switzerland/Glarus/ChristmasDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(self::ESTABLISHMENT_YEAR); - $date = new \DateTime('First Thursday of '.$year.'-04', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime('First Thursday of ' . $year . '-04', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); } diff --git a/tests/Switzerland/Glarus/NewYearsDayTest.php b/tests/Switzerland/Glarus/NewYearsDayTest.php index 590e512c3..eef7dc1c9 100644 --- a/tests/Switzerland/Glarus/NewYearsDayTest.php +++ b/tests/Switzerland/Glarus/NewYearsDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Jura/BettagsMontagTest.php b/tests/Switzerland/Jura/BettagsMontagTest.php index 3064c4486..101d0c521 100644 --- a/tests/Switzerland/Jura/BettagsMontagTest.php +++ b/tests/Switzerland/Jura/BettagsMontagTest.php @@ -1,8 +1,11 @@ generateRandomYear(1832); // Find third Sunday of September - $date = new \DateTime('Third Sunday of '.$year.'-09', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime('Third Sunday of ' . $year . '-09', new \DateTimeZone(self::TIMEZONE)); // Go to next Thursday $date->add(new \DateInterval('P1D')); diff --git a/tests/Switzerland/Jura/ChristmasDayTest.php b/tests/Switzerland/Jura/ChristmasDayTest.php index 12b6cbc4b..497d27546 100644 --- a/tests/Switzerland/Jura/ChristmasDayTest.php +++ b/tests/Switzerland/Jura/ChristmasDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Lucerne/ChristmasDayTest.php b/tests/Switzerland/Lucerne/ChristmasDayTest.php index 286c4de51..902103361 100644 --- a/tests/Switzerland/Lucerne/ChristmasDayTest.php +++ b/tests/Switzerland/Lucerne/ChristmasDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(1832); // Find third Sunday of September - $date = new \DateTime('Third Sunday of '.$year.'-09', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime('Third Sunday of ' . $year . '-09', new \DateTimeZone(self::TIMEZONE)); // Go to next Thursday $date->add(new \DateInterval('P1D')); diff --git a/tests/Switzerland/Neuchatel/ChristmasDayTest.php b/tests/Switzerland/Neuchatel/ChristmasDayTest.php index 55702460a..7a67c3d84 100644 --- a/tests/Switzerland/Neuchatel/ChristmasDayTest.php +++ b/tests/Switzerland/Neuchatel/ChristmasDayTest.php @@ -1,8 +1,11 @@ assertNotHoliday( self::REGION, diff --git a/tests/Switzerland/Neuchatel/EasterMondayTest.php b/tests/Switzerland/Neuchatel/EasterMondayTest.php index 5c7b1eeb6..b866834be 100644 --- a/tests/Switzerland/Neuchatel/EasterMondayTest.php +++ b/tests/Switzerland/Neuchatel/EasterMondayTest.php @@ -1,8 +1,11 @@ assertNotHoliday( self::REGION, diff --git a/tests/Switzerland/Neuchatel/NeuchatelBaseTestCase.php b/tests/Switzerland/Neuchatel/NeuchatelBaseTestCase.php index f801e056c..85406b8d5 100644 --- a/tests/Switzerland/Neuchatel/NeuchatelBaseTestCase.php +++ b/tests/Switzerland/Neuchatel/NeuchatelBaseTestCase.php @@ -1,8 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Obwalden/BruderKlausenFestTest.php b/tests/Switzerland/Obwalden/BruderKlausenFestTest.php index a7b8811cf..d3d5befea 100644 --- a/tests/Switzerland/Obwalden/BruderKlausenFestTest.php +++ b/tests/Switzerland/Obwalden/BruderKlausenFestTest.php @@ -1,8 +1,11 @@ generateRandomYear(1947); - $date = new \DateTime($year.'-09-25', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-09-25', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); @@ -49,7 +52,7 @@ public function testBruderKlausenFestOnAfter1947(): void public function testBruderKlausenFestBetween1649And1946(): void { $year = $this->generateRandomYear(1649, 1946); - $date = new \DateTime($year.'-09-21', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-09-21', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Obwalden/ChristmasDayTest.php b/tests/Switzerland/Obwalden/ChristmasDayTest.php index 7467fec14..224330c64 100644 --- a/tests/Switzerland/Obwalden/ChristmasDayTest.php +++ b/tests/Switzerland/Obwalden/ChristmasDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Schaffhausen/ChristmasDayTest.php b/tests/Switzerland/Schaffhausen/ChristmasDayTest.php index 9d4edda92..a44947a49 100644 --- a/tests/Switzerland/Schaffhausen/ChristmasDayTest.php +++ b/tests/Switzerland/Schaffhausen/ChristmasDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Solothurn/ChristmasDayTest.php b/tests/Switzerland/Solothurn/ChristmasDayTest.php index 599f801c3..dd0d43ed4 100644 --- a/tests/Switzerland/Solothurn/ChristmasDayTest.php +++ b/tests/Switzerland/Solothurn/ChristmasDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Thurgau/ChristmasDayTest.php b/tests/Switzerland/Thurgau/ChristmasDayTest.php index 908fb1e04..3c5c99fc9 100644 --- a/tests/Switzerland/Thurgau/ChristmasDayTest.php +++ b/tests/Switzerland/Thurgau/ChristmasDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Vaud/BettagsMontagTest.php b/tests/Switzerland/Vaud/BettagsMontagTest.php index 8b0e91909..368a363e3 100644 --- a/tests/Switzerland/Vaud/BettagsMontagTest.php +++ b/tests/Switzerland/Vaud/BettagsMontagTest.php @@ -1,8 +1,11 @@ generateRandomYear(1832); // Find third Sunday of September - $date = new \DateTime('Third Sunday of '.$year.'-09', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime('Third Sunday of ' . $year . '-09', new \DateTimeZone(self::TIMEZONE)); // Go to next Thursday $date->add(new \DateInterval('P1D')); diff --git a/tests/Switzerland/Vaud/ChristmasDayTest.php b/tests/Switzerland/Vaud/ChristmasDayTest.php index 9301bd460..8a3637139 100644 --- a/tests/Switzerland/Vaud/ChristmasDayTest.php +++ b/tests/Switzerland/Vaud/ChristmasDayTest.php @@ -1,8 +1,11 @@ generateRandomYear(); - $date = new \DateTime($year.'-01-02', new \DateTimeZone(self::TIMEZONE)); + $date = new \DateTime($year . '-01-02', new \DateTimeZone(self::TIMEZONE)); $this->assertHoliday(self::REGION, self::HOLIDAY, $year, $date); $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OTHER); diff --git a/tests/Switzerland/Zug/ChristmasDayTest.php b/tests/Switzerland/Zug/ChristmasDayTest.php index 0c4be41fe..8efb9e1b2 100644 --- a/tests/Switzerland/Zug/ChristmasDayTest.php +++ b/tests/Switzerland/Zug/ChristmasDayTest.php @@ -1,8 +1,11 @@ isHoliday($holidayOfficial)); self::assertEquals(Holiday::TYPE_OFFICIAL, $holidayOfficial->getType()); - $holidaySubstitution = $holidays->getHoliday('substituteHoliday:'.$holidayOfficial->getKey()); + $holidaySubstitution = $holidays->getHoliday('substituteHoliday:' . $holidayOfficial->getKey()); if (! $expectedSubstitution instanceof \DateTimeInterface) { // without substitution diff --git a/tests/Ukraine/UkraineBaseTestCase.php b/tests/Ukraine/UkraineBaseTestCase.php index b9ad9b170..8dbd4567d 100644 --- a/tests/Ukraine/UkraineBaseTestCase.php +++ b/tests/Ukraine/UkraineBaseTestCase.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); - $this->assertHolidayType(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, Holiday::TYPE_BANK); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); + $this->assertHolidayType(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, Holiday::TYPE_BANK); } } diff --git a/tests/UnitedKingdom/ChristmasDayTest.php b/tests/UnitedKingdom/ChristmasDayTest.php index d28c1e02f..93827c0ae 100644 --- a/tests/UnitedKingdom/ChristmasDayTest.php +++ b/tests/UnitedKingdom/ChristmasDayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); - $this->assertHolidayType(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, Holiday::TYPE_BANK); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); + $this->assertHolidayType(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, Holiday::TYPE_BANK); } } diff --git a/tests/UnitedKingdom/EasterMondayTest.php b/tests/UnitedKingdom/EasterMondayTest.php index c8e6f51a2..309d2082f 100644 --- a/tests/UnitedKingdom/EasterMondayTest.php +++ b/tests/UnitedKingdom/EasterMondayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); - $this->assertHolidayType(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, Holiday::TYPE_BANK); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); + $this->assertHolidayType(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, Holiday::TYPE_BANK); } } diff --git a/tests/UnitedKingdom/England/ChristmasDayTest.php b/tests/UnitedKingdom/England/ChristmasDayTest.php index ccb38f337..3cd366bca 100644 --- a/tests/UnitedKingdom/England/ChristmasDayTest.php +++ b/tests/UnitedKingdom/England/ChristmasDayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); - $this->assertHolidayType(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, Holiday::TYPE_BANK); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); + $this->assertHolidayType(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, Holiday::TYPE_BANK); } } diff --git a/tests/UnitedKingdom/England/EasterMondayTest.php b/tests/UnitedKingdom/England/EasterMondayTest.php index 9f71c5ea2..53ddde421 100644 --- a/tests/UnitedKingdom/England/EasterMondayTest.php +++ b/tests/UnitedKingdom/England/EasterMondayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->modify('next monday'); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/UnitedKingdom/NorthernIreland/BoxingDayTest.php b/tests/UnitedKingdom/NorthernIreland/BoxingDayTest.php index 9af416e6c..6dfeac991 100644 --- a/tests/UnitedKingdom/NorthernIreland/BoxingDayTest.php +++ b/tests/UnitedKingdom/NorthernIreland/BoxingDayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); - $this->assertHolidayType(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, Holiday::TYPE_BANK); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); + $this->assertHolidayType(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, Holiday::TYPE_BANK); } } diff --git a/tests/UnitedKingdom/NorthernIreland/ChristmasDayTest.php b/tests/UnitedKingdom/NorthernIreland/ChristmasDayTest.php index e8e7fbaf0..e54f944cc 100644 --- a/tests/UnitedKingdom/NorthernIreland/ChristmasDayTest.php +++ b/tests/UnitedKingdom/NorthernIreland/ChristmasDayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); - $this->assertHolidayType(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, Holiday::TYPE_BANK); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); + $this->assertHolidayType(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, Holiday::TYPE_BANK); } } diff --git a/tests/UnitedKingdom/NorthernIreland/EasterMondayTest.php b/tests/UnitedKingdom/NorthernIreland/EasterMondayTest.php index ab46f8a46..912e35572 100644 --- a/tests/UnitedKingdom/NorthernIreland/EasterMondayTest.php +++ b/tests/UnitedKingdom/NorthernIreland/EasterMondayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->modify('next monday'); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/UnitedKingdom/NorthernIreland/SummerBankHolidayTest.php b/tests/UnitedKingdom/NorthernIreland/SummerBankHolidayTest.php index fe912a8c3..a9198c914 100644 --- a/tests/UnitedKingdom/NorthernIreland/SummerBankHolidayTest.php +++ b/tests/UnitedKingdom/NorthernIreland/SummerBankHolidayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); - $this->assertHolidayType(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, Holiday::TYPE_BANK); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); + $this->assertHolidayType(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, Holiday::TYPE_BANK); } } diff --git a/tests/UnitedKingdom/Scotland/ChristmasDayTest.php b/tests/UnitedKingdom/Scotland/ChristmasDayTest.php index b089a2ba3..2a12100b7 100644 --- a/tests/UnitedKingdom/Scotland/ChristmasDayTest.php +++ b/tests/UnitedKingdom/Scotland/ChristmasDayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); - $this->assertHolidayType(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, Holiday::TYPE_BANK); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); + $this->assertHolidayType(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, Holiday::TYPE_BANK); } } diff --git a/tests/UnitedKingdom/Scotland/GoodFridayTest.php b/tests/UnitedKingdom/Scotland/GoodFridayTest.php index caf8d596f..7369c6a8d 100644 --- a/tests/UnitedKingdom/Scotland/GoodFridayTest.php +++ b/tests/UnitedKingdom/Scotland/GoodFridayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/UnitedKingdom/Scotland/ScotlandBaseTestCase.php b/tests/UnitedKingdom/Scotland/ScotlandBaseTestCase.php index b62cb9b0c..c76e60658 100644 --- a/tests/UnitedKingdom/Scotland/ScotlandBaseTestCase.php +++ b/tests/UnitedKingdom/Scotland/ScotlandBaseTestCase.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/UnitedKingdom/Scotland/SpringBankHolidayTest.php b/tests/UnitedKingdom/Scotland/SpringBankHolidayTest.php index 5ea15793a..df7799ba9 100644 --- a/tests/UnitedKingdom/Scotland/SpringBankHolidayTest.php +++ b/tests/UnitedKingdom/Scotland/SpringBankHolidayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->modify('next monday'); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); } } diff --git a/tests/UnitedKingdom/Scotland/SummerBankHolidayTest.php b/tests/UnitedKingdom/Scotland/SummerBankHolidayTest.php index 3d24bb8e2..c7c1c959d 100644 --- a/tests/UnitedKingdom/Scotland/SummerBankHolidayTest.php +++ b/tests/UnitedKingdom/Scotland/SummerBankHolidayTest.php @@ -1,8 +1,11 @@ generateRandomYear(); diff --git a/tests/UnitedKingdom/Wales/BoxingDayTest.php b/tests/UnitedKingdom/Wales/BoxingDayTest.php index 2fd34f441..9f770fcb6 100644 --- a/tests/UnitedKingdom/Wales/BoxingDayTest.php +++ b/tests/UnitedKingdom/Wales/BoxingDayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); - $this->assertHolidayType(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, Holiday::TYPE_BANK); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); + $this->assertHolidayType(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, Holiday::TYPE_BANK); } } diff --git a/tests/UnitedKingdom/Wales/ChristmasDayTest.php b/tests/UnitedKingdom/Wales/ChristmasDayTest.php index 83ef0087d..1a4114773 100644 --- a/tests/UnitedKingdom/Wales/ChristmasDayTest.php +++ b/tests/UnitedKingdom/Wales/ChristmasDayTest.php @@ -1,8 +1,11 @@ format('w'), [0, 6], true)) { $date->add(new \DateInterval('P2D')); - $this->assertHoliday(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, $date); - $this->assertHolidayType(self::REGION, 'substituteHoliday:'.self::HOLIDAY, $year, Holiday::TYPE_BANK); + $this->assertHoliday(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, $date); + $this->assertHolidayType(self::REGION, 'substituteHoliday:' . self::HOLIDAY, $year, Holiday::TYPE_BANK); } } diff --git a/tests/UnitedKingdom/Wales/EasterMondayTest.php b/tests/UnitedKingdom/Wales/EasterMondayTest.php index 5154f67d5..1c825e6b6 100644 --- a/tests/UnitedKingdom/Wales/EasterMondayTest.php +++ b/tests/UnitedKingdom/Wales/EasterMondayTest.php @@ -1,8 +1,11 @@ getHoliday('substituteHoliday:'.$key); + $holiday = $holidays->getHoliday('substituteHoliday:' . $key); self::assertInstanceOf(SubstituteHoliday::class, $holiday); $this->assertDateTime($expected, $holiday); @@ -152,7 +154,7 @@ public function assertNotSubstituteHoliday( ): void { $this->assertNotHoliday( $provider, - 'substituteHoliday:'.$key, + 'substituteHoliday:' . $key, $year ); }