From cf51971ce5be87d0eb7fa444721e54a260c65674 Mon Sep 17 00:00:00 2001 From: Sacha Telgenhof Date: Thu, 14 Sep 2017 08:28:33 +0900 Subject: [PATCH] Renaming 'National' type to 'Official' (#65) Renamed the holiday type NATIONAL to OFFICIAL. Subregions may have official holidays and the name NATIONAL doesn't suit these situations. * Updated CHANGELOG --- CHANGELOG.md | 1 + src/Yasumi/Filters/OfficialHolidaysFilter.php | 6 +- src/Yasumi/Holiday.php | 14 +- src/Yasumi/Provider/Australia.php | 2 +- src/Yasumi/Provider/Austria.php | 2 +- src/Yasumi/Provider/ChristianHolidays.php | 124 +++++++++--------- src/Yasumi/Provider/CommonHolidays.php | 54 ++++---- src/Yasumi/Provider/Croatia.php | 2 +- src/Yasumi/Provider/NewZealand.php | 2 +- src/Yasumi/Provider/Portugal.php | 4 +- src/Yasumi/Provider/Slovakia.php | 10 +- src/Yasumi/Provider/Sweden.php | 2 +- src/Yasumi/Provider/Switzerland.php | 2 +- tests/Australia/AnzacDayTest.php | 2 +- tests/Australia/AustraliaDayTest.php | 2 +- tests/Australia/AustraliaTest.php | 6 +- tests/Australia/BoxingDayTest.php | 2 +- tests/Australia/ChristmasDayTest.php | 2 +- tests/Australia/EasterMondayTest.php | 2 +- tests/Australia/GoodFridayTest.php | 2 +- tests/Australia/LabourDayTest.php | 2 +- tests/Australia/NewYearsDayTest.php | 2 +- tests/Australia/QueensBirthdayTest.php | 2 +- .../Victoria/AFLGrandFinalFridayTest.php | 2 +- tests/Australia/Victoria/VictoriaTest.php | 6 +- tests/Austria/AllSaintsDayTest.php | 2 +- tests/Austria/AscensionDayTest.php | 2 +- tests/Austria/AssumptionOfMaryTest.php | 2 +- tests/Austria/AustriaTest.php | 6 +- tests/Austria/ChristmasTest.php | 2 +- tests/Austria/CorpusChristiTest.php | 2 +- tests/Austria/EasterMondayTest.php | 2 +- tests/Austria/EasterTest.php | 2 +- tests/Austria/EpiphanyTest.php | 2 +- tests/Austria/ImmaculateConceptionTest.php | 2 +- tests/Austria/InternationalWorkersDayTest.php | 2 +- tests/Austria/NationalDayTest.php | 2 +- tests/Austria/NewYearsDayTest.php | 2 +- tests/Austria/PentecostMondayTest.php | 2 +- tests/Austria/SecondChristmasDayTest.php | 2 +- tests/Belgium/AllSaintsDayTest.php | 2 +- tests/Belgium/ArmisticeDayTest.php | 2 +- tests/Belgium/AscensionDayTest.php | 2 +- tests/Belgium/AssumptionOfMaryTest.php | 2 +- tests/Belgium/BelgiumTest.php | 6 +- tests/Belgium/ChristmasTest.php | 2 +- tests/Belgium/EasterMondayTest.php | 2 +- tests/Belgium/EasterTest.php | 2 +- tests/Belgium/InternationalWorkersDayTest.php | 2 +- tests/Belgium/NationalDayTest.php | 2 +- tests/Belgium/NewYearsDayTest.php | 2 +- tests/Belgium/PentecostTest.php | 2 +- tests/Belgium/pentecostMondayTest.php | 2 +- tests/Brazil/AllSoulsDayTest.php | 2 +- tests/Brazil/BrazilTest.php | 6 +- tests/Brazil/ChristmasDayTest.php | 2 +- tests/Brazil/GoodFridayTest.php | 2 +- tests/Brazil/IndependenceDayTest.php | 2 +- tests/Brazil/InternationalWorkersDayTest.php | 2 +- tests/Brazil/NewYearsDayTest.php | 2 +- tests/Brazil/OurLadyOfAparecidaDayTest.php | 2 +- .../Brazil/ProclamationOfRepublicDayTest.php | 2 +- tests/Brazil/TiradentesDayTest.php | 2 +- tests/Croatia/AllSaintsDayTest.php | 2 +- tests/Croatia/AntifascistStruggleDayTest.php | 2 +- tests/Croatia/AssumptionOfMaryTest.php | 2 +- tests/Croatia/ChristmasDayTest.php | 2 +- tests/Croatia/CorpusChristiTest.php | 2 +- tests/Croatia/EasterMondayTest.php | 2 +- tests/Croatia/EasterTest.php | 2 +- tests/Croatia/EpiphanyTest.php | 2 +- tests/Croatia/HomelandThanksgivingDayTest.php | 2 +- tests/Croatia/IndependenceDayTest.php | 2 +- tests/Croatia/InternationalWorkersDayTest.php | 2 +- tests/Croatia/NewYearsDayTest.php | 2 +- tests/Croatia/StStephensDayTest.php | 2 +- tests/Croatia/StatehoodDayTest.php | 2 +- tests/CzechRepublic/ChristmasDayTest.php | 2 +- tests/CzechRepublic/CzechRepublicTest.php | 6 +- tests/CzechRepublic/CzechStateHoodDayTest.php | 2 +- tests/CzechRepublic/EasterMondayTest.php | 2 +- tests/CzechRepublic/GoodFridayTest.php | 2 +- .../IndependentCzechoslovakStateDayTest.php | 2 +- .../InternationalWorkersDayTest.php | 2 +- tests/CzechRepublic/JanHusDayTest.php | 2 +- tests/CzechRepublic/NewYearsDayTest.php | 2 +- .../SaintsCyrilAndMethodiusDayTest.php | 2 +- .../CzechRepublic/SecondChristmasDayTest.php | 2 +- .../StruggleForFreedomAndDemocracyDayTest.php | 2 +- .../CzechRepublic/VictoryInEuropeDayTest.php | 2 +- tests/Denmark/AscensionDayTest.php | 2 +- tests/Denmark/ChristmasDayTest.php | 2 +- tests/Denmark/DenmarkTest.php | 6 +- tests/Denmark/EasterMondayTest.php | 2 +- tests/Denmark/EasterTest.php | 2 +- tests/Denmark/GoodFridayTest.php | 2 +- tests/Denmark/GreatPrayerDayTest.php | 2 +- tests/Denmark/MaundyThursdayTest.php | 2 +- tests/Denmark/NewYearsDayTest.php | 2 +- tests/Denmark/PentecostMondayTest.php | 2 +- tests/Denmark/PentecostTest.php | 2 +- tests/Denmark/SecondChristmasDayTest.php | 2 +- tests/Finland/AllSaintsDayTest.php | 2 +- tests/Finland/AscensionDayTest.php | 2 +- tests/Finland/ChristmasDayTest.php | 2 +- tests/Finland/EasterMondayTest.php | 2 +- tests/Finland/EasterTest.php | 2 +- tests/Finland/EpiphanyTest.php | 2 +- tests/Finland/FinlandTest.php | 6 +- tests/Finland/GoodFridayTest.php | 2 +- tests/Finland/IndependenceDayTest.php | 2 +- tests/Finland/InternationalWorkersDayTest.php | 2 +- tests/Finland/NewYearsDayTest.php | 2 +- tests/Finland/PentecostTest.php | 2 +- tests/Finland/SecondChristmasDayTest.php | 2 +- tests/Finland/stJohnsDayTest.php | 2 +- tests/France/AllSaintsDayTest.php | 2 +- tests/France/ArmisticeDayTest.php | 2 +- tests/France/AscensionDayTest.php | 2 +- tests/France/AssumptionOfMaryTest.php | 2 +- tests/France/BasRhin/BasRhinTest.php | 6 +- tests/France/BasRhin/GoodFridayTest.php | 2 +- tests/France/BasRhin/stStephensDayTest.php | 2 +- tests/France/BastilleDayTest.php | 2 +- tests/France/ChristmasDayTest.php | 2 +- tests/France/EasterMondayTest.php | 2 +- tests/France/FranceTest.php | 6 +- tests/France/HautRhin/GoodFridayTest.php | 2 +- tests/France/HautRhin/HautRhinTest.php | 6 +- tests/France/HautRhin/stStephensDayTest.php | 2 +- tests/France/InternationalWorkersDayTest.php | 2 +- tests/France/Moselle/GoodFridayTest.php | 2 +- tests/France/Moselle/MoselleTest.php | 6 +- tests/France/Moselle/stStephensDayTest.php | 2 +- tests/France/NewYearsDayTest.php | 2 +- tests/France/PentecostMondayTest.php | 2 +- tests/France/VictoryInEuropeDayTest.php | 2 +- tests/Germany/AscensionDayTest.php | 2 +- .../BadenWurttemberg/BadenWurttembergTest.php | 6 +- tests/Germany/Bavaria/BavariaTest.php | 6 +- tests/Germany/Berlin/BerlinTest.php | 6 +- tests/Germany/Brandenburg/BrandenburgTest.php | 6 +- .../Brandenburg/ReformationDayTest.php | 2 +- tests/Germany/Bremen/BremenTest.php | 6 +- tests/Germany/ChristmasTest.php | 2 +- tests/Germany/EasterMondayTest.php | 2 +- tests/Germany/GermanUnityDayTest.php | 2 +- tests/Germany/GermanyTest.php | 6 +- tests/Germany/GoodFridayTest.php | 2 +- tests/Germany/Hamburg/HamburgTest.php | 6 +- tests/Germany/Hesse/HesseTest.php | 6 +- tests/Germany/InternationalWorkersDayTest.php | 2 +- tests/Germany/LowerSaxony/LowerSaxonyTest.php | 6 +- .../MecklenburgWesternPomeraniaTest.php | 6 +- .../ReformationDayTest.php | 2 +- tests/Germany/NewYearsDayTest.php | 2 +- .../NorthRhineWestphaliaTest.php | 6 +- tests/Germany/PentecostMondayTest.php | 2 +- tests/Germany/ReformationDay2017Test.php | 2 +- .../RhinelandPalatinateTest.php | 6 +- tests/Germany/Saarland/SaarlandTest.php | 6 +- tests/Germany/Saxony/ReformationDayTest.php | 2 +- tests/Germany/Saxony/SaxonyTest.php | 6 +- .../SaxonyAnhalt/ReformationDayTest.php | 2 +- .../Germany/SaxonyAnhalt/SaxonyAnhaltTest.php | 6 +- .../SchleswigHolsteinTest.php | 6 +- tests/Germany/SecondChristmasDayTest.php | 2 +- .../Germany/Thuringia/ReformationDayTest.php | 2 +- tests/Germany/Thuringia/ThuringiaTest.php | 6 +- tests/Greece/AnnunciationTest.php | 2 +- tests/Greece/AscensionDayTest.php | 2 +- tests/Greece/AssumptionOfMaryTest.php | 2 +- tests/Greece/ChristmasDayTest.php | 2 +- tests/Greece/CleanMondayTest.php | 2 +- tests/Greece/EasterMondayTest.php | 2 +- tests/Greece/EasterTest.php | 2 +- tests/Greece/EpiphanyTest.php | 2 +- tests/Greece/GreeceTest.php | 6 +- tests/Greece/IndepencenceDayTest.php | 2 +- tests/Greece/InternationalWorkersDayTest.php | 2 +- tests/Greece/NewYearsDayTest.php | 2 +- tests/Greece/OhiDayTest.php | 2 +- tests/Greece/PentecostMondayTest.php | 2 +- tests/Greece/PentecostTest.php | 2 +- tests/Greece/goodFridayTest.php | 2 +- tests/Hungary/AllSaintsDayTest.php | 2 +- tests/Hungary/ChristmasTest.php | 2 +- tests/Hungary/EasterMondayTest.php | 2 +- tests/Hungary/EasterTest.php | 2 +- tests/Hungary/HungaryTest.php | 6 +- tests/Hungary/InternationalWorkersDayTest.php | 2 +- tests/Hungary/MemorialDay1848Test.php | 2 +- tests/Hungary/MemorialDay1956Test.php | 2 +- tests/Hungary/NewYearsDayTest.php | 2 +- tests/Hungary/PentecostMondayTest.php | 2 +- tests/Hungary/SecondChristmasDayTest.php | 2 +- tests/Hungary/StateFoundationDayTest.php | 2 +- tests/Ireland/AugustHolidayTest.php | 2 +- tests/Ireland/ChristmasDayTest.php | 2 +- tests/Ireland/EasterMondayTest.php | 2 +- tests/Ireland/EasterTest.php | 2 +- tests/Ireland/IrelandTest.php | 20 +-- tests/Ireland/JuneHolidayTest.php | 2 +- tests/Ireland/MayDayTest.php | 2 +- tests/Ireland/NewYearsDayTest.php | 2 +- tests/Ireland/OctoberHolidayTest.php | 2 +- tests/Ireland/StPatricksDayTest.php | 2 +- tests/Ireland/StStephensDayTest.php | 2 +- tests/Ireland/pentecostMondayTest.php | 2 +- tests/Italy/AllSaintsDayTest.php | 2 +- tests/Italy/AssumptionOfMaryTest.php | 2 +- tests/Italy/ChristmasTest.php | 2 +- tests/Italy/EasterMondayTest.php | 2 +- tests/Italy/EasterTest.php | 2 +- tests/Italy/EpiphanyTest.php | 2 +- tests/Italy/ImmaculateConceptionTest.php | 2 +- tests/Italy/InternationalWorkersDayTest.php | 2 +- tests/Italy/ItalyTest.php | 6 +- tests/Italy/LiberationDayTest.php | 2 +- tests/Italy/NewYearsDayTest.php | 2 +- tests/Italy/RepublicDayTest.php | 2 +- tests/Italy/stStephensDayTest.php | 2 +- tests/Japan/AutumnalEquinoxDayTest.php | 2 +- tests/Japan/ChildrensDayTest.php | 2 +- tests/Japan/ComingOfAgeDayTest.php | 2 +- tests/Japan/ConstitutionMemorialDayTest.php | 2 +- tests/Japan/CultureDayTest.php | 2 +- tests/Japan/EmperorsBirthdayTest.php | 2 +- tests/Japan/GreeneryDayTest.php | 2 +- tests/Japan/HealthAndSportsDayTest.php | 2 +- tests/Japan/JapanTest.php | 6 +- tests/Japan/LabourThanksgivingDayTest.php | 2 +- tests/Japan/MarineDayTest.php | 2 +- tests/Japan/MountainDayTest.php | 2 +- tests/Japan/NationalFoundationDayTest.php | 2 +- tests/Japan/NewYearsDayTest.php | 2 +- tests/Japan/PublicBridgeDayTest.php | 2 +- tests/Japan/RespectForTheAgedDayTest.php | 2 +- tests/Japan/ShowaDayTest.php | 2 +- tests/Japan/VernalEquinoxDayTest.php | 2 +- tests/Netherlands/AscensionDayTest.php | 2 +- tests/Netherlands/ChristmasDayTest.php | 2 +- tests/Netherlands/EasterMondayTest.php | 2 +- tests/Netherlands/EasterTest.php | 2 +- tests/Netherlands/KingsDayTest.php | 2 +- tests/Netherlands/NetherlandsTest.php | 6 +- tests/Netherlands/NewYearsDayTest.php | 2 +- tests/Netherlands/PentecostTest.php | 2 +- tests/Netherlands/QueensDayTest.php | 2 +- tests/Netherlands/pentecostMondayTest.php | 2 +- tests/Netherlands/secondChristmasdayTest.php | 2 +- tests/NewZealand/AnzacDayTest.php | 2 +- tests/NewZealand/BoxingDayTest.php | 2 +- tests/NewZealand/ChristmasDayTest.php | 2 +- tests/NewZealand/DayAfterNewYearsDayTest.php | 2 +- tests/NewZealand/EasterMondayTest.php | 2 +- tests/NewZealand/GoodFridayTest.php | 2 +- tests/NewZealand/LabourDayTest.php | 2 +- tests/NewZealand/NewYearsDayTest.php | 2 +- tests/NewZealand/NewZealandTest.php | 6 +- tests/NewZealand/QueensBirthdayTest.php | 2 +- tests/NewZealand/WaitangiDayTest.php | 2 +- tests/Norway/AscensionDayTest.php | 2 +- tests/Norway/ChristmasDayTest.php | 2 +- tests/Norway/ConstitutionDayTest.php | 2 +- tests/Norway/EasterMondayTest.php | 2 +- tests/Norway/EasterTest.php | 2 +- tests/Norway/GoodFridayTest.php | 2 +- tests/Norway/InternationalWorkersDayTest.php | 2 +- tests/Norway/MaundyThursdayTest.php | 2 +- tests/Norway/NewYearsDayTest.php | 2 +- tests/Norway/NorwayTest.php | 6 +- tests/Norway/PentecostMondayTest.php | 2 +- tests/Norway/PentecostTest.php | 2 +- tests/Norway/SecondChristmasDayTest.php | 2 +- tests/Poland/AllSaintsDayTest.php | 2 +- tests/Poland/AssumptionOfMaryTest.php | 2 +- tests/Poland/ChristmasTest.php | 2 +- tests/Poland/ConstitutionDayTest.php | 2 +- tests/Poland/EasterMondayTest.php | 2 +- tests/Poland/EasterTest.php | 2 +- tests/Poland/EpiphanyTest.php | 2 +- tests/Poland/IndependenceDayTest.php | 2 +- tests/Poland/InternationalWorkersDayTest.php | 2 +- tests/Poland/NewYearsDayTest.php | 2 +- tests/Poland/PentecostTest.php | 2 +- tests/Poland/PolandTest.php | 6 +- tests/Poland/SecondChristmasDayTest.php | 2 +- tests/Portugal/AllSaintsDayTest.php | 4 +- tests/Portugal/AssumptionOfMaryTest.php | 2 +- tests/Portugal/CarnationRevolutionDayTest.php | 2 +- tests/Portugal/ChristmasTest.php | 2 +- tests/Portugal/EasterTest.php | 2 +- tests/Portugal/GoodFridayTest.php | 2 +- tests/Portugal/ImmaculateConceptionTest.php | 2 +- .../Portugal/InternationalWorkersDayTest.php | 2 +- tests/Portugal/NewYearsDayTest.php | 2 +- tests/Portugal/PortugalDayTest.php | 4 +- tests/Portugal/PortugalTest.php | 6 +- tests/Portugal/PortugueseRepublicDayTest.php | 2 +- .../RestorationOfIndependenceTest.php | 4 +- tests/Romania/AssumptionOfMaryTest.php | 2 +- tests/Romania/ChildrensDayTest.php | 2 +- tests/Romania/ChristmasDayTest.php | 2 +- tests/Romania/DayAfterNewYearsDayTest.php | 2 +- tests/Romania/EasterMondayTest.php | 2 +- tests/Romania/EasterTest.php | 2 +- tests/Romania/InternationalWorkersDayTest.php | 2 +- tests/Romania/NationalDayTest.php | 2 +- tests/Romania/NewYearsDayTest.php | 2 +- tests/Romania/PentecostMondayTest.php | 2 +- tests/Romania/PentecostTest.php | 2 +- tests/Romania/RomaniaTest.php | 6 +- tests/Romania/SecondChristmasDayTest.php | 2 +- tests/Romania/StAndrewDayTest.php | 2 +- tests/Romania/UnitedPrincipalitiesDayTest.php | 2 +- tests/Slovakia/NewYearsDayTest.php | 2 +- .../SaintsCyrilAndMethodiusDayTest.php | 4 +- tests/Slovakia/SlovakConstitutionDayTest.php | 5 +- .../SlovakNationalUprisingDayTest.php | 4 +- tests/Slovakia/SlovakiaTest.php | 6 +- .../StruggleForFreedomAndDemocracyDayTest.php | 4 +- tests/SouthAfrica/ChristmasDayTest.php | 2 +- tests/SouthAfrica/FamilyDayTest.php | 2 +- tests/SouthAfrica/FreedomDayTest.php | 2 +- tests/SouthAfrica/GoodFridayTest.php | 2 +- tests/SouthAfrica/HeritageDayTest.php | 2 +- tests/SouthAfrica/HumanRightsDayTest.php | 2 +- .../MunicipalElections2016DayTest.php | 2 +- tests/SouthAfrica/NationalWomensDayTest.php | 2 +- tests/SouthAfrica/NewYearsDayTest.php | 2 +- tests/SouthAfrica/ReconciliationDayTest.php | 2 +- tests/SouthAfrica/SecondChristmasDayTest.php | 2 +- tests/SouthAfrica/SouthAfricaTest.php | 12 +- .../SubstituteDayOfGoodwillTest.php | 2 +- tests/SouthAfrica/WorkersDayTest.php | 2 +- tests/SouthAfrica/YouthDayTest.php | 2 +- tests/Spain/AllSaintsDayTest.php | 2 +- tests/Spain/Andalusia/AndalusiaDayTest.php | 2 +- tests/Spain/Andalusia/AndalusiaTest.php | 6 +- tests/Spain/Aragon/AragonTest.php | 6 +- tests/Spain/AssumptionOfMaryTest.php | 2 +- tests/Spain/Asturias/AsturiasDayTest.php | 2 +- tests/Spain/Asturias/AsturiasTest.php | 6 +- .../BalearicIslandsDayTest.php | 2 +- .../BalearicIslands/BalearicIslandsTest.php | 6 +- .../BasqueCountry/BasqueCountryDayTest.php | 2 +- .../Spain/BasqueCountry/BasqueCountryTest.php | 6 +- .../CanaryIslands/CanaryIslandsDayTest.php | 2 +- .../Spain/CanaryIslands/CanaryIslandsTest.php | 6 +- tests/Spain/Cantabria/CantabriaDayTest.php | 2 +- tests/Spain/Cantabria/CantabriaTest.php | 6 +- .../CastileAndLeon/CastileAndLeonDayTest.php | 2 +- .../CastileAndLeon/CastileAndLeonTest.php | 6 +- .../CastillaLaManchaDayTest.php | 2 +- .../CastillaLaMancha/CastillaLaManchaTest.php | 6 +- tests/Spain/Catalonia/CataloniaTest.php | 6 +- .../Catalonia/nationalCataloniaDayTest.php | 2 +- tests/Spain/Ceuta/CeutaTest.php | 6 +- tests/Spain/Ceuta/ceutaDayTest.php | 2 +- tests/Spain/ChristmasTest.php | 2 +- .../CommunityOfMadridTest.php | 6 +- .../DosdeMayoUprisingDayTest.php | 2 +- tests/Spain/ConstitutionDayTest.php | 2 +- tests/Spain/EpiphanyTest.php | 2 +- .../Spain/Extremadura/ExtremaduraDayTest.php | 2 +- tests/Spain/Extremadura/ExtremaduraTest.php | 6 +- tests/Spain/Galicia/GaliciaTest.php | 6 +- .../Galicia/GalicianLiteratureDayTest.php | 2 +- tests/Spain/Galicia/stJamesDayTest.php | 2 +- tests/Spain/GoodFridayTest.php | 2 +- tests/Spain/ImmaculateConceptionTest.php | 2 +- tests/Spain/InternationalWorkersDayTest.php | 2 +- tests/Spain/LaRioja/LaRiojaDayTest.php | 2 +- tests/Spain/LaRioja/LaRiojaTest.php | 6 +- tests/Spain/Melilla/MelillaTest.php | 6 +- tests/Spain/NationalDayTest.php | 2 +- tests/Spain/Navarre/NavarreTest.php | 6 +- tests/Spain/NewYearsDayTest.php | 2 +- .../RegionOfMurcia/RegionOfMurciaDayTest.php | 2 +- .../RegionOfMurcia/RegionOfMurciaTest.php | 6 +- tests/Spain/SpainTest.php | 6 +- .../ValencianCommunityDayTest.php | 2 +- .../ValencianCommunityTest.php | 6 +- tests/Sweden/AllSaintsDayTest.php | 2 +- tests/Sweden/AscensionDayTest.php | 2 +- tests/Sweden/ChristmasDayTest.php | 2 +- tests/Sweden/ChristmasEveTest.php | 2 +- tests/Sweden/EasterMondayTest.php | 2 +- tests/Sweden/EasterTest.php | 2 +- tests/Sweden/EpiphanyTest.php | 2 +- tests/Sweden/GoodFridayTest.php | 2 +- tests/Sweden/InternationalWorkersDayTest.php | 2 +- tests/Sweden/NationalDayTest.php | 2 +- tests/Sweden/NewYearsDayTest.php | 2 +- tests/Sweden/PentecostTest.php | 2 +- tests/Sweden/SecondChristmasDayTest.php | 2 +- tests/Sweden/SwedenTest.php | 6 +- tests/Sweden/stJohnsDayTest.php | 2 +- tests/Switzerland/Aargau/AargauTest.php | 12 +- .../AppenzellAusserrhodenTest.php | 12 +- .../AppenzellInnerrhodenTest.php | 12 +- .../BaselLandschaft/BaselLandschaftTest.php | 12 +- .../Switzerland/BaselStadt/BaselStadtTest.php | 12 +- tests/Switzerland/Bern/BernTest.php | 12 +- tests/Switzerland/Fribourg/FribourgTest.php | 12 +- tests/Switzerland/Geneva/GenevaTest.php | 12 +- tests/Switzerland/Glarus/GlarusTest.php | 12 +- tests/Switzerland/Grisons/GrisonsTest.php | 12 +- tests/Switzerland/Jura/JuraTest.php | 12 +- tests/Switzerland/Lucerne/LucerneTest.php | 12 +- tests/Switzerland/Neuchatel/NeuchatelTest.php | 12 +- tests/Switzerland/Nidwalden/NidwaldenTest.php | 12 +- tests/Switzerland/Obwalden/ObwaldenTest.php | 12 +- .../Schaffhausen/SchaffhausenTest.php | 12 +- tests/Switzerland/Schwyz/SchwyzTest.php | 12 +- tests/Switzerland/Solothurn/SolothurnTest.php | 12 +- tests/Switzerland/StGallen/StGallenTest.php | 12 +- tests/Switzerland/SwissNationalDayTest.php | 2 +- tests/Switzerland/SwitzerlandTest.php | 10 +- tests/Switzerland/Thurgau/ThurgauTest.php | 12 +- tests/Switzerland/Ticino/TicinoTest.php | 12 +- tests/Switzerland/Uri/UriTest.php | 12 +- tests/Switzerland/Valais/ValaisTest.php | 12 +- tests/Switzerland/Vaud/VaudTest.php | 12 +- tests/Switzerland/Zug/ZugTest.php | 12 +- tests/Switzerland/Zurich/ZurichTest.php | 12 +- tests/USA/ChristmasDayTest.php | 2 +- tests/USA/ColumbusDayTest.php | 2 +- tests/USA/IndependenceDayTest.php | 2 +- tests/USA/LabourDayTest.php | 2 +- tests/USA/MartinLutherKingDayTest.php | 2 +- tests/USA/MemorialDayTest.php | 2 +- tests/USA/NewYearsDayTest.php | 2 +- tests/USA/ThanksgivingDayTest.php | 2 +- tests/USA/USATest.php | 6 +- tests/USA/VeteransDayTest.php | 2 +- tests/USA/WashingtonsBirthdayTest.php | 2 +- tests/Ukraine/ChristmasDayTest.php | 2 +- tests/Ukraine/ConstitutionDayTest.php | 2 +- tests/Ukraine/DefenderOfUkraineDayTest.php | 2 +- tests/Ukraine/EasterTest.php | 2 +- tests/Ukraine/IndependenceDayTest.php | 2 +- tests/Ukraine/InternationalWomensDayTest.php | 2 +- tests/Ukraine/InternationalWorkersDayTest.php | 2 +- tests/Ukraine/NewYearsDayTest.php | 2 +- tests/Ukraine/PentecostTest.php | 2 +- .../SecondInternationalWorkersDayTest.php | 2 +- tests/Ukraine/UkraineTest.php | 6 +- tests/Ukraine/VictoryDayTest.php | 2 +- tests/UnitedKingdom/ChristmasDayTest.php | 2 +- tests/UnitedKingdom/GoodFridayTest.php | 2 +- tests/UnitedKingdom/UnitedKingdomTest.php | 6 +- tests/YasumiBase.php | 4 +- 454 files changed, 838 insertions(+), 838 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69af99527..499843bd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Added Holiday Provider for Switzerland. [\#56](https://github.com/azuyalabs/yasumi/pull/56) ([qligier](https://github.com/qligier)) ### Changed +- Renamed the holiday type NATIONAL to OFFICIAL. Subregions may have official holidays and the name NATIONAL doesn't suit these situations. - Upgraded PHP-CS-Fixer to version 2.4 ### Fixed diff --git a/src/Yasumi/Filters/OfficialHolidaysFilter.php b/src/Yasumi/Filters/OfficialHolidaysFilter.php index 52b0560d0..88b17caf2 100644 --- a/src/Yasumi/Filters/OfficialHolidaysFilter.php +++ b/src/Yasumi/Filters/OfficialHolidaysFilter.php @@ -18,7 +18,7 @@ /** * OfficialHolidaysFilter is a class for filtering all official holidays. * - * OfficialHolidaysFilter is a class that returns all holidays that are considered official (i.e. national) of any given + * OfficialHolidaysFilter is a class that returns all holidays that are considered official of any given * holiday provider. * * Example usage: @@ -28,12 +28,12 @@ class OfficialHolidaysFilter extends FilterIterator { /** - * Checks whether the current element of the iterator is a national/official holiday. + * Checks whether the current element of the iterator is an official holiday. * * @return bool */ public function accept() { - return $this->getInnerIterator()->current()->getType() === Holiday::TYPE_NATIONAL; + return $this->getInnerIterator()->current()->getType() === Holiday::TYPE_OFFICIAL; } } diff --git a/src/Yasumi/Holiday.php b/src/Yasumi/Holiday.php index 2432c2b8a..fae85b778 100755 --- a/src/Yasumi/Holiday.php +++ b/src/Yasumi/Holiday.php @@ -23,9 +23,9 @@ class Holiday extends DateTime implements JsonSerializable { /** - * Type definition for National/Federal holidays. + * Type definition for Official (i.e. National/Federal) holidays. */ - const TYPE_NATIONAL = 'national'; + const TYPE_OFFICIAL = 'official'; /** * Type definition for Observance holidays. @@ -89,9 +89,9 @@ class Holiday extends DateTime implements JsonSerializable * @param DateTime $date A DateTime instance representing the date of the holiday * @param string $displayLocale Locale (i.e. language) in which the holiday information needs to be * displayed in. (Default 'en_US') - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, - * TYPE_OBSERVANCE, TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a - * national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, + * TYPE_OBSERVANCE, TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an + * official holiday is considered. * * @throws UnknownLocaleException * @throws \InvalidArgumentException @@ -101,7 +101,7 @@ public function __construct( array $names, $date, $displayLocale = self::DEFAULT_LOCALE, - $type = self::TYPE_NATIONAL + $type = self::TYPE_OFFICIAL ) { // Validate if short name is not empty if (empty($shortName)) { @@ -136,7 +136,7 @@ public function __construct( /** * Returns what type this holiday is. * - * @return string the type of holiday (national, observance, season or bank). + * @return string the type of holiday (official, observance, season, bank or other). */ public function getType() { diff --git a/src/Yasumi/Provider/Australia.php b/src/Yasumi/Provider/Australia.php index 592422726..222b5d80c 100755 --- a/src/Yasumi/Provider/Australia.php +++ b/src/Yasumi/Provider/Australia.php @@ -40,7 +40,7 @@ class Australia extends AbstractProvider */ public function initialize() { - // National Holidays + // Official Holidays $this->calculateAustraliaDay(); $this->calculateNewYearHolidays(); $this->calculateAnzacDay(); diff --git a/src/Yasumi/Provider/Austria.php b/src/Yasumi/Provider/Austria.php index 5725bc125..7f16cd4a7 100644 --- a/src/Yasumi/Provider/Austria.php +++ b/src/Yasumi/Provider/Austria.php @@ -51,7 +51,7 @@ public function initialize() $this->addHoliday($this->ascensionDay($this->year, $this->timezone, $this->locale)); $this->addHoliday($this->pentecost($this->year, $this->timezone, $this->locale, Holiday::TYPE_OBSERVANCE)); $this->addHoliday($this->pentecostMonday($this->year, $this->timezone, $this->locale)); - $this->addHoliday($this->corpusChristi($this->year, $this->timezone, $this->locale, Holiday::TYPE_NATIONAL)); + $this->addHoliday($this->corpusChristi($this->year, $this->timezone, $this->locale, Holiday::TYPE_OFFICIAL)); $this->addHoliday($this->allSaintsDay($this->year, $this->timezone, $this->locale)); $this->addHoliday($this->immaculateConception($this->year, $this->timezone, $this->locale)); $this->addHoliday($this->christmasDay($this->year, $this->timezone, $this->locale)); diff --git a/src/Yasumi/Provider/ChristianHolidays.php b/src/Yasumi/Provider/ChristianHolidays.php index 461730e4a..346103ff2 100644 --- a/src/Yasumi/Provider/ChristianHolidays.php +++ b/src/Yasumi/Provider/ChristianHolidays.php @@ -37,15 +37,15 @@ trait ChristianHolidays * @param int $year the year for which Easter need to be created * @param string $timezone the timezone in which Easter is celebrated * @param string $locale the locale for which Easter need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function easter($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function easter($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday('easter', [], $easter = $this->calculateEaster($year, $timezone), $locale, $type); } @@ -62,15 +62,15 @@ public function easter($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL * @param int $year the year for which Easter Monday need to be created * @param string $timezone the timezone in which Easter Monday is celebrated * @param string $locale the locale for which Easter Monday need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function easterMonday($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function easterMonday($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'easterMonday', @@ -93,15 +93,15 @@ public function easterMonday($year, $timezone, $locale, $type = Holiday::TYPE_NA * @param int $year the year for which Ascension need to be created * @param string $timezone the timezone in which Ascension is celebrated * @param string $locale the locale for which Ascension need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function ascensionDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function ascensionDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'ascensionDay', @@ -121,15 +121,15 @@ public function ascensionDay($year, $timezone, $locale, $type = Holiday::TYPE_NA * @param int $year the year for which Pentecost need to be created * @param string $timezone the timezone in which Pentecost is celebrated * @param string $locale the locale for which Pentecost need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function pentecost($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function pentecost($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'pentecost', @@ -149,15 +149,15 @@ public function pentecost($year, $timezone, $locale, $type = Holiday::TYPE_NATIO * @param int $year the year for which Pentecost (Whitmonday) need to be created * @param string $timezone the timezone in which Pentecost (Whitmonday) is celebrated * @param string $locale the locale for which Pentecost (Whitmonday) need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function pentecostMonday($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function pentecostMonday($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'pentecostMonday', @@ -180,7 +180,7 @@ public function pentecostMonday($year, $timezone, $locale, $type = Holiday::TYPE * @param int $year the year for which Corpus Christi need to be created * @param string $timezone the timezone in which Corpus Christi is celebrated * @param string $locale the locale for which Corpus Christi need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a type of 'other' is considered. * * @return \Yasumi\Holiday @@ -212,7 +212,7 @@ public function corpusChristi($year, $timezone, $locale, $type = Holiday::TYPE_O * @param int $year the year for which Christmas Eve needs to be created * @param string $timezone the timezone in which Christmas Eve is celebrated * @param string $locale the locale for which Christmas Eve need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default observance is considered. * * @return \Yasumi\Holiday @@ -241,15 +241,15 @@ public function christmasEve($year, $timezone, $locale, $type = Holiday::TYPE_OB * @param int $year the year for which Christmas Day need to be created * @param string $timezone the timezone in which Christmas Day is celebrated * @param string $locale the locale for which Christmas Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function christmasDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function christmasDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'christmasDay', @@ -270,15 +270,15 @@ public function christmasDay($year, $timezone, $locale, $type = Holiday::TYPE_NA * @param int $year the year for which the Second Christmas Day / Boxing Day need to be created * @param string $timezone the timezone in which the Second Christmas Day / Boxing Day is celebrated * @param string $locale the locale for which the Second Christmas Day / Boxing Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function secondChristmasDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function secondChristmasDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'secondChristmasDay', @@ -302,15 +302,15 @@ public function secondChristmasDay($year, $timezone, $locale, $type = Holiday::T * @param int $year the year for which All Saints' Day need to be created * @param string $timezone the timezone in which All Saints' Day is celebrated * @param string $locale the locale for which All Saints' Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function allSaintsDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function allSaintsDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday('allSaintsDay', [], new DateTime("$year-11-1", new DateTimeZone($timezone)), $locale, $type); } @@ -327,15 +327,15 @@ public function allSaintsDay($year, $timezone, $locale, $type = Holiday::TYPE_NA * @param int $year the year for which the day of the Assumption of Mary need to be created * @param string $timezone the timezone in which the day of the Assumption of Mary is celebrated * @param string $locale the locale for which the day of the Assumption of Mary need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function assumptionOfMary($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function assumptionOfMary($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'assumptionOfMary', @@ -356,15 +356,15 @@ public function assumptionOfMary($year, $timezone, $locale, $type = Holiday::TYP * @param int $year the year for which Good Friday need to be created * @param string $timezone the timezone in which Good Friday is celebrated * @param string $locale the locale for which Good Friday need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function goodFriday($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function goodFriday($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'goodFriday', @@ -389,15 +389,15 @@ public function goodFriday($year, $timezone, $locale, $type = Holiday::TYPE_NATI * @param int $year the year for which Epiphany need to be created * @param string $timezone the timezone in which Epiphany is celebrated * @param string $locale the locale for which Epiphany need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function epiphany($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function epiphany($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday('epiphany', [], new DateTime("$year-1-6", new DateTimeZone($timezone)), $locale, $type); } @@ -414,15 +414,15 @@ public function epiphany($year, $timezone, $locale, $type = Holiday::TYPE_NATION * @param int $year the year for which Ash Wednesday need to be created * @param string $timezone the timezone in which Ash Wednesday is celebrated * @param string $locale the locale for which Ash Wednesday need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function ashWednesday($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function ashWednesday($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'ashWednesday', @@ -446,15 +446,15 @@ public function ashWednesday($year, $timezone, $locale, $type = Holiday::TYPE_NA * @param int $year the year for which Immaculate Conception need to be created * @param string $timezone the timezone in which Immaculate Conception is celebrated * @param string $locale the locale for which Immaculate Conception need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function immaculateConception($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function immaculateConception($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'immaculateConception', @@ -479,15 +479,15 @@ public function immaculateConception($year, $timezone, $locale, $type = Holiday: * @param int $year the year for which St. Stephen's Day need to be created * @param string $timezone the timezone in which St. Stephen's Day is celebrated * @param string $locale the locale for which St. Stephen's Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function stStephensDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function stStephensDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'stStephensDay', @@ -512,15 +512,15 @@ public function stStephensDay($year, $timezone, $locale, $type = Holiday::TYPE_N * @param int $year the year for which St. Joseph's Day need to be created * @param string $timezone the timezone in which St. Joseph's Day is celebrated * @param string $locale the locale for which St. Joseph's Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function stJosephsDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function stJosephsDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday('stJosephsDay', [], new DateTime("$year-3-19", new DateTimeZone($timezone)), $locale, $type); } @@ -538,15 +538,15 @@ public function stJosephsDay($year, $timezone, $locale, $type = Holiday::TYPE_NA * @param int $year the year for which Maundy Thursday need to be created * @param string $timezone the timezone in which Maundy Thursday is celebrated * @param string $locale the locale for which Maundy Thursday need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function maundyThursday($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function maundyThursday($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'maundyThursday', @@ -570,15 +570,15 @@ public function maundyThursday($year, $timezone, $locale, $type = Holiday::TYPE_ * @param int $year the year for which St. George's Day need to be created * @param string $timezone the timezone in which St. George's Day is celebrated * @param string $locale the locale for which St. George's Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function stGeorgesDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function stGeorgesDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday('stGeorgesDay', [], new DateTime("$year-4-23", new DateTimeZone($timezone)), $locale, $type); } @@ -597,15 +597,15 @@ public function stGeorgesDay($year, $timezone, $locale, $type = Holiday::TYPE_NA * @param int $year the year for which St. John's Day need to be created * @param string $timezone the timezone in which St. John's Day is celebrated * @param string $locale the locale for which St. John's Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function stJohnsDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function stJohnsDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday('stJohnsDay', [], new DateTime("$year-06-24", new DateTimeZone($timezone)), $locale, $type); } @@ -624,15 +624,15 @@ public function stJohnsDay($year, $timezone, $locale, $type = Holiday::TYPE_NATI * @param int $year the year for which the Annunciation needs to be created * @param string $timezone the timezone in which the Annunciation is celebrated * @param string $locale the locale for which the Annunciation need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function annunciation($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function annunciation($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'annunciation', @@ -685,15 +685,15 @@ public function calculateOrthodoxEaster($year, $timezone) * @param int $year the year for which St. John's Day need to be created * @param string $timezone the timezone in which St. John's Day is celebrated * @param string $locale the locale for which St. John's Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function reformationDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function reformationDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'reformationDay', diff --git a/src/Yasumi/Provider/CommonHolidays.php b/src/Yasumi/Provider/CommonHolidays.php index d6fcd4b7d..e73f15d6c 100644 --- a/src/Yasumi/Provider/CommonHolidays.php +++ b/src/Yasumi/Provider/CommonHolidays.php @@ -38,15 +38,15 @@ trait CommonHolidays * @param int $year the year for which New Year's Day need to be created * @param string $timezone the timezone in which New Year's Day is celebrated * @param string $locale the locale for which New Year's Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function newYearsDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function newYearsDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday('newYearsDay', [], new DateTime("$year-1-1", new DateTimeZone($timezone)), $locale, $type); } @@ -65,15 +65,15 @@ public function newYearsDay($year, $timezone, $locale, $type = Holiday::TYPE_NAT * @param int $year the year for which International Workers' Day need to be created * @param string $timezone the timezone in which International Workers' Day is celebrated * @param string $locale the locale for which International Workers' Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function internationalWorkersDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function internationalWorkersDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'internationalWorkersDay', @@ -98,15 +98,15 @@ public function internationalWorkersDay($year, $timezone, $locale, $type = Holid * @param int $year the year for which Valentine's Day need to be created * @param string $timezone the timezone in which Valentine's Day is celebrated * @param string $locale the locale for which Valentine's Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function valentinesDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function valentinesDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'valentinesDay', @@ -129,15 +129,15 @@ public function valentinesDay($year, $timezone, $locale, $type = Holiday::TYPE_N * @param int $year the year for which World Animal Day need to be created * @param string $timezone the timezone in which World Animal Day is celebrated * @param string $locale the locale for which World Animal Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function worldAnimalDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function worldAnimalDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'worldAnimalDay', @@ -162,15 +162,15 @@ public function worldAnimalDay($year, $timezone, $locale, $type = Holiday::TYPE_ * @param int $year the year for which St. Martin's Day need to be created * @param string $timezone the timezone in which St. Martin's Day is celebrated * @param string $locale the locale for which St. Martin's Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function stMartinsDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function stMartinsDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'stMartinsDay', @@ -194,15 +194,15 @@ public function stMartinsDay($year, $timezone, $locale, $type = Holiday::TYPE_NA * @param int $year the year for which Father's Day need to be created * @param string $timezone the timezone in which Father's Day is celebrated * @param string $locale the locale for which Father's Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function fathersDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function fathersDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'fathersDay', @@ -226,15 +226,15 @@ public function fathersDay($year, $timezone, $locale, $type = Holiday::TYPE_NATI * @param int $year the year for which Mother's Day need to be created * @param string $timezone the timezone in which Mother's Day is celebrated * @param string $locale the locale for which Mother's Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function mothersDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function mothersDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'mothersDay', @@ -258,15 +258,15 @@ public function mothersDay($year, $timezone, $locale, $type = Holiday::TYPE_NATI * @param int $year the year for which Victory in Europe Day need to be created * @param string $timezone the timezone in which Victory in Europe Day is celebrated * @param string $locale the locale for which Victory in Europe Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function victoryInEuropeDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function victoryInEuropeDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'victoryInEuropeDay', @@ -292,15 +292,15 @@ public function victoryInEuropeDay($year, $timezone, $locale, $type = Holiday::T * @param int $year the year for which Armistice Day need to be created * @param string $timezone the timezone in which Armistice Day is celebrated * @param string $locale the locale for which Armistice Day need to be displayed in. - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, TYPE_OBSERVANCE, - * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default a national holiday is considered. + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, TYPE_OBSERVANCE, + * TYPE_SEASON, TYPE_BANK or TYPE_OTHER. By default an official holiday is considered. * * @return \Yasumi\Holiday * * @throws \Yasumi\Exception\UnknownLocaleException * @throws \InvalidArgumentException */ - public function armisticeDay($year, $timezone, $locale, $type = Holiday::TYPE_NATIONAL) + public function armisticeDay($year, $timezone, $locale, $type = Holiday::TYPE_OFFICIAL) { return new Holiday( 'armisticeDay', diff --git a/src/Yasumi/Provider/Croatia.php b/src/Yasumi/Provider/Croatia.php index dad3b9df0..224a3b5d2 100644 --- a/src/Yasumi/Provider/Croatia.php +++ b/src/Yasumi/Provider/Croatia.php @@ -49,7 +49,7 @@ public function initialize() $this->addHoliday($this->epiphany($this->year, $this->timezone, $this->locale)); $this->addHoliday($this->easter($this->year, $this->timezone, $this->locale)); $this->addHoliday($this->easterMonday($this->year, $this->timezone, $this->locale)); - $this->addHoliday($this->corpusChristi($this->year, $this->timezone, $this->locale, Holiday::TYPE_NATIONAL)); + $this->addHoliday($this->corpusChristi($this->year, $this->timezone, $this->locale, Holiday::TYPE_OFFICIAL)); $this->addHoliday($this->assumptionOfMary($this->year, $this->timezone, $this->locale)); $this->addHoliday($this->allSaintsDay($this->year, $this->timezone, $this->locale)); $this->addHoliday($this->christmasDay($this->year, $this->timezone, $this->locale)); diff --git a/src/Yasumi/Provider/NewZealand.php b/src/Yasumi/Provider/NewZealand.php index f0b702c26..fe1af1606 100644 --- a/src/Yasumi/Provider/NewZealand.php +++ b/src/Yasumi/Provider/NewZealand.php @@ -40,7 +40,7 @@ public function initialize() { $this->timezone = 'Pacific/Auckland'; - // National Holidays + // Official Holidays $this->calculateNewYearHolidays(); $this->calculateWaitangiDay(); $this->calculateAnzacDay(); diff --git a/src/Yasumi/Provider/Portugal.php b/src/Yasumi/Provider/Portugal.php index d008bf73b..0fd874b21 100644 --- a/src/Yasumi/Provider/Portugal.php +++ b/src/Yasumi/Provider/Portugal.php @@ -85,7 +85,7 @@ public function calculateCarnationRevolutionDay() ['pt_PT' => 'Dia da Liberdade'], new DateTime("$this->year-04-25", new DateTimeZone($this->timezone)), $this->locale, - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL )); } } @@ -208,7 +208,7 @@ public function calculateRestorationOfIndependenceDay() ['pt_PT' => 'Restauração da Independência'], new DateTime("$this->year-12-01", new DateTimeZone($this->timezone)), $this->locale, - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL )); } } diff --git a/src/Yasumi/Provider/Slovakia.php b/src/Yasumi/Provider/Slovakia.php index 08e941165..f40dc4826 100644 --- a/src/Yasumi/Provider/Slovakia.php +++ b/src/Yasumi/Provider/Slovakia.php @@ -66,7 +66,7 @@ public function initialize() $this->timezone = 'Europe/Bratislava'; // 1.1. - $this->addHoliday($this->newYearsDay($this->year, $this->timezone, $this->locale, Holiday::TYPE_NATIONAL)); + $this->addHoliday($this->newYearsDay($this->year, $this->timezone, $this->locale, Holiday::TYPE_OFFICIAL)); // 6.1. $this->addHoliday($this->epiphany($this->year, $this->timezone, $this->locale, Holiday::TYPE_BANK)); // 1.5. @@ -123,7 +123,7 @@ public function calculateSaintsCyrilAndMethodiusDay() ], new DateTime($this->year . '-07-05', new DateTimeZone($this->timezone)), $this->locale, - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL )); } @@ -145,7 +145,7 @@ public function calculateSlovakNationalUprisingDay() ], new DateTime($this->year . '-08-29', new DateTimeZone($this->timezone)), $this->locale, - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL )); } @@ -167,7 +167,7 @@ public function calculateSlovakConstitutionDay() ], new DateTime($this->year . '-09-01', new DateTimeZone($this->timezone)), $this->locale, - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL )); } @@ -210,7 +210,7 @@ public function calculateStruggleForFreedomAndDemocracyDay() ], new DateTime($this->year . '-11-17', new DateTimeZone($this->timezone)), $this->locale, - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL )); } } diff --git a/src/Yasumi/Provider/Sweden.php b/src/Yasumi/Provider/Sweden.php index d5a1e0f43..fd9c1902d 100644 --- a/src/Yasumi/Provider/Sweden.php +++ b/src/Yasumi/Provider/Sweden.php @@ -53,7 +53,7 @@ public function initialize() $this->addHoliday($this->pentecost($this->year, $this->timezone, $this->locale)); $this->calculatestJohnsDay(); // aka Midsummer's Day $this->calculateAllSaintsDay(); - $this->addHoliday($this->christmasEve($this->year, $this->timezone, $this->locale, Holiday::TYPE_NATIONAL)); + $this->addHoliday($this->christmasEve($this->year, $this->timezone, $this->locale, Holiday::TYPE_OFFICIAL)); $this->addHoliday($this->christmasDay($this->year, $this->timezone, $this->locale)); $this->addHoliday($this->secondChristmasDay($this->year, $this->timezone, $this->locale)); diff --git a/src/Yasumi/Provider/Switzerland.php b/src/Yasumi/Provider/Switzerland.php index e0bc0029a..3149f053f 100644 --- a/src/Yasumi/Provider/Switzerland.php +++ b/src/Yasumi/Provider/Switzerland.php @@ -73,7 +73,7 @@ public function calculateNationalDay() $translations, new DateTime($this->year . '-08-01', new DateTimeZone($this->timezone)), $this->locale, - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL )); } elseif ($this->year >= 1899 || $this->year === 1891) { $this->addHoliday(new Holiday( diff --git a/tests/Australia/AnzacDayTest.php b/tests/Australia/AnzacDayTest.php index 961242f57..913f12189 100644 --- a/tests/Australia/AnzacDayTest.php +++ b/tests/Australia/AnzacDayTest.php @@ -105,7 +105,7 @@ public function testHolidayType() $this->region, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR, 2100), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Australia/AustraliaDayTest.php b/tests/Australia/AustraliaDayTest.php index 643a705a7..d34395945 100644 --- a/tests/Australia/AustraliaDayTest.php +++ b/tests/Australia/AustraliaDayTest.php @@ -64,7 +64,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(2000), Holiday::TYPE_NATIONAL); + $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(2000), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Australia/AustraliaTest.php b/tests/Australia/AustraliaTest.php index 529fffd17..ba4e19319 100644 --- a/tests/Australia/AustraliaTest.php +++ b/tests/Australia/AustraliaTest.php @@ -25,9 +25,9 @@ class AustraliaTest extends AustraliaBaseTestCase protected $year; /** - * Tests if all national holidays in Australia are defined by the provider class + * Tests if all official holidays in Australia are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -37,7 +37,7 @@ public function testNationalHolidays() 'secondChristmasDay', 'australiaDay', 'anzacDay', - ], $this->region, $this->year, Holiday::TYPE_NATIONAL); + ], $this->region, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Australia/BoxingDayTest.php b/tests/Australia/BoxingDayTest.php index 42bd44a31..50a3ddae4 100644 --- a/tests/Australia/BoxingDayTest.php +++ b/tests/Australia/BoxingDayTest.php @@ -87,6 +87,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Australia/ChristmasDayTest.php b/tests/Australia/ChristmasDayTest.php index f14ccf738..0482e0795 100644 --- a/tests/Australia/ChristmasDayTest.php +++ b/tests/Australia/ChristmasDayTest.php @@ -87,6 +87,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Australia/EasterMondayTest.php b/tests/Australia/EasterMondayTest.php index 29a14cd2c..8567c0a78 100644 --- a/tests/Australia/EasterMondayTest.php +++ b/tests/Australia/EasterMondayTest.php @@ -84,6 +84,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Australia/GoodFridayTest.php b/tests/Australia/GoodFridayTest.php index 2696adf92..6a07d1a8a 100644 --- a/tests/Australia/GoodFridayTest.php +++ b/tests/Australia/GoodFridayTest.php @@ -83,6 +83,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Australia/LabourDayTest.php b/tests/Australia/LabourDayTest.php index 108d516be..76f8a97bc 100644 --- a/tests/Australia/LabourDayTest.php +++ b/tests/Australia/LabourDayTest.php @@ -77,6 +77,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(1990), Holiday::TYPE_NATIONAL); + $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(1990), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Australia/NewYearsDayTest.php b/tests/Australia/NewYearsDayTest.php index 36c4542fd..32cf6b729 100644 --- a/tests/Australia/NewYearsDayTest.php +++ b/tests/Australia/NewYearsDayTest.php @@ -88,6 +88,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType($this->region, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Australia/QueensBirthdayTest.php b/tests/Australia/QueensBirthdayTest.php index 82abceeb8..d889d93d3 100644 --- a/tests/Australia/QueensBirthdayTest.php +++ b/tests/Australia/QueensBirthdayTest.php @@ -99,7 +99,7 @@ public function testHolidayType() $this->region, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR, 2100), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Australia/Victoria/AFLGrandFinalFridayTest.php b/tests/Australia/Victoria/AFLGrandFinalFridayTest.php index 60e773aaa..812d70eaf 100644 --- a/tests/Australia/Victoria/AFLGrandFinalFridayTest.php +++ b/tests/Australia/Victoria/AFLGrandFinalFridayTest.php @@ -71,7 +71,7 @@ public function testHolidayType() $this->region, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR, self::LAST_KNOWN_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } diff --git a/tests/Australia/Victoria/VictoriaTest.php b/tests/Australia/Victoria/VictoriaTest.php index ee6bfa044..8d70ca274 100644 --- a/tests/Australia/Victoria/VictoriaTest.php +++ b/tests/Australia/Victoria/VictoriaTest.php @@ -28,9 +28,9 @@ class VictoriaTest extends AustraliaTest protected $year; /** - * Tests if all national holidays in Australia are defined by the provider class + * Tests if all official holidays in Victoria (Australia) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -43,7 +43,7 @@ public function testNationalHolidays() 'queensBirthday', 'labourDay', 'aflGrandFinalFriday' - ], $this->region, $this->year, Holiday::TYPE_NATIONAL); + ], $this->region, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Austria/AllSaintsDayTest.php b/tests/Austria/AllSaintsDayTest.php index 4a31e2260..d4db4b15c 100644 --- a/tests/Austria/AllSaintsDayTest.php +++ b/tests/Austria/AllSaintsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/AscensionDayTest.php b/tests/Austria/AscensionDayTest.php index d384d96a0..81613b8ec 100644 --- a/tests/Austria/AscensionDayTest.php +++ b/tests/Austria/AscensionDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/AssumptionOfMaryTest.php b/tests/Austria/AssumptionOfMaryTest.php index 43215fc60..c1d64850e 100644 --- a/tests/Austria/AssumptionOfMaryTest.php +++ b/tests/Austria/AssumptionOfMaryTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/AustriaTest.php b/tests/Austria/AustriaTest.php index 5f57a13ae..029a69db6 100644 --- a/tests/Austria/AustriaTest.php +++ b/tests/Austria/AustriaTest.php @@ -25,9 +25,9 @@ class AustriaTest extends AustriaBaseTestCase protected $year; /** - * Tests if all national holidays in Austria are defined by the provider class + * Tests if all official holidays in Austria are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'ascensionDay', @@ -43,7 +43,7 @@ public function testNationalHolidays() 'christmasDay', 'secondChristmasDay', 'nationalDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Austria/ChristmasTest.php b/tests/Austria/ChristmasTest.php index bffb242ed..f68ae0dc2 100644 --- a/tests/Austria/ChristmasTest.php +++ b/tests/Austria/ChristmasTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/CorpusChristiTest.php b/tests/Austria/CorpusChristiTest.php index 7ca7e2c46..448d46186 100644 --- a/tests/Austria/CorpusChristiTest.php +++ b/tests/Austria/CorpusChristiTest.php @@ -61,6 +61,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/EasterMondayTest.php b/tests/Austria/EasterMondayTest.php index 82408ff08..d12fda09d 100644 --- a/tests/Austria/EasterMondayTest.php +++ b/tests/Austria/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/EasterTest.php b/tests/Austria/EasterTest.php index 5fcd256f0..eb364df10 100644 --- a/tests/Austria/EasterTest.php +++ b/tests/Austria/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/EpiphanyTest.php b/tests/Austria/EpiphanyTest.php index 88de659b5..a2a1102de 100644 --- a/tests/Austria/EpiphanyTest.php +++ b/tests/Austria/EpiphanyTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/ImmaculateConceptionTest.php b/tests/Austria/ImmaculateConceptionTest.php index b113150ad..c855aed9d 100644 --- a/tests/Austria/ImmaculateConceptionTest.php +++ b/tests/Austria/ImmaculateConceptionTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/InternationalWorkersDayTest.php b/tests/Austria/InternationalWorkersDayTest.php index 36bf9cb29..5be805a79 100644 --- a/tests/Austria/InternationalWorkersDayTest.php +++ b/tests/Austria/InternationalWorkersDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/NationalDayTest.php b/tests/Austria/NationalDayTest.php index fc6dcec33..e3074fd45 100644 --- a/tests/Austria/NationalDayTest.php +++ b/tests/Austria/NationalDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Austria/NewYearsDayTest.php b/tests/Austria/NewYearsDayTest.php index ad6a1dc34..fc435c105 100644 --- a/tests/Austria/NewYearsDayTest.php +++ b/tests/Austria/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/PentecostMondayTest.php b/tests/Austria/PentecostMondayTest.php index 7335f63ff..43a70b9d0 100644 --- a/tests/Austria/PentecostMondayTest.php +++ b/tests/Austria/PentecostMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Austria/SecondChristmasDayTest.php b/tests/Austria/SecondChristmasDayTest.php index e071ad49f..b88864fe1 100644 --- a/tests/Austria/SecondChristmasDayTest.php +++ b/tests/Austria/SecondChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/AllSaintsDayTest.php b/tests/Belgium/AllSaintsDayTest.php index 47b45c2bf..f4bfeffcd 100644 --- a/tests/Belgium/AllSaintsDayTest.php +++ b/tests/Belgium/AllSaintsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/ArmisticeDayTest.php b/tests/Belgium/ArmisticeDayTest.php index c6a917c74..7c8bf17b1 100644 --- a/tests/Belgium/ArmisticeDayTest.php +++ b/tests/Belgium/ArmisticeDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/AscensionDayTest.php b/tests/Belgium/AscensionDayTest.php index 346f42b6f..a949deab8 100644 --- a/tests/Belgium/AscensionDayTest.php +++ b/tests/Belgium/AscensionDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/AssumptionOfMaryTest.php b/tests/Belgium/AssumptionOfMaryTest.php index 8397a08da..0758a707d 100644 --- a/tests/Belgium/AssumptionOfMaryTest.php +++ b/tests/Belgium/AssumptionOfMaryTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/BelgiumTest.php b/tests/Belgium/BelgiumTest.php index 57911e096..7d27b3df8 100644 --- a/tests/Belgium/BelgiumTest.php +++ b/tests/Belgium/BelgiumTest.php @@ -25,9 +25,9 @@ class BelgiumTest extends BelgiumBaseTestCase protected $year; /** - * Tests if all national holidays in Belgium are defined by the provider class + * Tests if all official holidays in Belgium are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'allSaintsDay', 'armisticeDay', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Belgium/ChristmasTest.php b/tests/Belgium/ChristmasTest.php index 9e62685c8..dac688248 100644 --- a/tests/Belgium/ChristmasTest.php +++ b/tests/Belgium/ChristmasTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/EasterMondayTest.php b/tests/Belgium/EasterMondayTest.php index 8768f4649..5e3a8c49e 100644 --- a/tests/Belgium/EasterMondayTest.php +++ b/tests/Belgium/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/EasterTest.php b/tests/Belgium/EasterTest.php index bf33b0099..2eccf65d6 100644 --- a/tests/Belgium/EasterTest.php +++ b/tests/Belgium/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/InternationalWorkersDayTest.php b/tests/Belgium/InternationalWorkersDayTest.php index b518039bb..e00779cd1 100644 --- a/tests/Belgium/InternationalWorkersDayTest.php +++ b/tests/Belgium/InternationalWorkersDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/NationalDayTest.php b/tests/Belgium/NationalDayTest.php index 497ebb245..6f765429e 100644 --- a/tests/Belgium/NationalDayTest.php +++ b/tests/Belgium/NationalDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/NewYearsDayTest.php b/tests/Belgium/NewYearsDayTest.php index 8da6d40f7..eb6122daa 100644 --- a/tests/Belgium/NewYearsDayTest.php +++ b/tests/Belgium/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/PentecostTest.php b/tests/Belgium/PentecostTest.php index 9781b8b47..50897f061 100644 --- a/tests/Belgium/PentecostTest.php +++ b/tests/Belgium/PentecostTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Belgium/pentecostMondayTest.php b/tests/Belgium/pentecostMondayTest.php index 805e68a9b..ddfbffc66 100644 --- a/tests/Belgium/pentecostMondayTest.php +++ b/tests/Belgium/pentecostMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Brazil/AllSoulsDayTest.php b/tests/Brazil/AllSoulsDayTest.php index 0f78cc5fa..70f72347c 100644 --- a/tests/Brazil/AllSoulsDayTest.php +++ b/tests/Brazil/AllSoulsDayTest.php @@ -70,6 +70,6 @@ public function testTranslation() public function testHolidayType() { $year = $this->generateRandomYear(self::ESTABLISHMENT_YEAR); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Brazil/BrazilTest.php b/tests/Brazil/BrazilTest.php index 7a952ceb2..f21565f3e 100644 --- a/tests/Brazil/BrazilTest.php +++ b/tests/Brazil/BrazilTest.php @@ -25,9 +25,9 @@ class BrazilTest extends BrazilBaseTestCase protected $year; /** - * Tests if all national holidays in Brazil are defined by the provider class + * Tests if all official holidays in Brazil are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -39,7 +39,7 @@ public function testNationalHolidays() 'allSoulsDay', 'proclamationOfRepublicDay', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Brazil/ChristmasDayTest.php b/tests/Brazil/ChristmasDayTest.php index 685e1f3c6..afd10c69d 100644 --- a/tests/Brazil/ChristmasDayTest.php +++ b/tests/Brazil/ChristmasDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Brazil/GoodFridayTest.php b/tests/Brazil/GoodFridayTest.php index 964b6f038..2d4c02f6b 100644 --- a/tests/Brazil/GoodFridayTest.php +++ b/tests/Brazil/GoodFridayTest.php @@ -61,6 +61,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Brazil/IndependenceDayTest.php b/tests/Brazil/IndependenceDayTest.php index 04c45f731..cb996035b 100644 --- a/tests/Brazil/IndependenceDayTest.php +++ b/tests/Brazil/IndependenceDayTest.php @@ -75,6 +75,6 @@ public function testTranslation() public function testHolidayType() { $year = $this->generateRandomYear(self::ESTABLISHMENT_YEAR); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Brazil/InternationalWorkersDayTest.php b/tests/Brazil/InternationalWorkersDayTest.php index 3d2c255f2..1ee66bca3 100644 --- a/tests/Brazil/InternationalWorkersDayTest.php +++ b/tests/Brazil/InternationalWorkersDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Brazil/NewYearsDayTest.php b/tests/Brazil/NewYearsDayTest.php index 52bc33577..2e251b96f 100644 --- a/tests/Brazil/NewYearsDayTest.php +++ b/tests/Brazil/NewYearsDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Brazil/OurLadyOfAparecidaDayTest.php b/tests/Brazil/OurLadyOfAparecidaDayTest.php index 3846b6688..debe10c11 100644 --- a/tests/Brazil/OurLadyOfAparecidaDayTest.php +++ b/tests/Brazil/OurLadyOfAparecidaDayTest.php @@ -75,6 +75,6 @@ public function testTranslation() public function testHolidayType() { $year = $this->generateRandomYear(self::ESTABLISHMENT_YEAR); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Brazil/ProclamationOfRepublicDayTest.php b/tests/Brazil/ProclamationOfRepublicDayTest.php index f16033fc2..324200300 100644 --- a/tests/Brazil/ProclamationOfRepublicDayTest.php +++ b/tests/Brazil/ProclamationOfRepublicDayTest.php @@ -75,6 +75,6 @@ public function testTranslation() public function testHolidayType() { $year = $this->generateRandomYear(self::ESTABLISHMENT_YEAR); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Brazil/TiradentesDayTest.php b/tests/Brazil/TiradentesDayTest.php index c39bc22ea..e92b2d1df 100644 --- a/tests/Brazil/TiradentesDayTest.php +++ b/tests/Brazil/TiradentesDayTest.php @@ -70,6 +70,6 @@ public function testTranslation() public function testHolidayType() { $year = $this->generateRandomYear(self::ESTABLISHMENT_YEAR); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Croatia/AllSaintsDayTest.php b/tests/Croatia/AllSaintsDayTest.php index e6835c8ff..41c048808 100644 --- a/tests/Croatia/AllSaintsDayTest.php +++ b/tests/Croatia/AllSaintsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Croatia/AntifascistStruggleDayTest.php b/tests/Croatia/AntifascistStruggleDayTest.php index 3d3fff272..0d5ce6c34 100644 --- a/tests/Croatia/AntifascistStruggleDayTest.php +++ b/tests/Croatia/AntifascistStruggleDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Croatia/AssumptionOfMaryTest.php b/tests/Croatia/AssumptionOfMaryTest.php index 5818e34fc..02a236091 100644 --- a/tests/Croatia/AssumptionOfMaryTest.php +++ b/tests/Croatia/AssumptionOfMaryTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Croatia/ChristmasDayTest.php b/tests/Croatia/ChristmasDayTest.php index 5d76cf4b8..7e5573ebb 100644 --- a/tests/Croatia/ChristmasDayTest.php +++ b/tests/Croatia/ChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Croatia/CorpusChristiTest.php b/tests/Croatia/CorpusChristiTest.php index 6d3dd0f36..6c7071b79 100644 --- a/tests/Croatia/CorpusChristiTest.php +++ b/tests/Croatia/CorpusChristiTest.php @@ -61,6 +61,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Croatia/EasterMondayTest.php b/tests/Croatia/EasterMondayTest.php index 119670a41..77d788301 100644 --- a/tests/Croatia/EasterMondayTest.php +++ b/tests/Croatia/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Croatia/EasterTest.php b/tests/Croatia/EasterTest.php index 2db5943c6..248db1ad6 100644 --- a/tests/Croatia/EasterTest.php +++ b/tests/Croatia/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Croatia/EpiphanyTest.php b/tests/Croatia/EpiphanyTest.php index ae9775691..de1600f22 100644 --- a/tests/Croatia/EpiphanyTest.php +++ b/tests/Croatia/EpiphanyTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Croatia/HomelandThanksgivingDayTest.php b/tests/Croatia/HomelandThanksgivingDayTest.php index 02fa19142..ba26bd1d0 100644 --- a/tests/Croatia/HomelandThanksgivingDayTest.php +++ b/tests/Croatia/HomelandThanksgivingDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Croatia/IndependenceDayTest.php b/tests/Croatia/IndependenceDayTest.php index e3b5a917f..1bfe437d2 100644 --- a/tests/Croatia/IndependenceDayTest.php +++ b/tests/Croatia/IndependenceDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Croatia/InternationalWorkersDayTest.php b/tests/Croatia/InternationalWorkersDayTest.php index 696ba0243..9c11e8958 100644 --- a/tests/Croatia/InternationalWorkersDayTest.php +++ b/tests/Croatia/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Croatia/NewYearsDayTest.php b/tests/Croatia/NewYearsDayTest.php index fe05f5d00..989655b9f 100644 --- a/tests/Croatia/NewYearsDayTest.php +++ b/tests/Croatia/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Croatia/StStephensDayTest.php b/tests/Croatia/StStephensDayTest.php index cf6bad9ae..7bb1532a3 100644 --- a/tests/Croatia/StStephensDayTest.php +++ b/tests/Croatia/StStephensDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Croatia/StatehoodDayTest.php b/tests/Croatia/StatehoodDayTest.php index dfed5cce4..73c65df7e 100644 --- a/tests/Croatia/StatehoodDayTest.php +++ b/tests/Croatia/StatehoodDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/CzechRepublic/ChristmasDayTest.php b/tests/CzechRepublic/ChristmasDayTest.php index afc625351..c4741cfd7 100644 --- a/tests/CzechRepublic/ChristmasDayTest.php +++ b/tests/CzechRepublic/ChristmasDayTest.php @@ -71,6 +71,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/CzechRepublic/CzechRepublicTest.php b/tests/CzechRepublic/CzechRepublicTest.php index fb0b3db90..c2f01f90e 100644 --- a/tests/CzechRepublic/CzechRepublicTest.php +++ b/tests/CzechRepublic/CzechRepublicTest.php @@ -29,9 +29,9 @@ class CzechRepublicTest extends CzechRepublicBaseTestCase protected $year; /** - * Tests if all national holidays in Finland are defined by the provider class + * Tests if all official holidays in Finland are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -46,7 +46,7 @@ public function testNationalHolidays() 'czechStateHoodDay', 'independentCzechoslovakStateDay', 'struggleForFreedomAndDemocracyDay', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/CzechRepublic/CzechStateHoodDayTest.php b/tests/CzechRepublic/CzechStateHoodDayTest.php index c462aafe2..622610436 100644 --- a/tests/CzechRepublic/CzechStateHoodDayTest.php +++ b/tests/CzechRepublic/CzechStateHoodDayTest.php @@ -71,6 +71,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/CzechRepublic/EasterMondayTest.php b/tests/CzechRepublic/EasterMondayTest.php index 93a2d203c..61212bdaa 100644 --- a/tests/CzechRepublic/EasterMondayTest.php +++ b/tests/CzechRepublic/EasterMondayTest.php @@ -63,6 +63,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/CzechRepublic/GoodFridayTest.php b/tests/CzechRepublic/GoodFridayTest.php index 147545f3f..65071606d 100644 --- a/tests/CzechRepublic/GoodFridayTest.php +++ b/tests/CzechRepublic/GoodFridayTest.php @@ -63,6 +63,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/CzechRepublic/IndependentCzechoslovakStateDayTest.php b/tests/CzechRepublic/IndependentCzechoslovakStateDayTest.php index 467254d8c..32b8924d8 100644 --- a/tests/CzechRepublic/IndependentCzechoslovakStateDayTest.php +++ b/tests/CzechRepublic/IndependentCzechoslovakStateDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/CzechRepublic/InternationalWorkersDayTest.php b/tests/CzechRepublic/InternationalWorkersDayTest.php index e13f8bd45..807431c8f 100644 --- a/tests/CzechRepublic/InternationalWorkersDayTest.php +++ b/tests/CzechRepublic/InternationalWorkersDayTest.php @@ -61,7 +61,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/CzechRepublic/JanHusDayTest.php b/tests/CzechRepublic/JanHusDayTest.php index 041133342..73846c6b5 100644 --- a/tests/CzechRepublic/JanHusDayTest.php +++ b/tests/CzechRepublic/JanHusDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/CzechRepublic/NewYearsDayTest.php b/tests/CzechRepublic/NewYearsDayTest.php index 1f25f0762..59fb888a7 100644 --- a/tests/CzechRepublic/NewYearsDayTest.php +++ b/tests/CzechRepublic/NewYearsDayTest.php @@ -71,6 +71,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/CzechRepublic/SaintsCyrilAndMethodiusDayTest.php b/tests/CzechRepublic/SaintsCyrilAndMethodiusDayTest.php index ad802ebc5..384a4ed1a 100644 --- a/tests/CzechRepublic/SaintsCyrilAndMethodiusDayTest.php +++ b/tests/CzechRepublic/SaintsCyrilAndMethodiusDayTest.php @@ -71,6 +71,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/CzechRepublic/SecondChristmasDayTest.php b/tests/CzechRepublic/SecondChristmasDayTest.php index 7aef4ac21..09dbae3e7 100644 --- a/tests/CzechRepublic/SecondChristmasDayTest.php +++ b/tests/CzechRepublic/SecondChristmasDayTest.php @@ -71,6 +71,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/CzechRepublic/StruggleForFreedomAndDemocracyDayTest.php b/tests/CzechRepublic/StruggleForFreedomAndDemocracyDayTest.php index b91c63833..fd4f37e21 100644 --- a/tests/CzechRepublic/StruggleForFreedomAndDemocracyDayTest.php +++ b/tests/CzechRepublic/StruggleForFreedomAndDemocracyDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/CzechRepublic/VictoryInEuropeDayTest.php b/tests/CzechRepublic/VictoryInEuropeDayTest.php index 64fbac6d7..2891fcad5 100644 --- a/tests/CzechRepublic/VictoryInEuropeDayTest.php +++ b/tests/CzechRepublic/VictoryInEuropeDayTest.php @@ -71,6 +71,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Denmark/AscensionDayTest.php b/tests/Denmark/AscensionDayTest.php index 9b6459f0d..a549a8d92 100644 --- a/tests/Denmark/AscensionDayTest.php +++ b/tests/Denmark/AscensionDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Denmark/ChristmasDayTest.php b/tests/Denmark/ChristmasDayTest.php index a943c9a19..c82186adc 100644 --- a/tests/Denmark/ChristmasDayTest.php +++ b/tests/Denmark/ChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Denmark/DenmarkTest.php b/tests/Denmark/DenmarkTest.php index 808ee1d72..d04cbda45 100644 --- a/tests/Denmark/DenmarkTest.php +++ b/tests/Denmark/DenmarkTest.php @@ -25,9 +25,9 @@ class DenmarkTest extends DenmarkBaseTestCase protected $year; /** - * Tests if all national holidays in Denmark are defined by the provider class + * Tests if all official holidays in Denmark are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'pentecostMonday', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Denmark/EasterMondayTest.php b/tests/Denmark/EasterMondayTest.php index 2803ece3e..c383ead12 100644 --- a/tests/Denmark/EasterMondayTest.php +++ b/tests/Denmark/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Denmark/EasterTest.php b/tests/Denmark/EasterTest.php index 768223a37..37665ecfa 100644 --- a/tests/Denmark/EasterTest.php +++ b/tests/Denmark/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Denmark/GoodFridayTest.php b/tests/Denmark/GoodFridayTest.php index e5407043e..973c4bdd7 100644 --- a/tests/Denmark/GoodFridayTest.php +++ b/tests/Denmark/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Denmark/GreatPrayerDayTest.php b/tests/Denmark/GreatPrayerDayTest.php index d82a80b77..29f13481f 100644 --- a/tests/Denmark/GreatPrayerDayTest.php +++ b/tests/Denmark/GreatPrayerDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Denmark/MaundyThursdayTest.php b/tests/Denmark/MaundyThursdayTest.php index ccbc76ea0..d032ffbe8 100644 --- a/tests/Denmark/MaundyThursdayTest.php +++ b/tests/Denmark/MaundyThursdayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Denmark/NewYearsDayTest.php b/tests/Denmark/NewYearsDayTest.php index 5ff704627..eb9293d48 100644 --- a/tests/Denmark/NewYearsDayTest.php +++ b/tests/Denmark/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Denmark/PentecostMondayTest.php b/tests/Denmark/PentecostMondayTest.php index 8d8411097..c4199e11e 100644 --- a/tests/Denmark/PentecostMondayTest.php +++ b/tests/Denmark/PentecostMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Denmark/PentecostTest.php b/tests/Denmark/PentecostTest.php index dff37c28b..8ae704add 100644 --- a/tests/Denmark/PentecostTest.php +++ b/tests/Denmark/PentecostTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Denmark/SecondChristmasDayTest.php b/tests/Denmark/SecondChristmasDayTest.php index 6771bb751..d6020ac5f 100644 --- a/tests/Denmark/SecondChristmasDayTest.php +++ b/tests/Denmark/SecondChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/AllSaintsDayTest.php b/tests/Finland/AllSaintsDayTest.php index 63dcc6a6e..eba91e303 100644 --- a/tests/Finland/AllSaintsDayTest.php +++ b/tests/Finland/AllSaintsDayTest.php @@ -85,6 +85,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/AscensionDayTest.php b/tests/Finland/AscensionDayTest.php index 5016e0e54..a577af10e 100644 --- a/tests/Finland/AscensionDayTest.php +++ b/tests/Finland/AscensionDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/ChristmasDayTest.php b/tests/Finland/ChristmasDayTest.php index a4f2acb27..583e04c21 100644 --- a/tests/Finland/ChristmasDayTest.php +++ b/tests/Finland/ChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/EasterMondayTest.php b/tests/Finland/EasterMondayTest.php index 4ab03e276..abb8b7656 100644 --- a/tests/Finland/EasterMondayTest.php +++ b/tests/Finland/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/EasterTest.php b/tests/Finland/EasterTest.php index a629c42b8..4996ce6ea 100644 --- a/tests/Finland/EasterTest.php +++ b/tests/Finland/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/EpiphanyTest.php b/tests/Finland/EpiphanyTest.php index 8371aced7..260528edb 100644 --- a/tests/Finland/EpiphanyTest.php +++ b/tests/Finland/EpiphanyTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/FinlandTest.php b/tests/Finland/FinlandTest.php index 51cb0a20a..9e4a60c53 100644 --- a/tests/Finland/FinlandTest.php +++ b/tests/Finland/FinlandTest.php @@ -25,9 +25,9 @@ class FinlandTest extends FinlandBaseTestCase protected $year; /** - * Tests if all national holidays in Finland are defined by the provider class + * Tests if all official holidays in Finland are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -43,7 +43,7 @@ public function testNationalHolidays() 'independenceDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Finland/GoodFridayTest.php b/tests/Finland/GoodFridayTest.php index e28c711aa..535d65420 100644 --- a/tests/Finland/GoodFridayTest.php +++ b/tests/Finland/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/IndependenceDayTest.php b/tests/Finland/IndependenceDayTest.php index 88e6599f8..bdba73416 100644 --- a/tests/Finland/IndependenceDayTest.php +++ b/tests/Finland/IndependenceDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Finland/InternationalWorkersDayTest.php b/tests/Finland/InternationalWorkersDayTest.php index 0bd6eec43..ccefba6e7 100644 --- a/tests/Finland/InternationalWorkersDayTest.php +++ b/tests/Finland/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Finland/NewYearsDayTest.php b/tests/Finland/NewYearsDayTest.php index b4183ce4f..55f6270ff 100644 --- a/tests/Finland/NewYearsDayTest.php +++ b/tests/Finland/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/PentecostTest.php b/tests/Finland/PentecostTest.php index 33d7b189c..62863cda8 100644 --- a/tests/Finland/PentecostTest.php +++ b/tests/Finland/PentecostTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/SecondChristmasDayTest.php b/tests/Finland/SecondChristmasDayTest.php index e95503072..3ec718c2c 100644 --- a/tests/Finland/SecondChristmasDayTest.php +++ b/tests/Finland/SecondChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Finland/stJohnsDayTest.php b/tests/Finland/stJohnsDayTest.php index 3b985f99e..7407d5826 100644 --- a/tests/Finland/stJohnsDayTest.php +++ b/tests/Finland/stJohnsDayTest.php @@ -92,6 +92,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/AllSaintsDayTest.php b/tests/France/AllSaintsDayTest.php index 4cc23cb65..a609edd1a 100644 --- a/tests/France/AllSaintsDayTest.php +++ b/tests/France/AllSaintsDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/France/ArmisticeDayTest.php b/tests/France/ArmisticeDayTest.php index f43cdf638..6c7b274c6 100644 --- a/tests/France/ArmisticeDayTest.php +++ b/tests/France/ArmisticeDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/France/AscensionDayTest.php b/tests/France/AscensionDayTest.php index dad706e49..f9824d4a8 100644 --- a/tests/France/AscensionDayTest.php +++ b/tests/France/AscensionDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/AssumptionOfMaryTest.php b/tests/France/AssumptionOfMaryTest.php index a1ac39e6e..0358ae96b 100644 --- a/tests/France/AssumptionOfMaryTest.php +++ b/tests/France/AssumptionOfMaryTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/France/BasRhin/BasRhinTest.php b/tests/France/BasRhin/BasRhinTest.php index 37329e3da..897e8d5c2 100644 --- a/tests/France/BasRhin/BasRhinTest.php +++ b/tests/France/BasRhin/BasRhinTest.php @@ -25,9 +25,9 @@ class BasRhinTest extends BasRhinBaseTestCase protected $year; /** - * Tests if all national holidays in Bas-Rhin are defined by the provider class + * Tests if all official holidays in Bas-Rhin are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -43,7 +43,7 @@ public function testNationalHolidays() 'christmasDay', 'stStephensDay', 'bastilleDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/France/BasRhin/GoodFridayTest.php b/tests/France/BasRhin/GoodFridayTest.php index d91ef2e1f..ea28954f9 100644 --- a/tests/France/BasRhin/GoodFridayTest.php +++ b/tests/France/BasRhin/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/BasRhin/stStephensDayTest.php b/tests/France/BasRhin/stStephensDayTest.php index fdfbb1da3..1162796a6 100644 --- a/tests/France/BasRhin/stStephensDayTest.php +++ b/tests/France/BasRhin/stStephensDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/BastilleDayTest.php b/tests/France/BastilleDayTest.php index 13419dfda..b3612937e 100644 --- a/tests/France/BastilleDayTest.php +++ b/tests/France/BastilleDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/France/ChristmasDayTest.php b/tests/France/ChristmasDayTest.php index 53f3c0ec4..7f679187d 100644 --- a/tests/France/ChristmasDayTest.php +++ b/tests/France/ChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/EasterMondayTest.php b/tests/France/EasterMondayTest.php index f177fa8d2..dc662b417 100644 --- a/tests/France/EasterMondayTest.php +++ b/tests/France/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/FranceTest.php b/tests/France/FranceTest.php index 058b0ccee..92e82b97f 100644 --- a/tests/France/FranceTest.php +++ b/tests/France/FranceTest.php @@ -25,9 +25,9 @@ class FranceTest extends FranceBaseTestCase protected $year; /** - * Tests if all national holidays in France are defined by the provider class + * Tests if all official holidays in France are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'armisticeDay', 'christmasDay', 'bastilleDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/France/HautRhin/GoodFridayTest.php b/tests/France/HautRhin/GoodFridayTest.php index 3938420a6..03f13cbcc 100644 --- a/tests/France/HautRhin/GoodFridayTest.php +++ b/tests/France/HautRhin/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/HautRhin/HautRhinTest.php b/tests/France/HautRhin/HautRhinTest.php index 6d6bd8244..49b7bc1f7 100644 --- a/tests/France/HautRhin/HautRhinTest.php +++ b/tests/France/HautRhin/HautRhinTest.php @@ -25,9 +25,9 @@ class HautRhinTest extends HautRhinBaseTestCase protected $year; /** - * Tests if all national holidays in Haut-Rhin are defined by the provider class + * Tests if all official holidays in Haut-Rhin are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -43,7 +43,7 @@ public function testNationalHolidays() 'christmasDay', 'stStephensDay', 'bastilleDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/France/HautRhin/stStephensDayTest.php b/tests/France/HautRhin/stStephensDayTest.php index 307061972..26c6a60a0 100644 --- a/tests/France/HautRhin/stStephensDayTest.php +++ b/tests/France/HautRhin/stStephensDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/InternationalWorkersDayTest.php b/tests/France/InternationalWorkersDayTest.php index 835c9d396..cfb922768 100644 --- a/tests/France/InternationalWorkersDayTest.php +++ b/tests/France/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/France/Moselle/GoodFridayTest.php b/tests/France/Moselle/GoodFridayTest.php index d8d692ea4..5c2a85755 100644 --- a/tests/France/Moselle/GoodFridayTest.php +++ b/tests/France/Moselle/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/Moselle/MoselleTest.php b/tests/France/Moselle/MoselleTest.php index 59cf0e2a2..1f34bed99 100644 --- a/tests/France/Moselle/MoselleTest.php +++ b/tests/France/Moselle/MoselleTest.php @@ -25,9 +25,9 @@ class MoselleTest extends MoselleBaseTestCase protected $year; /** - * Tests if all national holidays in Moselle are defined by the provider class + * Tests if all official holidays in Moselle are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -43,7 +43,7 @@ public function testNationalHolidays() 'christmasDay', 'stStephensDay', 'bastilleDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/France/Moselle/stStephensDayTest.php b/tests/France/Moselle/stStephensDayTest.php index c8f13c33e..3a9994491 100644 --- a/tests/France/Moselle/stStephensDayTest.php +++ b/tests/France/Moselle/stStephensDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/NewYearsDayTest.php b/tests/France/NewYearsDayTest.php index 7d7b7d892..316882ad8 100644 --- a/tests/France/NewYearsDayTest.php +++ b/tests/France/NewYearsDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/France/PentecostMondayTest.php b/tests/France/PentecostMondayTest.php index 030bcf8fe..66246dce4 100644 --- a/tests/France/PentecostMondayTest.php +++ b/tests/France/PentecostMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/France/VictoryInEuropeDayTest.php b/tests/France/VictoryInEuropeDayTest.php index feca48452..c1d18d968 100644 --- a/tests/France/VictoryInEuropeDayTest.php +++ b/tests/France/VictoryInEuropeDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Germany/AscensionDayTest.php b/tests/Germany/AscensionDayTest.php index 0111ab31c..1658690ff 100644 --- a/tests/Germany/AscensionDayTest.php +++ b/tests/Germany/AscensionDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Germany/BadenWurttemberg/BadenWurttembergTest.php b/tests/Germany/BadenWurttemberg/BadenWurttembergTest.php index e36bac5ed..839a8c884 100644 --- a/tests/Germany/BadenWurttemberg/BadenWurttembergTest.php +++ b/tests/Germany/BadenWurttemberg/BadenWurttembergTest.php @@ -25,9 +25,9 @@ class BadenWurttembergTest extends BadenWurttembergBaseTestCase protected $year; /** - * Tests if all national holidays in Baden-Württemberg (Germany) are defined by the provider class + * Tests if all official holidays in Baden-Württemberg (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/Bavaria/BavariaTest.php b/tests/Germany/Bavaria/BavariaTest.php index f0bcd9603..e26cb5e31 100644 --- a/tests/Germany/Bavaria/BavariaTest.php +++ b/tests/Germany/Bavaria/BavariaTest.php @@ -25,9 +25,9 @@ class BavariaTest extends BavariaBaseTestCase protected $year; /** - * Tests if all national holidays in Bavaria (Germany) are defined by the provider class + * Tests if all official holidays in Bavaria (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/Berlin/BerlinTest.php b/tests/Germany/Berlin/BerlinTest.php index 36ce80739..9105b762e 100644 --- a/tests/Germany/Berlin/BerlinTest.php +++ b/tests/Germany/Berlin/BerlinTest.php @@ -25,9 +25,9 @@ class BerlinTest extends BerlinBaseTestCase protected $year; /** - * Tests if all national holidays in Berlin (Germany) are defined by the provider class + * Tests if all official holidays in Berlin (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/Brandenburg/BrandenburgTest.php b/tests/Germany/Brandenburg/BrandenburgTest.php index 5b0b6cea1..de5bbf708 100644 --- a/tests/Germany/Brandenburg/BrandenburgTest.php +++ b/tests/Germany/Brandenburg/BrandenburgTest.php @@ -25,9 +25,9 @@ class BrandenburgTest extends BrandenburgBaseTestCase protected $year; /** - * Tests if all national holidays in Brandenburg (Germany) are defined by the provider class + * Tests if all official holidays in Brandenburg (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $holidays = [ 'newYearsDay', @@ -50,7 +50,7 @@ public function testNationalHolidays() $holidays[] = 'reformationDay'; } - $this->assertDefinedHolidays($holidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($holidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/Brandenburg/ReformationDayTest.php b/tests/Germany/Brandenburg/ReformationDayTest.php index 41a8bf9c6..3426cb3a5 100644 --- a/tests/Germany/Brandenburg/ReformationDayTest.php +++ b/tests/Germany/Brandenburg/ReformationDayTest.php @@ -96,7 +96,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Germany/Bremen/BremenTest.php b/tests/Germany/Bremen/BremenTest.php index 6f1cfa25f..d63481bd4 100644 --- a/tests/Germany/Bremen/BremenTest.php +++ b/tests/Germany/Bremen/BremenTest.php @@ -25,9 +25,9 @@ class BremenTest extends BremenBaseTestCase protected $year; /** - * Tests if all national holidays in Bremen (Germany) are defined by the provider class + * Tests if all official holidays in Bremen (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/ChristmasTest.php b/tests/Germany/ChristmasTest.php index 298be689d..37dd7168f 100644 --- a/tests/Germany/ChristmasTest.php +++ b/tests/Germany/ChristmasTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Germany/EasterMondayTest.php b/tests/Germany/EasterMondayTest.php index 01a35d7b1..1c4b7c726 100644 --- a/tests/Germany/EasterMondayTest.php +++ b/tests/Germany/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Germany/GermanUnityDayTest.php b/tests/Germany/GermanUnityDayTest.php index 7e418a748..31fb6b763 100644 --- a/tests/Germany/GermanUnityDayTest.php +++ b/tests/Germany/GermanUnityDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Germany/GermanyTest.php b/tests/Germany/GermanyTest.php index 1b4c705a5..1cf5c45cd 100644 --- a/tests/Germany/GermanyTest.php +++ b/tests/Germany/GermanyTest.php @@ -25,9 +25,9 @@ class GermanyTest extends GermanyBaseTestCase protected $year; /** - * Tests if all national holidays in Finland are defined by the provider class + * Tests if all official holidays in Finland are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'ascensionDay', @@ -39,7 +39,7 @@ public function testNationalHolidays() 'newYearsDay', 'pentecostMonday', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/GoodFridayTest.php b/tests/Germany/GoodFridayTest.php index 1de79efba..a8f4ee760 100644 --- a/tests/Germany/GoodFridayTest.php +++ b/tests/Germany/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Germany/Hamburg/HamburgTest.php b/tests/Germany/Hamburg/HamburgTest.php index 8d14a2bed..0cb8bc4f1 100644 --- a/tests/Germany/Hamburg/HamburgTest.php +++ b/tests/Germany/Hamburg/HamburgTest.php @@ -25,9 +25,9 @@ class HamburgTest extends HamburgBaseTestCase protected $year; /** - * Tests if all national holidays in Hamburg (Germany) are defined by the provider class + * Tests if all official holidays in Hamburg (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/Hesse/HesseTest.php b/tests/Germany/Hesse/HesseTest.php index 02e449000..68d2e79f5 100644 --- a/tests/Germany/Hesse/HesseTest.php +++ b/tests/Germany/Hesse/HesseTest.php @@ -25,9 +25,9 @@ class HesseTest extends HesseBaseTestCase protected $year; /** - * Tests if all national holidays in Hesse (Germany) are defined by the provider class + * Tests if all official holidays in Hesse (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/InternationalWorkersDayTest.php b/tests/Germany/InternationalWorkersDayTest.php index 120c9876c..177459bba 100644 --- a/tests/Germany/InternationalWorkersDayTest.php +++ b/tests/Germany/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/LowerSaxony/LowerSaxonyTest.php b/tests/Germany/LowerSaxony/LowerSaxonyTest.php index d7d4e3c7b..e40655d6a 100644 --- a/tests/Germany/LowerSaxony/LowerSaxonyTest.php +++ b/tests/Germany/LowerSaxony/LowerSaxonyTest.php @@ -25,9 +25,9 @@ class LowerSaxonyTest extends LowerSaxonyBaseTestCase protected $year; /** - * Tests if all national holidays in Lower Saxony (Germany) are defined by the provider class + * Tests if all official holidays in Lower Saxony (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/MecklenburgWesternPomerania/MecklenburgWesternPomeraniaTest.php b/tests/Germany/MecklenburgWesternPomerania/MecklenburgWesternPomeraniaTest.php index 0e6e85d59..4b87bc769 100644 --- a/tests/Germany/MecklenburgWesternPomerania/MecklenburgWesternPomeraniaTest.php +++ b/tests/Germany/MecklenburgWesternPomerania/MecklenburgWesternPomeraniaTest.php @@ -25,9 +25,9 @@ class MecklenburgWesternPomeraniaTest extends MecklenburgWesternPomeraniaBaseTes protected $year; /** - * Tests if all national holidays in Mecklenburg-Western Pomerania (Germany) are defined by the provider class + * Tests if all official holidays in Mecklenburg-Western Pomerania (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $holidays = [ 'newYearsDay', @@ -50,7 +50,7 @@ public function testNationalHolidays() $holidays[] = 'reformationDay'; } - $this->assertDefinedHolidays($holidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($holidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/MecklenburgWesternPomerania/ReformationDayTest.php b/tests/Germany/MecklenburgWesternPomerania/ReformationDayTest.php index a94601f8b..e40bc6457 100644 --- a/tests/Germany/MecklenburgWesternPomerania/ReformationDayTest.php +++ b/tests/Germany/MecklenburgWesternPomerania/ReformationDayTest.php @@ -83,7 +83,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Germany/NewYearsDayTest.php b/tests/Germany/NewYearsDayTest.php index df1b038e7..20979d66d 100644 --- a/tests/Germany/NewYearsDayTest.php +++ b/tests/Germany/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Germany/NorthRhineWestphalia/NorthRhineWestphaliaTest.php b/tests/Germany/NorthRhineWestphalia/NorthRhineWestphaliaTest.php index d09931573..8ebc17699 100644 --- a/tests/Germany/NorthRhineWestphalia/NorthRhineWestphaliaTest.php +++ b/tests/Germany/NorthRhineWestphalia/NorthRhineWestphaliaTest.php @@ -25,9 +25,9 @@ class NorthRhineWestphaliaTest extends NorthRhineWestphaliaBaseTestCase protected $year; /** - * Tests if all national holidays in North Rhine-Westphalia (Germany) are defined by the provider class + * Tests if all official holidays in North Rhine-Westphalia (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/PentecostMondayTest.php b/tests/Germany/PentecostMondayTest.php index b8b77230a..053cf2c8c 100644 --- a/tests/Germany/PentecostMondayTest.php +++ b/tests/Germany/PentecostMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Germany/ReformationDay2017Test.php b/tests/Germany/ReformationDay2017Test.php index a351d9e62..eda2f653c 100644 --- a/tests/Germany/ReformationDay2017Test.php +++ b/tests/Germany/ReformationDay2017Test.php @@ -87,7 +87,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR, self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Germany/RhinelandPalatinate/RhinelandPalatinateTest.php b/tests/Germany/RhinelandPalatinate/RhinelandPalatinateTest.php index 59dfebf9a..af91b169f 100644 --- a/tests/Germany/RhinelandPalatinate/RhinelandPalatinateTest.php +++ b/tests/Germany/RhinelandPalatinate/RhinelandPalatinateTest.php @@ -25,9 +25,9 @@ class RhinelandPalatinateTest extends RhinelandPalatinateBaseTestCase protected $year; /** - * Tests if all national holidays in Rhineland Palatinate (Germany) are defined by the provider class + * Tests if all official holidays in Rhineland Palatinate (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/Saarland/SaarlandTest.php b/tests/Germany/Saarland/SaarlandTest.php index bca167ae6..ecd6234ec 100644 --- a/tests/Germany/Saarland/SaarlandTest.php +++ b/tests/Germany/Saarland/SaarlandTest.php @@ -25,9 +25,9 @@ class SaarlandTest extends SaarlandBaseTestCase protected $year; /** - * Tests if all national holidays in Saarland (Germany) are defined by the provider class + * Tests if all official holidays in Saarland (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/Saxony/ReformationDayTest.php b/tests/Germany/Saxony/ReformationDayTest.php index f209704de..9407962c7 100644 --- a/tests/Germany/Saxony/ReformationDayTest.php +++ b/tests/Germany/Saxony/ReformationDayTest.php @@ -96,7 +96,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Germany/Saxony/SaxonyTest.php b/tests/Germany/Saxony/SaxonyTest.php index baf270441..fcc69cc8a 100644 --- a/tests/Germany/Saxony/SaxonyTest.php +++ b/tests/Germany/Saxony/SaxonyTest.php @@ -25,9 +25,9 @@ class SaxonyTest extends SaxonyBaseTestCase protected $year; /** - * Tests if all national holidays in Saxony (Germany) are defined by the provider class + * Tests if all official holidays in Saxony (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $holidays = [ 'newYearsDay', @@ -50,7 +50,7 @@ public function testNationalHolidays() $holidays[] = 'reformationDay'; } - $this->assertDefinedHolidays($holidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($holidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/SaxonyAnhalt/ReformationDayTest.php b/tests/Germany/SaxonyAnhalt/ReformationDayTest.php index d5ec6dd31..1bbe60ad8 100644 --- a/tests/Germany/SaxonyAnhalt/ReformationDayTest.php +++ b/tests/Germany/SaxonyAnhalt/ReformationDayTest.php @@ -96,7 +96,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Germany/SaxonyAnhalt/SaxonyAnhaltTest.php b/tests/Germany/SaxonyAnhalt/SaxonyAnhaltTest.php index da017d63b..9a0cc99a3 100644 --- a/tests/Germany/SaxonyAnhalt/SaxonyAnhaltTest.php +++ b/tests/Germany/SaxonyAnhalt/SaxonyAnhaltTest.php @@ -25,9 +25,9 @@ class SaxonyAnhaltTest extends SaxonyAnhaltBaseTestCase protected $year; /** - * Tests if all national holidays in Saxony-Anhalt (Germany) are defined by the provider class + * Tests if all official holidays in Saxony-Anhalt (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $holidays = [ 'newYearsDay', @@ -50,7 +50,7 @@ public function testNationalHolidays() $holidays[] = 'reformationDay'; } - $this->assertDefinedHolidays($holidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($holidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/SchleswigHolstein/SchleswigHolsteinTest.php b/tests/Germany/SchleswigHolstein/SchleswigHolsteinTest.php index 9c7b863de..99e615531 100644 --- a/tests/Germany/SchleswigHolstein/SchleswigHolsteinTest.php +++ b/tests/Germany/SchleswigHolstein/SchleswigHolsteinTest.php @@ -25,9 +25,9 @@ class SchleswigHolsteinTest extends SchleswigHolsteinBaseTestCase protected $year; /** - * Tests if all national holidays in Schleswig-Holstein (Germany) are defined by the provider class + * Tests if all official holidays in Schleswig-Holstein (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'germanUnityDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Germany/SecondChristmasDayTest.php b/tests/Germany/SecondChristmasDayTest.php index 0d73748a0..925eb455e 100644 --- a/tests/Germany/SecondChristmasDayTest.php +++ b/tests/Germany/SecondChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Germany/Thuringia/ReformationDayTest.php b/tests/Germany/Thuringia/ReformationDayTest.php index 3129bdc19..e7c8dc426 100644 --- a/tests/Germany/Thuringia/ReformationDayTest.php +++ b/tests/Germany/Thuringia/ReformationDayTest.php @@ -96,7 +96,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Germany/Thuringia/ThuringiaTest.php b/tests/Germany/Thuringia/ThuringiaTest.php index d89379d35..b88696153 100644 --- a/tests/Germany/Thuringia/ThuringiaTest.php +++ b/tests/Germany/Thuringia/ThuringiaTest.php @@ -25,9 +25,9 @@ class ThuringiaTest extends ThuringiaBaseTestCase protected $year; /** - * Tests if all national holidays in Thuringia (Germany) are defined by the provider class + * Tests if all official holidays in Thuringia (Germany) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $holidays = [ 'newYearsDay', @@ -50,7 +50,7 @@ public function testNationalHolidays() $holidays[] = 'reformationDay'; } - $this->assertDefinedHolidays($holidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($holidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Greece/AnnunciationTest.php b/tests/Greece/AnnunciationTest.php index 5ddb14514..5f95b0e8a 100644 --- a/tests/Greece/AnnunciationTest.php +++ b/tests/Greece/AnnunciationTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Greece/AscensionDayTest.php b/tests/Greece/AscensionDayTest.php index 3eb619381..bc6fab320 100644 --- a/tests/Greece/AscensionDayTest.php +++ b/tests/Greece/AscensionDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Greece/AssumptionOfMaryTest.php b/tests/Greece/AssumptionOfMaryTest.php index 9557fda18..25d1ccdff 100644 --- a/tests/Greece/AssumptionOfMaryTest.php +++ b/tests/Greece/AssumptionOfMaryTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Greece/ChristmasDayTest.php b/tests/Greece/ChristmasDayTest.php index 9618fcd1f..4fc137eec 100644 --- a/tests/Greece/ChristmasDayTest.php +++ b/tests/Greece/ChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Greece/CleanMondayTest.php b/tests/Greece/CleanMondayTest.php index bc909211c..dff5cda17 100644 --- a/tests/Greece/CleanMondayTest.php +++ b/tests/Greece/CleanMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Greece/EasterMondayTest.php b/tests/Greece/EasterMondayTest.php index 41c7520c3..8fbdfdd48 100644 --- a/tests/Greece/EasterMondayTest.php +++ b/tests/Greece/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Greece/EasterTest.php b/tests/Greece/EasterTest.php index e6b9e1910..9afcd293d 100644 --- a/tests/Greece/EasterTest.php +++ b/tests/Greece/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Greece/EpiphanyTest.php b/tests/Greece/EpiphanyTest.php index abf516132..6512d9cc8 100644 --- a/tests/Greece/EpiphanyTest.php +++ b/tests/Greece/EpiphanyTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Greece/GreeceTest.php b/tests/Greece/GreeceTest.php index 8b70c84f2..e03fba3a9 100644 --- a/tests/Greece/GreeceTest.php +++ b/tests/Greece/GreeceTest.php @@ -25,9 +25,9 @@ class GreeceTest extends GreeceBaseTestCase protected $year; /** - * Tests if all national holidays in Greece are defined by the provider class + * Tests if all official holidays in Greece are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -45,7 +45,7 @@ public function testNationalHolidays() 'cleanMonday', 'independenceDay', 'ohiDay', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Greece/IndepencenceDayTest.php b/tests/Greece/IndepencenceDayTest.php index bd4ad1b26..6e5a84726 100644 --- a/tests/Greece/IndepencenceDayTest.php +++ b/tests/Greece/IndepencenceDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Greece/InternationalWorkersDayTest.php b/tests/Greece/InternationalWorkersDayTest.php index 6652a9183..c273bbb2e 100644 --- a/tests/Greece/InternationalWorkersDayTest.php +++ b/tests/Greece/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Greece/NewYearsDayTest.php b/tests/Greece/NewYearsDayTest.php index 6f9d2e907..ded36c86c 100644 --- a/tests/Greece/NewYearsDayTest.php +++ b/tests/Greece/NewYearsDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Greece/OhiDayTest.php b/tests/Greece/OhiDayTest.php index 8f4090ee8..b8da64cdb 100644 --- a/tests/Greece/OhiDayTest.php +++ b/tests/Greece/OhiDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Greece/PentecostMondayTest.php b/tests/Greece/PentecostMondayTest.php index c3714d819..92686de82 100644 --- a/tests/Greece/PentecostMondayTest.php +++ b/tests/Greece/PentecostMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Greece/PentecostTest.php b/tests/Greece/PentecostTest.php index 25b619387..290aa879e 100644 --- a/tests/Greece/PentecostTest.php +++ b/tests/Greece/PentecostTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Greece/goodFridayTest.php b/tests/Greece/goodFridayTest.php index 1ab166210..8df1a0aa0 100644 --- a/tests/Greece/goodFridayTest.php +++ b/tests/Greece/goodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Hungary/AllSaintsDayTest.php b/tests/Hungary/AllSaintsDayTest.php index f37b1be00..4ecddc592 100644 --- a/tests/Hungary/AllSaintsDayTest.php +++ b/tests/Hungary/AllSaintsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Hungary/ChristmasTest.php b/tests/Hungary/ChristmasTest.php index 63ba976ac..210f01c2b 100644 --- a/tests/Hungary/ChristmasTest.php +++ b/tests/Hungary/ChristmasTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Hungary/EasterMondayTest.php b/tests/Hungary/EasterMondayTest.php index ce0c2b346..df0b8a603 100644 --- a/tests/Hungary/EasterMondayTest.php +++ b/tests/Hungary/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Hungary/EasterTest.php b/tests/Hungary/EasterTest.php index 92ab15d84..41c6622d1 100644 --- a/tests/Hungary/EasterTest.php +++ b/tests/Hungary/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Hungary/HungaryTest.php b/tests/Hungary/HungaryTest.php index d47c59708..8ce2ecff3 100644 --- a/tests/Hungary/HungaryTest.php +++ b/tests/Hungary/HungaryTest.php @@ -25,9 +25,9 @@ class HungaryTest extends HungaryBaseTestCase protected $year; /** - * Tests if all national holidays in Hungary are defined by the provider class + * Tests if all official holidays in Hungary are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'memorialDay1848', 'memorialDay1956', 'stateFoundation', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Hungary/InternationalWorkersDayTest.php b/tests/Hungary/InternationalWorkersDayTest.php index 6689d185a..90a9bc084 100644 --- a/tests/Hungary/InternationalWorkersDayTest.php +++ b/tests/Hungary/InternationalWorkersDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Hungary/MemorialDay1848Test.php b/tests/Hungary/MemorialDay1848Test.php index 788209596..2dde2509b 100644 --- a/tests/Hungary/MemorialDay1848Test.php +++ b/tests/Hungary/MemorialDay1848Test.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Hungary/MemorialDay1956Test.php b/tests/Hungary/MemorialDay1956Test.php index 36bdd33c2..1c0ed334d 100644 --- a/tests/Hungary/MemorialDay1956Test.php +++ b/tests/Hungary/MemorialDay1956Test.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Hungary/NewYearsDayTest.php b/tests/Hungary/NewYearsDayTest.php index 64ddafe7c..11832bd93 100644 --- a/tests/Hungary/NewYearsDayTest.php +++ b/tests/Hungary/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Hungary/PentecostMondayTest.php b/tests/Hungary/PentecostMondayTest.php index 0357e4bf4..b82a9b89e 100644 --- a/tests/Hungary/PentecostMondayTest.php +++ b/tests/Hungary/PentecostMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Hungary/SecondChristmasDayTest.php b/tests/Hungary/SecondChristmasDayTest.php index 90cd7ce99..709d5d9bf 100644 --- a/tests/Hungary/SecondChristmasDayTest.php +++ b/tests/Hungary/SecondChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Hungary/StateFoundationDayTest.php b/tests/Hungary/StateFoundationDayTest.php index bcc957bdb..6a57ed171 100644 --- a/tests/Hungary/StateFoundationDayTest.php +++ b/tests/Hungary/StateFoundationDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Ireland/AugustHolidayTest.php b/tests/Ireland/AugustHolidayTest.php index 732dc2fa7..8d45e86f5 100644 --- a/tests/Ireland/AugustHolidayTest.php +++ b/tests/Ireland/AugustHolidayTest.php @@ -89,6 +89,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ireland/ChristmasDayTest.php b/tests/Ireland/ChristmasDayTest.php index da8d342b5..8689317c6 100644 --- a/tests/Ireland/ChristmasDayTest.php +++ b/tests/Ireland/ChristmasDayTest.php @@ -88,6 +88,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ireland/EasterMondayTest.php b/tests/Ireland/EasterMondayTest.php index 531243a1a..885965412 100644 --- a/tests/Ireland/EasterMondayTest.php +++ b/tests/Ireland/EasterMondayTest.php @@ -90,6 +90,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ireland/EasterTest.php b/tests/Ireland/EasterTest.php index 4e249810d..0f427ba3a 100644 --- a/tests/Ireland/EasterTest.php +++ b/tests/Ireland/EasterTest.php @@ -88,6 +88,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ireland/IrelandTest.php b/tests/Ireland/IrelandTest.php index 937c6a461..bc270118f 100644 --- a/tests/Ireland/IrelandTest.php +++ b/tests/Ireland/IrelandTest.php @@ -25,33 +25,33 @@ class IrelandTest extends IrelandBaseTestCase protected $year; /** - * Tests if all national holidays in Ireland are defined by the provider class + * Tests if all official holidays in Ireland are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = ['easter', 'easterMonday', 'augustHoliday', 'christmasDay', 'stStephensDay']; + $officialHolidays = ['easter', 'easterMonday', 'augustHoliday', 'christmasDay', 'stStephensDay']; if ($this->year >= 1974) { - $nationalHolidays[] = 'newYearsDay'; - $nationalHolidays[] = 'juneHoliday'; + $officialHolidays[] = 'newYearsDay'; + $officialHolidays[] = 'juneHoliday'; } if ($this->year >= 1903) { - $nationalHolidays[] = 'stPatricksDay'; + $officialHolidays[] = 'stPatricksDay'; } if ($this->year >= 1994) { - $nationalHolidays[] = 'mayDay'; + $officialHolidays[] = 'mayDay'; } if ($this->year <= 1973) { - $nationalHolidays[] = 'pentecostMonday'; + $officialHolidays[] = 'pentecostMonday'; } if ($this->year >= 1977) { - $nationalHolidays[] = 'octoberHoliday'; + $officialHolidays[] = 'octoberHoliday'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Ireland/JuneHolidayTest.php b/tests/Ireland/JuneHolidayTest.php index a87999e6f..a849a8573 100644 --- a/tests/Ireland/JuneHolidayTest.php +++ b/tests/Ireland/JuneHolidayTest.php @@ -110,7 +110,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Ireland/MayDayTest.php b/tests/Ireland/MayDayTest.php index aff90cc75..112d567b8 100644 --- a/tests/Ireland/MayDayTest.php +++ b/tests/Ireland/MayDayTest.php @@ -111,7 +111,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Ireland/NewYearsDayTest.php b/tests/Ireland/NewYearsDayTest.php index bd6eb913a..425769f09 100644 --- a/tests/Ireland/NewYearsDayTest.php +++ b/tests/Ireland/NewYearsDayTest.php @@ -110,7 +110,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Ireland/OctoberHolidayTest.php b/tests/Ireland/OctoberHolidayTest.php index fdab9b81f..f820fcc20 100644 --- a/tests/Ireland/OctoberHolidayTest.php +++ b/tests/Ireland/OctoberHolidayTest.php @@ -111,7 +111,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Ireland/StPatricksDayTest.php b/tests/Ireland/StPatricksDayTest.php index 93bbcfe45..fed7fe784 100644 --- a/tests/Ireland/StPatricksDayTest.php +++ b/tests/Ireland/StPatricksDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Ireland/StStephensDayTest.php b/tests/Ireland/StStephensDayTest.php index 2a9fc1278..d1ed18d65 100644 --- a/tests/Ireland/StStephensDayTest.php +++ b/tests/Ireland/StStephensDayTest.php @@ -88,6 +88,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ireland/pentecostMondayTest.php b/tests/Ireland/pentecostMondayTest.php index b55cca082..e4529d312 100644 --- a/tests/Ireland/pentecostMondayTest.php +++ b/tests/Ireland/pentecostMondayTest.php @@ -106,7 +106,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(1000, self::ABOLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Italy/AllSaintsDayTest.php b/tests/Italy/AllSaintsDayTest.php index fd1d7408f..a0f8023e8 100644 --- a/tests/Italy/AllSaintsDayTest.php +++ b/tests/Italy/AllSaintsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Italy/AssumptionOfMaryTest.php b/tests/Italy/AssumptionOfMaryTest.php index 91480eaa7..acf510e8a 100644 --- a/tests/Italy/AssumptionOfMaryTest.php +++ b/tests/Italy/AssumptionOfMaryTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Italy/ChristmasTest.php b/tests/Italy/ChristmasTest.php index 17e7a5fc2..2ff191b6f 100644 --- a/tests/Italy/ChristmasTest.php +++ b/tests/Italy/ChristmasTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Italy/EasterMondayTest.php b/tests/Italy/EasterMondayTest.php index 37f491ab1..320dd0dfd 100644 --- a/tests/Italy/EasterMondayTest.php +++ b/tests/Italy/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Italy/EasterTest.php b/tests/Italy/EasterTest.php index 6e59c756e..d7ff134fb 100644 --- a/tests/Italy/EasterTest.php +++ b/tests/Italy/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Italy/EpiphanyTest.php b/tests/Italy/EpiphanyTest.php index 5571db7d6..9c88e6a59 100644 --- a/tests/Italy/EpiphanyTest.php +++ b/tests/Italy/EpiphanyTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Italy/ImmaculateConceptionTest.php b/tests/Italy/ImmaculateConceptionTest.php index eb7c7c2a1..07de46076 100644 --- a/tests/Italy/ImmaculateConceptionTest.php +++ b/tests/Italy/ImmaculateConceptionTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Italy/InternationalWorkersDayTest.php b/tests/Italy/InternationalWorkersDayTest.php index fb70b588c..535e701a5 100644 --- a/tests/Italy/InternationalWorkersDayTest.php +++ b/tests/Italy/InternationalWorkersDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Italy/ItalyTest.php b/tests/Italy/ItalyTest.php index 61efb18d3..a03c54d65 100644 --- a/tests/Italy/ItalyTest.php +++ b/tests/Italy/ItalyTest.php @@ -25,9 +25,9 @@ class ItalyTest extends ItalyBaseTestCase protected $year; /** - * Tests if all national holidays in Italy are defined by the provider class + * Tests if all official holidays in Italy are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'stStephensDay', 'liberationDay', 'republicDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Italy/LiberationDayTest.php b/tests/Italy/LiberationDayTest.php index 592971f8a..b892cc1ac 100644 --- a/tests/Italy/LiberationDayTest.php +++ b/tests/Italy/LiberationDayTest.php @@ -87,7 +87,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Italy/NewYearsDayTest.php b/tests/Italy/NewYearsDayTest.php index 3819e407e..047f336b4 100644 --- a/tests/Italy/NewYearsDayTest.php +++ b/tests/Italy/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Italy/RepublicDayTest.php b/tests/Italy/RepublicDayTest.php index 34f5e6bdb..e9204a35e 100644 --- a/tests/Italy/RepublicDayTest.php +++ b/tests/Italy/RepublicDayTest.php @@ -87,7 +87,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Italy/stStephensDayTest.php b/tests/Italy/stStephensDayTest.php index 0978dadec..78174ea36 100644 --- a/tests/Italy/stStephensDayTest.php +++ b/tests/Italy/stStephensDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Japan/AutumnalEquinoxDayTest.php b/tests/Japan/AutumnalEquinoxDayTest.php index a0c9743bb..2c6d1e115 100644 --- a/tests/Japan/AutumnalEquinoxDayTest.php +++ b/tests/Japan/AutumnalEquinoxDayTest.php @@ -133,7 +133,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR, 2150), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/ChildrensDayTest.php b/tests/Japan/ChildrensDayTest.php index 6f56b82a4..31c753b72 100644 --- a/tests/Japan/ChildrensDayTest.php +++ b/tests/Japan/ChildrensDayTest.php @@ -94,7 +94,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/ComingOfAgeDayTest.php b/tests/Japan/ComingOfAgeDayTest.php index c9a245d4d..dd5804863 100644 --- a/tests/Japan/ComingOfAgeDayTest.php +++ b/tests/Japan/ComingOfAgeDayTest.php @@ -98,7 +98,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/ConstitutionMemorialDayTest.php b/tests/Japan/ConstitutionMemorialDayTest.php index 4536f8546..3196e9701 100644 --- a/tests/Japan/ConstitutionMemorialDayTest.php +++ b/tests/Japan/ConstitutionMemorialDayTest.php @@ -95,7 +95,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/CultureDayTest.php b/tests/Japan/CultureDayTest.php index 297eb74bc..22920ebdc 100644 --- a/tests/Japan/CultureDayTest.php +++ b/tests/Japan/CultureDayTest.php @@ -94,7 +94,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/EmperorsBirthdayTest.php b/tests/Japan/EmperorsBirthdayTest.php index d42145cdf..90699c1d4 100644 --- a/tests/Japan/EmperorsBirthdayTest.php +++ b/tests/Japan/EmperorsBirthdayTest.php @@ -99,7 +99,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/GreeneryDayTest.php b/tests/Japan/GreeneryDayTest.php index 14f030269..9ef94209b 100644 --- a/tests/Japan/GreeneryDayTest.php +++ b/tests/Japan/GreeneryDayTest.php @@ -125,7 +125,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/HealthAndSportsDayTest.php b/tests/Japan/HealthAndSportsDayTest.php index fe0362a56..f02f36eb1 100644 --- a/tests/Japan/HealthAndSportsDayTest.php +++ b/tests/Japan/HealthAndSportsDayTest.php @@ -112,7 +112,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/JapanTest.php b/tests/Japan/JapanTest.php index 22dd9a6dd..9f1fca556 100644 --- a/tests/Japan/JapanTest.php +++ b/tests/Japan/JapanTest.php @@ -25,9 +25,9 @@ class JapanTest extends JapanBaseTestCase protected $year; /** - * Tests if all national holidays in Japan are defined by the provider class + * Tests if all official holidays in Japan are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -47,7 +47,7 @@ public function testNationalHolidays() 'laborThanksgivingDay', 'emperorsBirthday', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Japan/LabourThanksgivingDayTest.php b/tests/Japan/LabourThanksgivingDayTest.php index c9928ad0a..2a9310caa 100644 --- a/tests/Japan/LabourThanksgivingDayTest.php +++ b/tests/Japan/LabourThanksgivingDayTest.php @@ -97,7 +97,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/MarineDayTest.php b/tests/Japan/MarineDayTest.php index a2abb32d1..036bb46e3 100644 --- a/tests/Japan/MarineDayTest.php +++ b/tests/Japan/MarineDayTest.php @@ -111,7 +111,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/MountainDayTest.php b/tests/Japan/MountainDayTest.php index eb60b6c53..2d2f3c719 100644 --- a/tests/Japan/MountainDayTest.php +++ b/tests/Japan/MountainDayTest.php @@ -94,7 +94,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/NationalFoundationDayTest.php b/tests/Japan/NationalFoundationDayTest.php index 1654e03c4..9ad3cd600 100644 --- a/tests/Japan/NationalFoundationDayTest.php +++ b/tests/Japan/NationalFoundationDayTest.php @@ -95,7 +95,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/NewYearsDayTest.php b/tests/Japan/NewYearsDayTest.php index 8c93ac2fd..b1b6e3086 100644 --- a/tests/Japan/NewYearsDayTest.php +++ b/tests/Japan/NewYearsDayTest.php @@ -94,7 +94,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/PublicBridgeDayTest.php b/tests/Japan/PublicBridgeDayTest.php index d8a1c5839..fc9c44c5d 100644 --- a/tests/Japan/PublicBridgeDayTest.php +++ b/tests/Japan/PublicBridgeDayTest.php @@ -58,7 +58,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Japan/RespectForTheAgedDayTest.php b/tests/Japan/RespectForTheAgedDayTest.php index 43e788995..79427f991 100644 --- a/tests/Japan/RespectForTheAgedDayTest.php +++ b/tests/Japan/RespectForTheAgedDayTest.php @@ -112,7 +112,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/ShowaDayTest.php b/tests/Japan/ShowaDayTest.php index fe2f93004..0c7c35414 100644 --- a/tests/Japan/ShowaDayTest.php +++ b/tests/Japan/ShowaDayTest.php @@ -94,7 +94,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Japan/VernalEquinoxDayTest.php b/tests/Japan/VernalEquinoxDayTest.php index df71888a6..1c679371b 100644 --- a/tests/Japan/VernalEquinoxDayTest.php +++ b/tests/Japan/VernalEquinoxDayTest.php @@ -134,7 +134,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR, 2150), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Netherlands/AscensionDayTest.php b/tests/Netherlands/AscensionDayTest.php index 77dd4ed66..ad429dcf6 100644 --- a/tests/Netherlands/AscensionDayTest.php +++ b/tests/Netherlands/AscensionDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Netherlands/ChristmasDayTest.php b/tests/Netherlands/ChristmasDayTest.php index 2e92a15f3..d3223ade4 100644 --- a/tests/Netherlands/ChristmasDayTest.php +++ b/tests/Netherlands/ChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Netherlands/EasterMondayTest.php b/tests/Netherlands/EasterMondayTest.php index cf75b1962..59aca8cf5 100644 --- a/tests/Netherlands/EasterMondayTest.php +++ b/tests/Netherlands/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Netherlands/EasterTest.php b/tests/Netherlands/EasterTest.php index 992a1d785..b78001090 100644 --- a/tests/Netherlands/EasterTest.php +++ b/tests/Netherlands/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Netherlands/KingsDayTest.php b/tests/Netherlands/KingsDayTest.php index 767babfd1..4d2792934 100644 --- a/tests/Netherlands/KingsDayTest.php +++ b/tests/Netherlands/KingsDayTest.php @@ -94,7 +94,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Netherlands/NetherlandsTest.php b/tests/Netherlands/NetherlandsTest.php index 0d9f16416..df826ff19 100644 --- a/tests/Netherlands/NetherlandsTest.php +++ b/tests/Netherlands/NetherlandsTest.php @@ -25,9 +25,9 @@ class NetherlandsTest extends NetherlandsBaseTestCase protected $year; /** - * Tests if all national holidays in Netherlands are defined by the provider class + * Tests if all official holidays in Netherlands are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -39,7 +39,7 @@ public function testNationalHolidays() 'pentecostMonday', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Netherlands/NewYearsDayTest.php b/tests/Netherlands/NewYearsDayTest.php index 89570cfca..0ea7b907b 100644 --- a/tests/Netherlands/NewYearsDayTest.php +++ b/tests/Netherlands/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Netherlands/PentecostTest.php b/tests/Netherlands/PentecostTest.php index e6181fbb7..fd3ad246c 100644 --- a/tests/Netherlands/PentecostTest.php +++ b/tests/Netherlands/PentecostTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Netherlands/QueensDayTest.php b/tests/Netherlands/QueensDayTest.php index aadaec8c1..8eea2a833 100644 --- a/tests/Netherlands/QueensDayTest.php +++ b/tests/Netherlands/QueensDayTest.php @@ -135,7 +135,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(1891, 2013), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Netherlands/pentecostMondayTest.php b/tests/Netherlands/pentecostMondayTest.php index 000f9eabe..97c4bf190 100644 --- a/tests/Netherlands/pentecostMondayTest.php +++ b/tests/Netherlands/pentecostMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Netherlands/secondChristmasdayTest.php b/tests/Netherlands/secondChristmasdayTest.php index d71a56987..bb741dbf0 100644 --- a/tests/Netherlands/secondChristmasdayTest.php +++ b/tests/Netherlands/secondChristmasdayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/NewZealand/AnzacDayTest.php b/tests/NewZealand/AnzacDayTest.php index f2ae3eb24..5f321b442 100644 --- a/tests/NewZealand/AnzacDayTest.php +++ b/tests/NewZealand/AnzacDayTest.php @@ -104,7 +104,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/NewZealand/BoxingDayTest.php b/tests/NewZealand/BoxingDayTest.php index 02963c8b6..c7b464d73 100644 --- a/tests/NewZealand/BoxingDayTest.php +++ b/tests/NewZealand/BoxingDayTest.php @@ -87,6 +87,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/NewZealand/ChristmasDayTest.php b/tests/NewZealand/ChristmasDayTest.php index 1b52a3a79..843dce6e3 100644 --- a/tests/NewZealand/ChristmasDayTest.php +++ b/tests/NewZealand/ChristmasDayTest.php @@ -87,6 +87,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/NewZealand/DayAfterNewYearsDayTest.php b/tests/NewZealand/DayAfterNewYearsDayTest.php index 8fc6a8f8c..7a030c016 100644 --- a/tests/NewZealand/DayAfterNewYearsDayTest.php +++ b/tests/NewZealand/DayAfterNewYearsDayTest.php @@ -64,7 +64,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/NewZealand/EasterMondayTest.php b/tests/NewZealand/EasterMondayTest.php index 9eb8f16d0..39866a5f8 100644 --- a/tests/NewZealand/EasterMondayTest.php +++ b/tests/NewZealand/EasterMondayTest.php @@ -84,6 +84,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/NewZealand/GoodFridayTest.php b/tests/NewZealand/GoodFridayTest.php index c0220d29e..3e82b4552 100644 --- a/tests/NewZealand/GoodFridayTest.php +++ b/tests/NewZealand/GoodFridayTest.php @@ -83,6 +83,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/NewZealand/LabourDayTest.php b/tests/NewZealand/LabourDayTest.php index 6551912cb..b79132ef6 100644 --- a/tests/NewZealand/LabourDayTest.php +++ b/tests/NewZealand/LabourDayTest.php @@ -102,7 +102,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/NewZealand/NewYearsDayTest.php b/tests/NewZealand/NewYearsDayTest.php index 09b7906f8..5895970b1 100644 --- a/tests/NewZealand/NewYearsDayTest.php +++ b/tests/NewZealand/NewYearsDayTest.php @@ -92,6 +92,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/NewZealand/NewZealandTest.php b/tests/NewZealand/NewZealandTest.php index 936c2b5f6..ec4c4d8fa 100644 --- a/tests/NewZealand/NewZealandTest.php +++ b/tests/NewZealand/NewZealandTest.php @@ -25,9 +25,9 @@ class NewZealandTest extends NewZealandBaseTestCase protected $year; /** - * Tests if all national holidays in New Zealand are defined by the provider class + * Tests if all official holidays in New Zealand are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -39,7 +39,7 @@ public function testNationalHolidays() 'anzacDay', 'queensBirthday', 'labourDay', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/NewZealand/QueensBirthdayTest.php b/tests/NewZealand/QueensBirthdayTest.php index 472fc2b9b..c7e3263bc 100644 --- a/tests/NewZealand/QueensBirthdayTest.php +++ b/tests/NewZealand/QueensBirthdayTest.php @@ -93,7 +93,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/NewZealand/WaitangiDayTest.php b/tests/NewZealand/WaitangiDayTest.php index 7c811f20d..043d7cde0 100644 --- a/tests/NewZealand/WaitangiDayTest.php +++ b/tests/NewZealand/WaitangiDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } diff --git a/tests/Norway/AscensionDayTest.php b/tests/Norway/AscensionDayTest.php index a0ebf8e5c..1b26fed42 100644 --- a/tests/Norway/AscensionDayTest.php +++ b/tests/Norway/AscensionDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Norway/ChristmasDayTest.php b/tests/Norway/ChristmasDayTest.php index dc30a157a..baa0f9b8b 100644 --- a/tests/Norway/ChristmasDayTest.php +++ b/tests/Norway/ChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Norway/ConstitutionDayTest.php b/tests/Norway/ConstitutionDayTest.php index 70fa9274c..0b6e05a76 100644 --- a/tests/Norway/ConstitutionDayTest.php +++ b/tests/Norway/ConstitutionDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Norway/EasterMondayTest.php b/tests/Norway/EasterMondayTest.php index 8b3071ea0..c0f97231f 100644 --- a/tests/Norway/EasterMondayTest.php +++ b/tests/Norway/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Norway/EasterTest.php b/tests/Norway/EasterTest.php index 380c42e2a..707fbe74a 100644 --- a/tests/Norway/EasterTest.php +++ b/tests/Norway/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Norway/GoodFridayTest.php b/tests/Norway/GoodFridayTest.php index 7234e09fc..e407203c0 100644 --- a/tests/Norway/GoodFridayTest.php +++ b/tests/Norway/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Norway/InternationalWorkersDayTest.php b/tests/Norway/InternationalWorkersDayTest.php index 562630a1e..662628578 100644 --- a/tests/Norway/InternationalWorkersDayTest.php +++ b/tests/Norway/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Norway/MaundyThursdayTest.php b/tests/Norway/MaundyThursdayTest.php index d49f43a65..1c4250f79 100644 --- a/tests/Norway/MaundyThursdayTest.php +++ b/tests/Norway/MaundyThursdayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Norway/NewYearsDayTest.php b/tests/Norway/NewYearsDayTest.php index fc022c385..46e2bd764 100644 --- a/tests/Norway/NewYearsDayTest.php +++ b/tests/Norway/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Norway/NorwayTest.php b/tests/Norway/NorwayTest.php index d3a7bf8fa..757eaded5 100644 --- a/tests/Norway/NorwayTest.php +++ b/tests/Norway/NorwayTest.php @@ -25,9 +25,9 @@ class NorwayTest extends NorwayBaseTestCase protected $year; /** - * Tests if all national holidays in Norway are defined by the provider class + * Tests if all official holidays in Norway are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Norway/PentecostMondayTest.php b/tests/Norway/PentecostMondayTest.php index 3de44c7bd..45f2519f6 100644 --- a/tests/Norway/PentecostMondayTest.php +++ b/tests/Norway/PentecostMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Norway/PentecostTest.php b/tests/Norway/PentecostTest.php index 6c83eff42..102b534d1 100644 --- a/tests/Norway/PentecostTest.php +++ b/tests/Norway/PentecostTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Norway/SecondChristmasDayTest.php b/tests/Norway/SecondChristmasDayTest.php index b1bb39fed..a7abb54a2 100644 --- a/tests/Norway/SecondChristmasDayTest.php +++ b/tests/Norway/SecondChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Poland/AllSaintsDayTest.php b/tests/Poland/AllSaintsDayTest.php index 60d8e2462..15adaf2ce 100644 --- a/tests/Poland/AllSaintsDayTest.php +++ b/tests/Poland/AllSaintsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Poland/AssumptionOfMaryTest.php b/tests/Poland/AssumptionOfMaryTest.php index 520b700b0..ee3050521 100644 --- a/tests/Poland/AssumptionOfMaryTest.php +++ b/tests/Poland/AssumptionOfMaryTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Poland/ChristmasTest.php b/tests/Poland/ChristmasTest.php index 88c88a661..5771ed242 100644 --- a/tests/Poland/ChristmasTest.php +++ b/tests/Poland/ChristmasTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Poland/ConstitutionDayTest.php b/tests/Poland/ConstitutionDayTest.php index 7cc1cd21c..a365dbf44 100644 --- a/tests/Poland/ConstitutionDayTest.php +++ b/tests/Poland/ConstitutionDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Poland/EasterMondayTest.php b/tests/Poland/EasterMondayTest.php index 6f3e576f0..301252bf1 100644 --- a/tests/Poland/EasterMondayTest.php +++ b/tests/Poland/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Poland/EasterTest.php b/tests/Poland/EasterTest.php index c08a347ea..0c8744677 100644 --- a/tests/Poland/EasterTest.php +++ b/tests/Poland/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Poland/EpiphanyTest.php b/tests/Poland/EpiphanyTest.php index bac94807d..7e87f8646 100644 --- a/tests/Poland/EpiphanyTest.php +++ b/tests/Poland/EpiphanyTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Poland/IndependenceDayTest.php b/tests/Poland/IndependenceDayTest.php index 09d09ffe8..4e170502a 100644 --- a/tests/Poland/IndependenceDayTest.php +++ b/tests/Poland/IndependenceDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Poland/InternationalWorkersDayTest.php b/tests/Poland/InternationalWorkersDayTest.php index 76ce9036b..7d4c548c7 100644 --- a/tests/Poland/InternationalWorkersDayTest.php +++ b/tests/Poland/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Poland/NewYearsDayTest.php b/tests/Poland/NewYearsDayTest.php index c6e464750..a65f95cdd 100644 --- a/tests/Poland/NewYearsDayTest.php +++ b/tests/Poland/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Poland/PentecostTest.php b/tests/Poland/PentecostTest.php index 38a2714e8..05896f7b3 100644 --- a/tests/Poland/PentecostTest.php +++ b/tests/Poland/PentecostTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Poland/PolandTest.php b/tests/Poland/PolandTest.php index 0e2657909..8e2cdface 100644 --- a/tests/Poland/PolandTest.php +++ b/tests/Poland/PolandTest.php @@ -25,9 +25,9 @@ class PolandTest extends PolandBaseTestCase protected $year; /** - * Tests if all national holidays in Poland are defined by the provider class + * Tests if all official holidays in Poland are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'secondChristmasDay', 'constitutionDay', 'independenceDay', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Poland/SecondChristmasDayTest.php b/tests/Poland/SecondChristmasDayTest.php index 44d699e3e..e3f03ce6a 100644 --- a/tests/Poland/SecondChristmasDayTest.php +++ b/tests/Poland/SecondChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Portugal/AllSaintsDayTest.php b/tests/Portugal/AllSaintsDayTest.php index 0076f87d3..3f060a7ea 100644 --- a/tests/Portugal/AllSaintsDayTest.php +++ b/tests/Portugal/AllSaintsDayTest.php @@ -81,10 +81,10 @@ public function testHolidayType() { // After restoration $year = $this->generateRandomYear(self::HOLIDAY_YEAR_RESTORED); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); // Before abolishment $year = $this->generateRandomYear(1000, self::HOLIDAY_YEAR_ABOLISHED - 1); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Portugal/AssumptionOfMaryTest.php b/tests/Portugal/AssumptionOfMaryTest.php index facb0b6fc..a0fd50e90 100644 --- a/tests/Portugal/AssumptionOfMaryTest.php +++ b/tests/Portugal/AssumptionOfMaryTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Portugal/CarnationRevolutionDayTest.php b/tests/Portugal/CarnationRevolutionDayTest.php index 211966444..1e80b5bfe 100644 --- a/tests/Portugal/CarnationRevolutionDayTest.php +++ b/tests/Portugal/CarnationRevolutionDayTest.php @@ -66,6 +66,6 @@ public function testTranslation() public function testHolidayType() { $year = $this->generateRandomYear(self::ESTABLISHMENT_YEAR); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Portugal/ChristmasTest.php b/tests/Portugal/ChristmasTest.php index c385b133c..b49d285ca 100644 --- a/tests/Portugal/ChristmasTest.php +++ b/tests/Portugal/ChristmasTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Portugal/EasterTest.php b/tests/Portugal/EasterTest.php index 9cc96a2ff..d9cdf2a51 100644 --- a/tests/Portugal/EasterTest.php +++ b/tests/Portugal/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Portugal/GoodFridayTest.php b/tests/Portugal/GoodFridayTest.php index 29741f4b4..0fd51165e 100644 --- a/tests/Portugal/GoodFridayTest.php +++ b/tests/Portugal/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Portugal/ImmaculateConceptionTest.php b/tests/Portugal/ImmaculateConceptionTest.php index 8973fa6cd..a199654f9 100644 --- a/tests/Portugal/ImmaculateConceptionTest.php +++ b/tests/Portugal/ImmaculateConceptionTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Portugal/InternationalWorkersDayTest.php b/tests/Portugal/InternationalWorkersDayTest.php index 93abec23e..527560d5e 100644 --- a/tests/Portugal/InternationalWorkersDayTest.php +++ b/tests/Portugal/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Portugal/NewYearsDayTest.php b/tests/Portugal/NewYearsDayTest.php index f95443a31..d9fb3b75b 100644 --- a/tests/Portugal/NewYearsDayTest.php +++ b/tests/Portugal/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Portugal/PortugalDayTest.php b/tests/Portugal/PortugalDayTest.php index abee7cf82..385a50568 100644 --- a/tests/Portugal/PortugalDayTest.php +++ b/tests/Portugal/PortugalDayTest.php @@ -91,9 +91,9 @@ public function testTranslation() public function testHolidayType() { $year = $this->generateRandomYear(1000, self::ESTABLISHMENT_YEAR_BEFORE); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); $year = $this->generateRandomYear(self::ESTABLISHMENT_YEAR_AFTER); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Portugal/PortugalTest.php b/tests/Portugal/PortugalTest.php index f1e139b90..46e76a5f5 100644 --- a/tests/Portugal/PortugalTest.php +++ b/tests/Portugal/PortugalTest.php @@ -25,9 +25,9 @@ class PortugalTest extends PortugalBaseTestCase protected $year; /** - * Tests if all national holidays in Portugal are defined by the provider class + * Tests if all official holidays in Portugal are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'portugueseRepublic', 'restorationOfIndependence', 'portugalDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Portugal/PortugueseRepublicDayTest.php b/tests/Portugal/PortugueseRepublicDayTest.php index 1333d456a..4fc8c64d6 100644 --- a/tests/Portugal/PortugueseRepublicDayTest.php +++ b/tests/Portugal/PortugueseRepublicDayTest.php @@ -81,7 +81,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Portugal/RestorationOfIndependenceTest.php b/tests/Portugal/RestorationOfIndependenceTest.php index 3ee76b9ce..b6b550b98 100644 --- a/tests/Portugal/RestorationOfIndependenceTest.php +++ b/tests/Portugal/RestorationOfIndependenceTest.php @@ -115,10 +115,10 @@ public function testHolidayType() { // After establishment and before abolishment $year = $this->generateRandomYear(self::ESTABLISHMENT_YEAR, self::HOLIDAY_YEAR_ABOLISHED - 1); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); // After restoration $this->generateRandomYear(self::HOLIDAY_YEAR_RESTORED); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $year, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Romania/AssumptionOfMaryTest.php b/tests/Romania/AssumptionOfMaryTest.php index b908cc331..85f2bdb7e 100644 --- a/tests/Romania/AssumptionOfMaryTest.php +++ b/tests/Romania/AssumptionOfMaryTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Romania/ChildrensDayTest.php b/tests/Romania/ChildrensDayTest.php index f7d8c238d..c8e518a21 100644 --- a/tests/Romania/ChildrensDayTest.php +++ b/tests/Romania/ChildrensDayTest.php @@ -82,6 +82,6 @@ public function testHolidayType() $this->generateRandomYear(self::ESTABLISHMENT_YEAR, 2016), Holiday::TYPE_OBSERVANCE ); - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(2017), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(2017), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Romania/ChristmasDayTest.php b/tests/Romania/ChristmasDayTest.php index f1f384fe3..375d06033 100644 --- a/tests/Romania/ChristmasDayTest.php +++ b/tests/Romania/ChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Romania/DayAfterNewYearsDayTest.php b/tests/Romania/DayAfterNewYearsDayTest.php index be148c436..5cdb4971b 100644 --- a/tests/Romania/DayAfterNewYearsDayTest.php +++ b/tests/Romania/DayAfterNewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Romania/EasterMondayTest.php b/tests/Romania/EasterMondayTest.php index 1a708b8bd..9abbde899 100755 --- a/tests/Romania/EasterMondayTest.php +++ b/tests/Romania/EasterMondayTest.php @@ -60,6 +60,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Romania/EasterTest.php b/tests/Romania/EasterTest.php index e98c4af85..ad26e1d7f 100755 --- a/tests/Romania/EasterTest.php +++ b/tests/Romania/EasterTest.php @@ -60,6 +60,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Romania/InternationalWorkersDayTest.php b/tests/Romania/InternationalWorkersDayTest.php index ba4a5c992..0b383af6f 100755 --- a/tests/Romania/InternationalWorkersDayTest.php +++ b/tests/Romania/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Romania/NationalDayTest.php b/tests/Romania/NationalDayTest.php index 8f5b3c83a..8f9f80ca8 100644 --- a/tests/Romania/NationalDayTest.php +++ b/tests/Romania/NationalDayTest.php @@ -108,7 +108,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Romania/NewYearsDayTest.php b/tests/Romania/NewYearsDayTest.php index d76b19f8c..db0efc2b4 100644 --- a/tests/Romania/NewYearsDayTest.php +++ b/tests/Romania/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Romania/PentecostMondayTest.php b/tests/Romania/PentecostMondayTest.php index 97e3403dd..4fba02340 100644 --- a/tests/Romania/PentecostMondayTest.php +++ b/tests/Romania/PentecostMondayTest.php @@ -81,7 +81,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Romania/PentecostTest.php b/tests/Romania/PentecostTest.php index 7f77ed070..ad4182dfa 100644 --- a/tests/Romania/PentecostTest.php +++ b/tests/Romania/PentecostTest.php @@ -81,7 +81,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Romania/RomaniaTest.php b/tests/Romania/RomaniaTest.php index 2f3fb1d08..ce97b02ae 100755 --- a/tests/Romania/RomaniaTest.php +++ b/tests/Romania/RomaniaTest.php @@ -26,9 +26,9 @@ class RomaniaTest extends RomaniaBaseTestCase protected $year; /** - * Tests if all national holidays in Romania are defined by the provider class + * Tests if all official holidays in Romania are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $national_holidays = [ 'newYearsDay', @@ -50,7 +50,7 @@ public function testNationalHolidays() $national_holidays[] = 'childrensDay'; } - $this->assertDefinedHolidays($national_holidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($national_holidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Romania/SecondChristmasDayTest.php b/tests/Romania/SecondChristmasDayTest.php index 111d48eba..55886b8fe 100644 --- a/tests/Romania/SecondChristmasDayTest.php +++ b/tests/Romania/SecondChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Romania/StAndrewDayTest.php b/tests/Romania/StAndrewDayTest.php index 91a500e89..c74fc56e3 100644 --- a/tests/Romania/StAndrewDayTest.php +++ b/tests/Romania/StAndrewDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Romania/UnitedPrincipalitiesDayTest.php b/tests/Romania/UnitedPrincipalitiesDayTest.php index 3e2e93a09..bd9b1d97e 100644 --- a/tests/Romania/UnitedPrincipalitiesDayTest.php +++ b/tests/Romania/UnitedPrincipalitiesDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Slovakia/NewYearsDayTest.php b/tests/Slovakia/NewYearsDayTest.php index f657a2013..39bef88fa 100644 --- a/tests/Slovakia/NewYearsDayTest.php +++ b/tests/Slovakia/NewYearsDayTest.php @@ -77,6 +77,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Slovakia/SaintsCyrilAndMethodiusDayTest.php b/tests/Slovakia/SaintsCyrilAndMethodiusDayTest.php index f57fee961..2a369c255 100644 --- a/tests/Slovakia/SaintsCyrilAndMethodiusDayTest.php +++ b/tests/Slovakia/SaintsCyrilAndMethodiusDayTest.php @@ -19,7 +19,7 @@ use Yasumi\tests\YasumiTestCaseInterface; /** - * Class for testing a national holiday in Slovakia. + * Class for testing a official holiday in Slovakia. * * * @package Yasumi\tests\Slovakia @@ -77,6 +77,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Slovakia/SlovakConstitutionDayTest.php b/tests/Slovakia/SlovakConstitutionDayTest.php index 3fa6890a4..b597916dd 100644 --- a/tests/Slovakia/SlovakConstitutionDayTest.php +++ b/tests/Slovakia/SlovakConstitutionDayTest.php @@ -19,7 +19,7 @@ use Yasumi\tests\YasumiTestCaseInterface; /** - * Class for testing a national holiday in Slovakia. + * Class for testing an official holiday in Slovakia. * * * @package Yasumi\tests\Slovakia @@ -32,7 +32,6 @@ class SlovakConstitutionDayTest extends SlovakiaBaseTestCase implements YasumiTe */ const HOLIDAY = 'slovakConstitutionDay'; - /** * Tests the holiday defined in this test. * @@ -77,6 +76,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Slovakia/SlovakNationalUprisingDayTest.php b/tests/Slovakia/SlovakNationalUprisingDayTest.php index a9969876b..c3e8a6c08 100644 --- a/tests/Slovakia/SlovakNationalUprisingDayTest.php +++ b/tests/Slovakia/SlovakNationalUprisingDayTest.php @@ -19,7 +19,7 @@ use Yasumi\tests\YasumiTestCaseInterface; /** - * Class for testing a national holiday in Slovakia. + * Class for testing an official holiday in Slovakia. * * * @package Yasumi\tests\Slovakia @@ -77,6 +77,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Slovakia/SlovakiaTest.php b/tests/Slovakia/SlovakiaTest.php index 971164e33..0559b3e3b 100644 --- a/tests/Slovakia/SlovakiaTest.php +++ b/tests/Slovakia/SlovakiaTest.php @@ -32,9 +32,9 @@ class SlovakiaTest extends SlovakiaBaseTestCase /** - * Tests if all national holidays in Slovakia are defined by the provider class + * Tests if all official holidays in Slovakia are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'slovakNationalUprisingDay', 'saintsCyrilAndMethodiusDay', 'struggleForFreedomAndDemocracyDay', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } diff --git a/tests/Slovakia/StruggleForFreedomAndDemocracyDayTest.php b/tests/Slovakia/StruggleForFreedomAndDemocracyDayTest.php index ec9eba72e..8ad09600b 100644 --- a/tests/Slovakia/StruggleForFreedomAndDemocracyDayTest.php +++ b/tests/Slovakia/StruggleForFreedomAndDemocracyDayTest.php @@ -19,7 +19,7 @@ use Yasumi\tests\YasumiTestCaseInterface; /** - * Class for testing a national holiday in Slovakia. + * Class for testing an official holiday in Slovakia. * * * @package Yasumi\tests\Slovakia @@ -77,6 +77,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/SouthAfrica/ChristmasDayTest.php b/tests/SouthAfrica/ChristmasDayTest.php index 3ca102a9d..616ec5dee 100644 --- a/tests/SouthAfrica/ChristmasDayTest.php +++ b/tests/SouthAfrica/ChristmasDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/FamilyDayTest.php b/tests/SouthAfrica/FamilyDayTest.php index 1cb5d6580..36fd069c8 100644 --- a/tests/SouthAfrica/FamilyDayTest.php +++ b/tests/SouthAfrica/FamilyDayTest.php @@ -108,7 +108,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/FreedomDayTest.php b/tests/SouthAfrica/FreedomDayTest.php index 73f47e3ba..a26f438cd 100644 --- a/tests/SouthAfrica/FreedomDayTest.php +++ b/tests/SouthAfrica/FreedomDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/GoodFridayTest.php b/tests/SouthAfrica/GoodFridayTest.php index f1c2943e6..b15dde2c8 100644 --- a/tests/SouthAfrica/GoodFridayTest.php +++ b/tests/SouthAfrica/GoodFridayTest.php @@ -108,7 +108,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/HeritageDayTest.php b/tests/SouthAfrica/HeritageDayTest.php index b34a66042..d7aecdc26 100644 --- a/tests/SouthAfrica/HeritageDayTest.php +++ b/tests/SouthAfrica/HeritageDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/HumanRightsDayTest.php b/tests/SouthAfrica/HumanRightsDayTest.php index f216a181e..da2a24277 100644 --- a/tests/SouthAfrica/HumanRightsDayTest.php +++ b/tests/SouthAfrica/HumanRightsDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/MunicipalElections2016DayTest.php b/tests/SouthAfrica/MunicipalElections2016DayTest.php index 42351278f..cbedad89b 100644 --- a/tests/SouthAfrica/MunicipalElections2016DayTest.php +++ b/tests/SouthAfrica/MunicipalElections2016DayTest.php @@ -91,7 +91,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR, self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/NationalWomensDayTest.php b/tests/SouthAfrica/NationalWomensDayTest.php index e9a16a6f2..a36fdc6e9 100644 --- a/tests/SouthAfrica/NationalWomensDayTest.php +++ b/tests/SouthAfrica/NationalWomensDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/NewYearsDayTest.php b/tests/SouthAfrica/NewYearsDayTest.php index 6d5f2f77d..3cb8fa33c 100644 --- a/tests/SouthAfrica/NewYearsDayTest.php +++ b/tests/SouthAfrica/NewYearsDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/ReconciliationDayTest.php b/tests/SouthAfrica/ReconciliationDayTest.php index d65e69fee..862bbbd14 100644 --- a/tests/SouthAfrica/ReconciliationDayTest.php +++ b/tests/SouthAfrica/ReconciliationDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/SecondChristmasDayTest.php b/tests/SouthAfrica/SecondChristmasDayTest.php index 4c29439d6..33330a436 100644 --- a/tests/SouthAfrica/SecondChristmasDayTest.php +++ b/tests/SouthAfrica/SecondChristmasDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/SouthAfricaTest.php b/tests/SouthAfrica/SouthAfricaTest.php index dcaccb80e..761777cb9 100644 --- a/tests/SouthAfrica/SouthAfricaTest.php +++ b/tests/SouthAfrica/SouthAfricaTest.php @@ -29,11 +29,11 @@ class SouthAfricaTest extends SouthAfricaBaseTestCase protected $year; /** - * Tests if all national holidays in SouthAfrica are defined by the provider class + * Tests if all official holidays in SouthAfrica are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = [ + $officialHolidays = [ 'newYearsDay', 'humanRightsDay', 'goodFriday', @@ -49,11 +49,11 @@ public function testNationalHolidays() ]; if ($this->year === 2016) { - $nationalHolidays[] = '2016MunicipalElectionsDay'; - $nationalHolidays[] = 'substituteDayOfGoodwill'; + $officialHolidays[] = '2016MunicipalElectionsDay'; + $officialHolidays[] = 'substituteDayOfGoodwill'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/SouthAfrica/SubstituteDayOfGoodwillTest.php b/tests/SouthAfrica/SubstituteDayOfGoodwillTest.php index 08fc04828..642150c0e 100644 --- a/tests/SouthAfrica/SubstituteDayOfGoodwillTest.php +++ b/tests/SouthAfrica/SubstituteDayOfGoodwillTest.php @@ -91,7 +91,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR, self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/WorkersDayTest.php b/tests/SouthAfrica/WorkersDayTest.php index cef28cc50..c2dd97ad2 100644 --- a/tests/SouthAfrica/WorkersDayTest.php +++ b/tests/SouthAfrica/WorkersDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/SouthAfrica/YouthDayTest.php b/tests/SouthAfrica/YouthDayTest.php index 43d056fee..1b10c3bb1 100644 --- a/tests/SouthAfrica/YouthDayTest.php +++ b/tests/SouthAfrica/YouthDayTest.php @@ -109,7 +109,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/AllSaintsDayTest.php b/tests/Spain/AllSaintsDayTest.php index b71c2b7be..0174f846e 100644 --- a/tests/Spain/AllSaintsDayTest.php +++ b/tests/Spain/AllSaintsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Spain/Andalusia/AndalusiaDayTest.php b/tests/Spain/Andalusia/AndalusiaDayTest.php index e380922ce..64dfc479c 100644 --- a/tests/Spain/Andalusia/AndalusiaDayTest.php +++ b/tests/Spain/Andalusia/AndalusiaDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/Andalusia/AndalusiaTest.php b/tests/Spain/Andalusia/AndalusiaTest.php index 8ae4fe4e4..00c3c4b71 100644 --- a/tests/Spain/Andalusia/AndalusiaTest.php +++ b/tests/Spain/Andalusia/AndalusiaTest.php @@ -25,9 +25,9 @@ class AndalusiaTest extends AndalusiaBaseTestCase protected $year; /** - * Tests if all national holidays in Andalusia are defined by the provider class + * Tests if all official holidays in Andalusia (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/Aragon/AragonTest.php b/tests/Spain/Aragon/AragonTest.php index a3bd287c3..e6738c176 100644 --- a/tests/Spain/Aragon/AragonTest.php +++ b/tests/Spain/Aragon/AragonTest.php @@ -25,9 +25,9 @@ class AragonTest extends AragonBaseTestCase protected $year; /** - * Tests if all national holidays in Aragon are defined by the provider class + * Tests if all official holidays in Aragon (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/AssumptionOfMaryTest.php b/tests/Spain/AssumptionOfMaryTest.php index 9142da07f..52c37ee1c 100644 --- a/tests/Spain/AssumptionOfMaryTest.php +++ b/tests/Spain/AssumptionOfMaryTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Spain/Asturias/AsturiasDayTest.php b/tests/Spain/Asturias/AsturiasDayTest.php index 70ebb2a64..00420595a 100644 --- a/tests/Spain/Asturias/AsturiasDayTest.php +++ b/tests/Spain/Asturias/AsturiasDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/Asturias/AsturiasTest.php b/tests/Spain/Asturias/AsturiasTest.php index a77110c24..892455069 100644 --- a/tests/Spain/Asturias/AsturiasTest.php +++ b/tests/Spain/Asturias/AsturiasTest.php @@ -25,9 +25,9 @@ class AsturiasTest extends AsturiasBaseTestCase protected $year; /** - * Tests if all national holidays in Asturias are defined by the provider class + * Tests if all official holidays in Asturias (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/BalearicIslands/BalearicIslandsDayTest.php b/tests/Spain/BalearicIslands/BalearicIslandsDayTest.php index 45657c699..6500a7666 100644 --- a/tests/Spain/BalearicIslands/BalearicIslandsDayTest.php +++ b/tests/Spain/BalearicIslands/BalearicIslandsDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/BalearicIslands/BalearicIslandsTest.php b/tests/Spain/BalearicIslands/BalearicIslandsTest.php index 35e7646a3..2e0ec5b1e 100644 --- a/tests/Spain/BalearicIslands/BalearicIslandsTest.php +++ b/tests/Spain/BalearicIslands/BalearicIslandsTest.php @@ -25,9 +25,9 @@ class BalearicIslandsTest extends BalearicIslandsBaseTestCase protected $year; /** - * Tests if all national holidays in the Balearic Islands are defined by the provider class + * Tests if all official holidays in the Balearic Islands (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/BasqueCountry/BasqueCountryDayTest.php b/tests/Spain/BasqueCountry/BasqueCountryDayTest.php index a3955ed77..7627a4b2a 100644 --- a/tests/Spain/BasqueCountry/BasqueCountryDayTest.php +++ b/tests/Spain/BasqueCountry/BasqueCountryDayTest.php @@ -93,7 +93,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR, self::ABOLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/BasqueCountry/BasqueCountryTest.php b/tests/Spain/BasqueCountry/BasqueCountryTest.php index 17a755107..d33852d88 100644 --- a/tests/Spain/BasqueCountry/BasqueCountryTest.php +++ b/tests/Spain/BasqueCountry/BasqueCountryTest.php @@ -25,9 +25,9 @@ class BasqueCountryTest extends BasqueCountryBaseTestCase protected $year; /** - * Tests if all national holidays in Basque Country are defined by the provider class + * Tests if all official holidays in Basque Country (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/CanaryIslands/CanaryIslandsDayTest.php b/tests/Spain/CanaryIslands/CanaryIslandsDayTest.php index b48608cee..9d9f0a27f 100644 --- a/tests/Spain/CanaryIslands/CanaryIslandsDayTest.php +++ b/tests/Spain/CanaryIslands/CanaryIslandsDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/CanaryIslands/CanaryIslandsTest.php b/tests/Spain/CanaryIslands/CanaryIslandsTest.php index 4d9c034e9..49cf1c07d 100644 --- a/tests/Spain/CanaryIslands/CanaryIslandsTest.php +++ b/tests/Spain/CanaryIslands/CanaryIslandsTest.php @@ -25,9 +25,9 @@ class CanaryIslandsTest extends CanaryIslandsBaseTestCase protected $year; /** - * Tests if all national holidays in the Canary Islands are defined by the provider class + * Tests if all official holidays in the Canary Islands (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/Cantabria/CantabriaDayTest.php b/tests/Spain/Cantabria/CantabriaDayTest.php index 2d2ca4192..bc41d337b 100644 --- a/tests/Spain/Cantabria/CantabriaDayTest.php +++ b/tests/Spain/Cantabria/CantabriaDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/Cantabria/CantabriaTest.php b/tests/Spain/Cantabria/CantabriaTest.php index 0a2fef7d7..2eb3e6e90 100644 --- a/tests/Spain/Cantabria/CantabriaTest.php +++ b/tests/Spain/Cantabria/CantabriaTest.php @@ -25,9 +25,9 @@ class CantabriaTest extends CantabriaBaseTestCase protected $year; /** - * Tests if all national holidays in Cantabria are defined by the provider class + * Tests if all official holidays in Cantabria (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/CastileAndLeon/CastileAndLeonDayTest.php b/tests/Spain/CastileAndLeon/CastileAndLeonDayTest.php index 31665a0f9..9558a8b6b 100644 --- a/tests/Spain/CastileAndLeon/CastileAndLeonDayTest.php +++ b/tests/Spain/CastileAndLeon/CastileAndLeonDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/CastileAndLeon/CastileAndLeonTest.php b/tests/Spain/CastileAndLeon/CastileAndLeonTest.php index fe937c5b7..045f46bb3 100644 --- a/tests/Spain/CastileAndLeon/CastileAndLeonTest.php +++ b/tests/Spain/CastileAndLeon/CastileAndLeonTest.php @@ -25,9 +25,9 @@ class CastileAndLeonTest extends CastileAndLeonBaseTestCase protected $year; /** - * Tests if all national holidays in Castile And Leon are defined by the provider class + * Tests if all official holidays in Castile And Leon (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/CastillaLaMancha/CastillaLaManchaDayTest.php b/tests/Spain/CastillaLaMancha/CastillaLaManchaDayTest.php index 53e124314..8cd71aa91 100644 --- a/tests/Spain/CastillaLaMancha/CastillaLaManchaDayTest.php +++ b/tests/Spain/CastillaLaMancha/CastillaLaManchaDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/CastillaLaMancha/CastillaLaManchaTest.php b/tests/Spain/CastillaLaMancha/CastillaLaManchaTest.php index 403ef704e..5f73a5626 100644 --- a/tests/Spain/CastillaLaMancha/CastillaLaManchaTest.php +++ b/tests/Spain/CastillaLaMancha/CastillaLaManchaTest.php @@ -25,9 +25,9 @@ class CastillaLaManchaTest extends CastillaLaManchaBaseTestCase protected $year; /** - * Tests if all national holidays in Castilla-La Mancha are defined by the provider class + * Tests if all official holidays in Castilla-La Mancha (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/Catalonia/CataloniaTest.php b/tests/Spain/Catalonia/CataloniaTest.php index e3d8b51cb..321be7909 100644 --- a/tests/Spain/Catalonia/CataloniaTest.php +++ b/tests/Spain/Catalonia/CataloniaTest.php @@ -25,9 +25,9 @@ class CataloniaTest extends CataloniaBaseTestCase protected $year; /** - * Tests if all national holidays in Catalonia are defined by the provider class + * Tests if all official holidays in Catalonia (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/Catalonia/nationalCataloniaDayTest.php b/tests/Spain/Catalonia/nationalCataloniaDayTest.php index 09a18df2b..4b20012e4 100644 --- a/tests/Spain/Catalonia/nationalCataloniaDayTest.php +++ b/tests/Spain/Catalonia/nationalCataloniaDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/Ceuta/CeutaTest.php b/tests/Spain/Ceuta/CeutaTest.php index 09941732d..2742f1ded 100644 --- a/tests/Spain/Ceuta/CeutaTest.php +++ b/tests/Spain/Ceuta/CeutaTest.php @@ -25,9 +25,9 @@ class CeutaTest extends CeutaBaseTestCase protected $year; /** - * Tests if all national holidays in Ceuta are defined by the provider class + * Tests if all official holidays in Ceuta (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/Ceuta/ceutaDayTest.php b/tests/Spain/Ceuta/ceutaDayTest.php index 3c162ad2b..700573685 100644 --- a/tests/Spain/Ceuta/ceutaDayTest.php +++ b/tests/Spain/Ceuta/ceutaDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/ChristmasTest.php b/tests/Spain/ChristmasTest.php index 7051604ff..161fcaf22 100644 --- a/tests/Spain/ChristmasTest.php +++ b/tests/Spain/ChristmasTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Spain/CommunityOfMadrid/CommunityOfMadridTest.php b/tests/Spain/CommunityOfMadrid/CommunityOfMadridTest.php index e2e35ea33..f7a595600 100644 --- a/tests/Spain/CommunityOfMadrid/CommunityOfMadridTest.php +++ b/tests/Spain/CommunityOfMadrid/CommunityOfMadridTest.php @@ -25,9 +25,9 @@ class CommunityOfMadridTest extends CommunityOfMadridBaseTestCase protected $year; /** - * Tests if all national holidays in the Community of Madrid are defined by the provider class + * Tests if all official holidays in the Community of Madrid (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/CommunityOfMadrid/DosdeMayoUprisingDayTest.php b/tests/Spain/CommunityOfMadrid/DosdeMayoUprisingDayTest.php index d09647bbd..640e11092 100644 --- a/tests/Spain/CommunityOfMadrid/DosdeMayoUprisingDayTest.php +++ b/tests/Spain/CommunityOfMadrid/DosdeMayoUprisingDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Spain/ConstitutionDayTest.php b/tests/Spain/ConstitutionDayTest.php index a5ecf58f0..67d8af9aa 100644 --- a/tests/Spain/ConstitutionDayTest.php +++ b/tests/Spain/ConstitutionDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/EpiphanyTest.php b/tests/Spain/EpiphanyTest.php index d7f38a6f2..27bac2cdf 100644 --- a/tests/Spain/EpiphanyTest.php +++ b/tests/Spain/EpiphanyTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Spain/Extremadura/ExtremaduraDayTest.php b/tests/Spain/Extremadura/ExtremaduraDayTest.php index b5a80aa81..63be1cbc5 100644 --- a/tests/Spain/Extremadura/ExtremaduraDayTest.php +++ b/tests/Spain/Extremadura/ExtremaduraDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/Extremadura/ExtremaduraTest.php b/tests/Spain/Extremadura/ExtremaduraTest.php index 78cf68305..35661e83d 100644 --- a/tests/Spain/Extremadura/ExtremaduraTest.php +++ b/tests/Spain/Extremadura/ExtremaduraTest.php @@ -25,9 +25,9 @@ class ExtremaduraTest extends ExtremaduraBaseTestCase protected $year; /** - * Tests if all national holidays in Extremadura are defined by the provider class + * Tests if all official holidays in Extremadura (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/Galicia/GaliciaTest.php b/tests/Spain/Galicia/GaliciaTest.php index d12b76dc0..69f665373 100644 --- a/tests/Spain/Galicia/GaliciaTest.php +++ b/tests/Spain/Galicia/GaliciaTest.php @@ -25,9 +25,9 @@ class GaliciaTest extends GaliciaBaseTestCase protected $year; /** - * Tests if all national holidays in Galicia are defined by the provider class + * Tests if all official holidays in Galicia (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -43,7 +43,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/Galicia/GalicianLiteratureDayTest.php b/tests/Spain/Galicia/GalicianLiteratureDayTest.php index 03cb11613..f0f5cace4 100644 --- a/tests/Spain/Galicia/GalicianLiteratureDayTest.php +++ b/tests/Spain/Galicia/GalicianLiteratureDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/Galicia/stJamesDayTest.php b/tests/Spain/Galicia/stJamesDayTest.php index 941110350..ceb68633e 100644 --- a/tests/Spain/Galicia/stJamesDayTest.php +++ b/tests/Spain/Galicia/stJamesDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/GoodFridayTest.php b/tests/Spain/GoodFridayTest.php index 9cfbf4379..2021dc80f 100644 --- a/tests/Spain/GoodFridayTest.php +++ b/tests/Spain/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Spain/ImmaculateConceptionTest.php b/tests/Spain/ImmaculateConceptionTest.php index 7fe7ae8bc..b7698ca84 100644 --- a/tests/Spain/ImmaculateConceptionTest.php +++ b/tests/Spain/ImmaculateConceptionTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Spain/InternationalWorkersDayTest.php b/tests/Spain/InternationalWorkersDayTest.php index b52ff32f9..01209a944 100644 --- a/tests/Spain/InternationalWorkersDayTest.php +++ b/tests/Spain/InternationalWorkersDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Spain/LaRioja/LaRiojaDayTest.php b/tests/Spain/LaRioja/LaRiojaDayTest.php index b798085a5..b0da1fef1 100644 --- a/tests/Spain/LaRioja/LaRiojaDayTest.php +++ b/tests/Spain/LaRioja/LaRiojaDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/LaRioja/LaRiojaTest.php b/tests/Spain/LaRioja/LaRiojaTest.php index 35f43a457..a88fe45fc 100644 --- a/tests/Spain/LaRioja/LaRiojaTest.php +++ b/tests/Spain/LaRioja/LaRiojaTest.php @@ -25,9 +25,9 @@ class LaRiojaTest extends LaRiojaBaseTestCase protected $year; /** - * Tests if all national holidays in La Rioja are defined by the provider class + * Tests if all official holidays in La Rioja (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/Melilla/MelillaTest.php b/tests/Spain/Melilla/MelillaTest.php index 36c47e62e..7bc8ee3b9 100644 --- a/tests/Spain/Melilla/MelillaTest.php +++ b/tests/Spain/Melilla/MelillaTest.php @@ -25,9 +25,9 @@ class MelillaTest extends MelillaBaseTestCase protected $year; /** - * Tests if all national holidays in Melilla are defined by the provider class + * Tests if all official holidays in Melilla (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/NationalDayTest.php b/tests/Spain/NationalDayTest.php index 7ad53e93b..3bbcf173a 100644 --- a/tests/Spain/NationalDayTest.php +++ b/tests/Spain/NationalDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/Navarre/NavarreTest.php b/tests/Spain/Navarre/NavarreTest.php index 0178bf813..9fbb63dcf 100644 --- a/tests/Spain/Navarre/NavarreTest.php +++ b/tests/Spain/Navarre/NavarreTest.php @@ -25,9 +25,9 @@ class NavarreTest extends NavarreBaseTestCase protected $year; /** - * Tests if all national holidays in Navarre are defined by the provider class + * Tests if all official holidays in Navarre (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -41,7 +41,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/NewYearsDayTest.php b/tests/Spain/NewYearsDayTest.php index 8c79e9468..ef444b350 100644 --- a/tests/Spain/NewYearsDayTest.php +++ b/tests/Spain/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Spain/RegionOfMurcia/RegionOfMurciaDayTest.php b/tests/Spain/RegionOfMurcia/RegionOfMurciaDayTest.php index e4b81dfe6..597cba751 100644 --- a/tests/Spain/RegionOfMurcia/RegionOfMurciaDayTest.php +++ b/tests/Spain/RegionOfMurcia/RegionOfMurciaDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/RegionOfMurcia/RegionOfMurciaTest.php b/tests/Spain/RegionOfMurcia/RegionOfMurciaTest.php index e16749e10..04db2a427 100644 --- a/tests/Spain/RegionOfMurcia/RegionOfMurciaTest.php +++ b/tests/Spain/RegionOfMurcia/RegionOfMurciaTest.php @@ -25,9 +25,9 @@ class RegionOfMurciaTest extends RegionOfMurciaBaseTestCase protected $year; /** - * Tests if all national holidays in the Region of Murcia are defined by the provider class + * Tests if all official holidays in the Region of Murcia (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/SpainTest.php b/tests/Spain/SpainTest.php index 4a7924392..1c0f8abfa 100644 --- a/tests/Spain/SpainTest.php +++ b/tests/Spain/SpainTest.php @@ -25,9 +25,9 @@ class SpainTest extends SpainBaseTestCase protected $year; /** - * Tests if all national holidays in Spain are defined by the provider class + * Tests if all official holidays in Spain are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -40,7 +40,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Spain/ValencianCommunity/ValencianCommunityDayTest.php b/tests/Spain/ValencianCommunity/ValencianCommunityDayTest.php index 559b9dfdc..5d36d8339 100644 --- a/tests/Spain/ValencianCommunity/ValencianCommunityDayTest.php +++ b/tests/Spain/ValencianCommunity/ValencianCommunityDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Spain/ValencianCommunity/ValencianCommunityTest.php b/tests/Spain/ValencianCommunity/ValencianCommunityTest.php index ed0c75e6c..066263b21 100644 --- a/tests/Spain/ValencianCommunity/ValencianCommunityTest.php +++ b/tests/Spain/ValencianCommunity/ValencianCommunityTest.php @@ -25,9 +25,9 @@ class ValencianCommunityTest extends ValencianCommunityBaseTestCase protected $year; /** - * Tests if all national holidays in the Valencian Community are defined by the provider class + * Tests if all official holidays in the Valencian Community (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'immaculateConception', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Sweden/AllSaintsDayTest.php b/tests/Sweden/AllSaintsDayTest.php index 0fa59efc1..dc4c42c3a 100644 --- a/tests/Sweden/AllSaintsDayTest.php +++ b/tests/Sweden/AllSaintsDayTest.php @@ -85,6 +85,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/AscensionDayTest.php b/tests/Sweden/AscensionDayTest.php index e8291fef7..f3eda0e5b 100644 --- a/tests/Sweden/AscensionDayTest.php +++ b/tests/Sweden/AscensionDayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/ChristmasDayTest.php b/tests/Sweden/ChristmasDayTest.php index 20ef75229..6caee8b12 100644 --- a/tests/Sweden/ChristmasDayTest.php +++ b/tests/Sweden/ChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/ChristmasEveTest.php b/tests/Sweden/ChristmasEveTest.php index 49ba7b514..00ad36e46 100644 --- a/tests/Sweden/ChristmasEveTest.php +++ b/tests/Sweden/ChristmasEveTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/EasterMondayTest.php b/tests/Sweden/EasterMondayTest.php index 73b26cac5..16502d9ee 100644 --- a/tests/Sweden/EasterMondayTest.php +++ b/tests/Sweden/EasterMondayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/EasterTest.php b/tests/Sweden/EasterTest.php index 6e2f7b202..a153940be 100644 --- a/tests/Sweden/EasterTest.php +++ b/tests/Sweden/EasterTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/EpiphanyTest.php b/tests/Sweden/EpiphanyTest.php index d8de32350..e77a0a5f6 100644 --- a/tests/Sweden/EpiphanyTest.php +++ b/tests/Sweden/EpiphanyTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/GoodFridayTest.php b/tests/Sweden/GoodFridayTest.php index aa8b9cfdd..085912cde 100644 --- a/tests/Sweden/GoodFridayTest.php +++ b/tests/Sweden/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/InternationalWorkersDayTest.php b/tests/Sweden/InternationalWorkersDayTest.php index 51240d0ca..768a5fa8e 100644 --- a/tests/Sweden/InternationalWorkersDayTest.php +++ b/tests/Sweden/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Sweden/NationalDayTest.php b/tests/Sweden/NationalDayTest.php index cf1f7f9e3..3b773d7a9 100644 --- a/tests/Sweden/NationalDayTest.php +++ b/tests/Sweden/NationalDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } diff --git a/tests/Sweden/NewYearsDayTest.php b/tests/Sweden/NewYearsDayTest.php index 0450c7b03..f034f033a 100644 --- a/tests/Sweden/NewYearsDayTest.php +++ b/tests/Sweden/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/PentecostTest.php b/tests/Sweden/PentecostTest.php index 0989a98ac..ea87328e9 100644 --- a/tests/Sweden/PentecostTest.php +++ b/tests/Sweden/PentecostTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/SecondChristmasDayTest.php b/tests/Sweden/SecondChristmasDayTest.php index 40f756e02..a6d28135d 100644 --- a/tests/Sweden/SecondChristmasDayTest.php +++ b/tests/Sweden/SecondChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Sweden/SwedenTest.php b/tests/Sweden/SwedenTest.php index 2519252f3..c35c88cc2 100644 --- a/tests/Sweden/SwedenTest.php +++ b/tests/Sweden/SwedenTest.php @@ -25,9 +25,9 @@ class SwedenTest extends SwedenBaseTestCase protected $year; /** - * Tests if all national holidays in Sweden are defined by the provider class + * Tests if all official holidays in Sweden (Spain) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -44,7 +44,7 @@ public function testNationalHolidays() 'christmasEve', 'christmasDay', 'secondChristmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Sweden/stJohnsDayTest.php b/tests/Sweden/stJohnsDayTest.php index e5839aff6..bb5e638c3 100644 --- a/tests/Sweden/stJohnsDayTest.php +++ b/tests/Sweden/stJohnsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Switzerland/Aargau/AargauTest.php b/tests/Switzerland/Aargau/AargauTest.php index debf543fc..29705ab5a 100644 --- a/tests/Switzerland/Aargau/AargauTest.php +++ b/tests/Switzerland/Aargau/AargauTest.php @@ -25,19 +25,19 @@ class AargauTest extends AargauBaseTestCase protected $year; /** - * Tests if all national holidays in Aargau are defined by the provider class + * Tests if all official holidays in Aargau (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Aargau are defined by the provider class + * Tests if all official holidays in Aargau (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/AppenzellAusserrhoden/AppenzellAusserrhodenTest.php b/tests/Switzerland/AppenzellAusserrhoden/AppenzellAusserrhodenTest.php index d294fc056..9ba2cac10 100644 --- a/tests/Switzerland/AppenzellAusserrhoden/AppenzellAusserrhodenTest.php +++ b/tests/Switzerland/AppenzellAusserrhoden/AppenzellAusserrhodenTest.php @@ -25,19 +25,19 @@ class AppenzellAusserrhodenTest extends AppenzellAusserrhodenBaseTestCase protected $year; /** - * Tests if all national holidays in Appenzell Ausserrhoden are defined by the provider class + * Tests if all official holidays in Appenzell Ausserrhoden (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Appenzell Ausserrhoden are defined by the provider class + * Tests if all regional holidays in Appenzell Ausserrhoden (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/AppenzellInnerrhoden/AppenzellInnerrhodenTest.php b/tests/Switzerland/AppenzellInnerrhoden/AppenzellInnerrhodenTest.php index 94a2cc4fd..5b0bee8ca 100644 --- a/tests/Switzerland/AppenzellInnerrhoden/AppenzellInnerrhodenTest.php +++ b/tests/Switzerland/AppenzellInnerrhoden/AppenzellInnerrhodenTest.php @@ -25,19 +25,19 @@ class AppenzellInnerrhodenTest extends AppenzellInnerrhodenBaseTestCase protected $year; /** - * Tests if all national holidays in Appenzell Innerrhoden are defined by the provider class + * Tests if all official holidays in Appenzell Innerrhoden (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Appenzell Innerrhoden are defined by the provider class + * Tests if all regional holidays in Appenzell Innerrhoden (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/BaselLandschaft/BaselLandschaftTest.php b/tests/Switzerland/BaselLandschaft/BaselLandschaftTest.php index 65e2800da..a8c2f8a7f 100644 --- a/tests/Switzerland/BaselLandschaft/BaselLandschaftTest.php +++ b/tests/Switzerland/BaselLandschaft/BaselLandschaftTest.php @@ -25,19 +25,19 @@ class BaselLandschaftTest extends BaselLandschaftBaseTestCase protected $year; /** - * Tests if all national holidays in BaselLandschaft are defined by the provider class + * Tests if all official holidays in BaselLandschaft (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in BaselLandschaft are defined by the provider class + * Tests if all regional holidays in BaselLandschaft (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/BaselStadt/BaselStadtTest.php b/tests/Switzerland/BaselStadt/BaselStadtTest.php index f2ae642fa..88de1c71f 100644 --- a/tests/Switzerland/BaselStadt/BaselStadtTest.php +++ b/tests/Switzerland/BaselStadt/BaselStadtTest.php @@ -25,19 +25,19 @@ class BaselStadtTest extends BaselStadtBaseTestCase protected $year; /** - * Tests if all national holidays in Basel Stadt are defined by the provider class + * Tests if all official holidays in Basel Stadt (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Basel Stadt are defined by the provider class + * Tests if all regional holidays in Basel Stadt (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Bern/BernTest.php b/tests/Switzerland/Bern/BernTest.php index 4857927e2..f6366ecb9 100644 --- a/tests/Switzerland/Bern/BernTest.php +++ b/tests/Switzerland/Bern/BernTest.php @@ -25,19 +25,19 @@ class BernTest extends BernBaseTestCase protected $year; /** - * Tests if all national holidays in Bern are defined by the provider class + * Tests if all official holidays in Bern (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Bern are defined by the provider class + * Tests if all regional holidays in Bern (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Fribourg/FribourgTest.php b/tests/Switzerland/Fribourg/FribourgTest.php index e256b141a..36f4f587d 100644 --- a/tests/Switzerland/Fribourg/FribourgTest.php +++ b/tests/Switzerland/Fribourg/FribourgTest.php @@ -25,19 +25,19 @@ class FribourgTest extends FribourgBaseTestCase protected $year; /** - * Tests if all national holidays in Fribourg are defined by the provider class + * Tests if all official holidays in Fribourg (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Fribourg are defined by the provider class + * Tests if all regional holidays in Fribourg (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Geneva/GenevaTest.php b/tests/Switzerland/Geneva/GenevaTest.php index e33138daf..9ecec521c 100644 --- a/tests/Switzerland/Geneva/GenevaTest.php +++ b/tests/Switzerland/Geneva/GenevaTest.php @@ -25,19 +25,19 @@ class GenevaTest extends GenevaBaseTestCase protected $year; /** - * Tests if all national holidays in Geneva are defined by the provider class + * Tests if all official holidays in Geneva (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Geneva are defined by the provider class + * Tests if all regional holidays in Geneva (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Glarus/GlarusTest.php b/tests/Switzerland/Glarus/GlarusTest.php index bf1698e47..9987a321a 100644 --- a/tests/Switzerland/Glarus/GlarusTest.php +++ b/tests/Switzerland/Glarus/GlarusTest.php @@ -25,19 +25,19 @@ class GlarusTest extends GlarusBaseTestCase protected $year; /** - * Tests if all national holidays in Glarus are defined by the provider class + * Tests if all official holidays in Glarus (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Glarus are defined by the provider class + * Tests if all regional holidays in Glarus (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Grisons/GrisonsTest.php b/tests/Switzerland/Grisons/GrisonsTest.php index 18d6ccf54..d6390e1d1 100644 --- a/tests/Switzerland/Grisons/GrisonsTest.php +++ b/tests/Switzerland/Grisons/GrisonsTest.php @@ -25,19 +25,19 @@ class GrisonsTest extends GrisonsBaseTestCase protected $year; /** - * Tests if all national holidays in Grisons are defined by the provider class + * Tests if all official holidays in Grisons (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Grisons are defined by the provider class + * Tests if all regional holidays in Grisons (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Jura/JuraTest.php b/tests/Switzerland/Jura/JuraTest.php index ebadec8f0..5ecf018c2 100644 --- a/tests/Switzerland/Jura/JuraTest.php +++ b/tests/Switzerland/Jura/JuraTest.php @@ -25,19 +25,19 @@ class JuraTest extends JuraBaseTestCase protected $year; /** - * Tests if all national holidays in Jura are defined by the provider class + * Tests if all official holidays in Jura (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Jura are defined by the provider class + * Tests if all regional holidays in Jura (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Lucerne/LucerneTest.php b/tests/Switzerland/Lucerne/LucerneTest.php index f6df07a9e..aae79234a 100644 --- a/tests/Switzerland/Lucerne/LucerneTest.php +++ b/tests/Switzerland/Lucerne/LucerneTest.php @@ -25,19 +25,19 @@ class LucerneTest extends LucerneBaseTestCase protected $year; /** - * Tests if all national holidays in Lucerne are defined by the provider class + * Tests if all official holidays in Lucerne (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Lucerne are defined by the provider class + * Tests if all regional holidays in Lucerne (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Neuchatel/NeuchatelTest.php b/tests/Switzerland/Neuchatel/NeuchatelTest.php index e816a40d9..baee7d6d2 100644 --- a/tests/Switzerland/Neuchatel/NeuchatelTest.php +++ b/tests/Switzerland/Neuchatel/NeuchatelTest.php @@ -25,19 +25,19 @@ class NeuchatelTest extends NeuchatelBaseTestCase protected $year; /** - * Tests if all national holidays in Neuchatel are defined by the provider class + * Tests if all official holidays in Neuchatel (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Neuchatel are defined by the provider class + * Tests if all regional holidays in Neuchatel (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Nidwalden/NidwaldenTest.php b/tests/Switzerland/Nidwalden/NidwaldenTest.php index c2fbc6532..3b866bf95 100644 --- a/tests/Switzerland/Nidwalden/NidwaldenTest.php +++ b/tests/Switzerland/Nidwalden/NidwaldenTest.php @@ -25,19 +25,19 @@ class NidwaldenTest extends NidwaldenBaseTestCase protected $year; /** - * Tests if all national holidays in Nidwalden are defined by the provider class + * Tests if all official holidays in Nidwalden (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Nidwalden are defined by the provider class + * Tests if all regional holidays in Nidwalden (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Obwalden/ObwaldenTest.php b/tests/Switzerland/Obwalden/ObwaldenTest.php index 66596f236..a4ca45fd3 100644 --- a/tests/Switzerland/Obwalden/ObwaldenTest.php +++ b/tests/Switzerland/Obwalden/ObwaldenTest.php @@ -25,19 +25,19 @@ class ObwaldenTest extends ObwaldenBaseTestCase protected $year; /** - * Tests if all national holidays in Obwalden are defined by the provider class + * Tests if all official holidays in Obwalden (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Obwalden are defined by the provider class + * Tests if all regional holidays in Obwalden (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Schaffhausen/SchaffhausenTest.php b/tests/Switzerland/Schaffhausen/SchaffhausenTest.php index 27dae65f2..f893fb293 100644 --- a/tests/Switzerland/Schaffhausen/SchaffhausenTest.php +++ b/tests/Switzerland/Schaffhausen/SchaffhausenTest.php @@ -25,19 +25,19 @@ class SchaffhausenTest extends SchaffhausenBaseTestCase protected $year; /** - * Tests if all national holidays in Schaffhausen are defined by the provider class + * Tests if all official holidays in Schaffhausen (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Schaffhausen are defined by the provider class + * Tests if all regional holidays in Schaffhausen (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Schwyz/SchwyzTest.php b/tests/Switzerland/Schwyz/SchwyzTest.php index 8a005c099..4ff24f227 100644 --- a/tests/Switzerland/Schwyz/SchwyzTest.php +++ b/tests/Switzerland/Schwyz/SchwyzTest.php @@ -25,19 +25,19 @@ class SchwyzTest extends SchwyzBaseTestCase protected $year; /** - * Tests if all national holidays in Schwyz are defined by the provider class + * Tests if all official holidays in Schwyz (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Schwyz are defined by the provider class + * Tests if all regional holidays in Schwyz (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Solothurn/SolothurnTest.php b/tests/Switzerland/Solothurn/SolothurnTest.php index 1740ce503..ff56e59d5 100644 --- a/tests/Switzerland/Solothurn/SolothurnTest.php +++ b/tests/Switzerland/Solothurn/SolothurnTest.php @@ -25,20 +25,20 @@ class SolothurnTest extends SolothurnBaseTestCase protected $year; /** - * Tests if all national holidays in Solothurn are defined by the provider class + * Tests if all official holidays in Solothurn (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Solothurn are defined by the provider class + * Tests if all regional holidays in Solothurn (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/StGallen/StGallenTest.php b/tests/Switzerland/StGallen/StGallenTest.php index 8e6f1c7f6..9495d1a6f 100644 --- a/tests/Switzerland/StGallen/StGallenTest.php +++ b/tests/Switzerland/StGallen/StGallenTest.php @@ -25,19 +25,19 @@ class StGallenTest extends StGallenBaseTestCase protected $year; /** - * Tests if all national holidays in St. Gallen are defined by the provider class + * Tests if all official holidays in St. Gallen (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in St. Gallen are defined by the provider class + * Tests if all regional holidays in St. Gallen (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/SwissNationalDayTest.php b/tests/Switzerland/SwissNationalDayTest.php index 180cd6662..e068ca089 100644 --- a/tests/Switzerland/SwissNationalDayTest.php +++ b/tests/Switzerland/SwissNationalDayTest.php @@ -129,7 +129,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::NATIONAL_ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Switzerland/SwitzerlandTest.php b/tests/Switzerland/SwitzerlandTest.php index 63761127d..b1b6f086c 100644 --- a/tests/Switzerland/SwitzerlandTest.php +++ b/tests/Switzerland/SwitzerlandTest.php @@ -25,15 +25,15 @@ class SwitzerlandTest extends SwitzerlandBaseTestCase protected $year; /** - * Tests if all national holidays in Switzerland are defined by the provider class + * Tests if all official holidays in Switzerland are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Switzerland/Thurgau/ThurgauTest.php b/tests/Switzerland/Thurgau/ThurgauTest.php index 7c185c27a..ca0e7dc82 100644 --- a/tests/Switzerland/Thurgau/ThurgauTest.php +++ b/tests/Switzerland/Thurgau/ThurgauTest.php @@ -25,19 +25,19 @@ class ThurgauTest extends ThurgauBaseTestCase protected $year; /** - * Tests if all national holidays in Thurgau are defined by the provider class + * Tests if all official holidays in Thurgau (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Thurgau are defined by the provider class + * Tests if all regional holidays in Thurgau (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Ticino/TicinoTest.php b/tests/Switzerland/Ticino/TicinoTest.php index 8ce02b623..715430bcf 100644 --- a/tests/Switzerland/Ticino/TicinoTest.php +++ b/tests/Switzerland/Ticino/TicinoTest.php @@ -25,19 +25,19 @@ class TicinoTest extends TicinoBaseTestCase protected $year; /** - * Tests if all national holidays in Ticino are defined by the provider class + * Tests if all official holidays in Ticino (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Ticino are defined by the provider class + * Tests if all regional holidays in Ticino (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Uri/UriTest.php b/tests/Switzerland/Uri/UriTest.php index 6caa8a068..14d5318cd 100644 --- a/tests/Switzerland/Uri/UriTest.php +++ b/tests/Switzerland/Uri/UriTest.php @@ -25,19 +25,19 @@ class UriTest extends UriBaseTestCase protected $year; /** - * Tests if all national holidays in Uri are defined by the provider class + * Tests if all official holidays in Uri (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Uri are defined by the provider class + * Tests if all regional holidays in Uri (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Valais/ValaisTest.php b/tests/Switzerland/Valais/ValaisTest.php index bf84f898d..5a0630a2d 100644 --- a/tests/Switzerland/Valais/ValaisTest.php +++ b/tests/Switzerland/Valais/ValaisTest.php @@ -25,19 +25,19 @@ class ValaisTest extends ValaisBaseTestCase protected $year; /** - * Tests if all national holidays in Valais are defined by the provider class + * Tests if all official holidays in Valais (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Valais are defined by the provider class + * Tests if all regional holidays in Valais (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Vaud/VaudTest.php b/tests/Switzerland/Vaud/VaudTest.php index e27a63b22..ad96c1505 100644 --- a/tests/Switzerland/Vaud/VaudTest.php +++ b/tests/Switzerland/Vaud/VaudTest.php @@ -25,19 +25,19 @@ class VaudTest extends VaudBaseTestCase protected $year; /** - * Tests if all national holidays in Vaud are defined by the provider class + * Tests if all official holidays in Vaud (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Vaud are defined by the provider class + * Tests if all regional holidays in Vaud (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Zug/ZugTest.php b/tests/Switzerland/Zug/ZugTest.php index 4b7bf6e53..ea25e9781 100644 --- a/tests/Switzerland/Zug/ZugTest.php +++ b/tests/Switzerland/Zug/ZugTest.php @@ -25,19 +25,19 @@ class ZugTest extends ZugBaseTestCase protected $year; /** - * Tests if all national holidays in Zug are defined by the provider class + * Tests if all official holidays in Zug (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Zug are defined by the provider class + * Tests if all regional holidays in Zug (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/Switzerland/Zurich/ZurichTest.php b/tests/Switzerland/Zurich/ZurichTest.php index 6d40e46fb..6478076ff 100644 --- a/tests/Switzerland/Zurich/ZurichTest.php +++ b/tests/Switzerland/Zurich/ZurichTest.php @@ -25,19 +25,19 @@ class ZurichTest extends ZurichBaseTestCase protected $year; /** - * Tests if all national holidays in Zurich are defined by the provider class + * Tests if all official holidays in Zurich (Switzerland) are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { - $nationalHolidays = []; + $officialHolidays = []; if ($this->year >= 1994) { - $nationalHolidays[] = 'swissNationalDay'; + $officialHolidays[] = 'swissNationalDay'; } - $this->assertDefinedHolidays($nationalHolidays, self::REGION, $this->year, Holiday::TYPE_NATIONAL); + $this->assertDefinedHolidays($officialHolidays, self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** - * Tests if all national holidays in Zurich are defined by the provider class + * Tests if all regional holidays in Zurich (Switzerland) are defined by the provider class */ public function testRegionalHolidays() { diff --git a/tests/USA/ChristmasDayTest.php b/tests/USA/ChristmasDayTest.php index ae96f1b41..24b2986a5 100644 --- a/tests/USA/ChristmasDayTest.php +++ b/tests/USA/ChristmasDayTest.php @@ -89,6 +89,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/USA/ColumbusDayTest.php b/tests/USA/ColumbusDayTest.php index bef1adfde..204bbf811 100644 --- a/tests/USA/ColumbusDayTest.php +++ b/tests/USA/ColumbusDayTest.php @@ -97,7 +97,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/USA/IndependenceDayTest.php b/tests/USA/IndependenceDayTest.php index 7bac43ec9..9bcd4989c 100644 --- a/tests/USA/IndependenceDayTest.php +++ b/tests/USA/IndependenceDayTest.php @@ -108,7 +108,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/USA/LabourDayTest.php b/tests/USA/LabourDayTest.php index e6ea0cc8f..346f4f26d 100644 --- a/tests/USA/LabourDayTest.php +++ b/tests/USA/LabourDayTest.php @@ -80,7 +80,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/USA/MartinLutherKingDayTest.php b/tests/USA/MartinLutherKingDayTest.php index 5091ac951..e57b5f0aa 100644 --- a/tests/USA/MartinLutherKingDayTest.php +++ b/tests/USA/MartinLutherKingDayTest.php @@ -82,7 +82,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/USA/MemorialDayTest.php b/tests/USA/MemorialDayTest.php index 8be0b0224..89a8bedaf 100644 --- a/tests/USA/MemorialDayTest.php +++ b/tests/USA/MemorialDayTest.php @@ -97,7 +97,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/USA/NewYearsDayTest.php b/tests/USA/NewYearsDayTest.php index 6ce4f61ef..336aa3d99 100644 --- a/tests/USA/NewYearsDayTest.php +++ b/tests/USA/NewYearsDayTest.php @@ -88,6 +88,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/USA/ThanksgivingDayTest.php b/tests/USA/ThanksgivingDayTest.php index 60ea82a1c..86b033083 100644 --- a/tests/USA/ThanksgivingDayTest.php +++ b/tests/USA/ThanksgivingDayTest.php @@ -82,7 +82,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/USA/USATest.php b/tests/USA/USATest.php index 13637fb0e..810f1e187 100644 --- a/tests/USA/USATest.php +++ b/tests/USA/USATest.php @@ -25,9 +25,9 @@ class USATest extends USABaseTestCase protected $year; /** - * Tests if all national holidays in the USA are defined by the provider class + * Tests if all official holidays in the USA are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -40,7 +40,7 @@ public function testNationalHolidays() 'veteransDay', 'thanksgivingDay', 'christmasDay' - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/USA/VeteransDayTest.php b/tests/USA/VeteransDayTest.php index 52563ed81..bb4f3cb72 100644 --- a/tests/USA/VeteransDayTest.php +++ b/tests/USA/VeteransDayTest.php @@ -105,7 +105,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/USA/WashingtonsBirthdayTest.php b/tests/USA/WashingtonsBirthdayTest.php index 72154aff1..fa5776fa1 100644 --- a/tests/USA/WashingtonsBirthdayTest.php +++ b/tests/USA/WashingtonsBirthdayTest.php @@ -97,7 +97,7 @@ public function testHolidayType() self::REGION, self::HOLIDAY, $this->generateRandomYear(self::ESTABLISHMENT_YEAR), - Holiday::TYPE_NATIONAL + Holiday::TYPE_OFFICIAL ); } } diff --git a/tests/Ukraine/ChristmasDayTest.php b/tests/Ukraine/ChristmasDayTest.php index 4c136456c..55e0ca9d1 100644 --- a/tests/Ukraine/ChristmasDayTest.php +++ b/tests/Ukraine/ChristmasDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ukraine/ConstitutionDayTest.php b/tests/Ukraine/ConstitutionDayTest.php index 9cd72d86f..dc904d896 100644 --- a/tests/Ukraine/ConstitutionDayTest.php +++ b/tests/Ukraine/ConstitutionDayTest.php @@ -50,6 +50,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, 2020, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, 2020, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ukraine/DefenderOfUkraineDayTest.php b/tests/Ukraine/DefenderOfUkraineDayTest.php index 5c9d0e4e9..8a5ff9c4f 100644 --- a/tests/Ukraine/DefenderOfUkraineDayTest.php +++ b/tests/Ukraine/DefenderOfUkraineDayTest.php @@ -55,6 +55,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, 2020, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, 2020, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ukraine/EasterTest.php b/tests/Ukraine/EasterTest.php index 99e391361..4abc3ac24 100644 --- a/tests/Ukraine/EasterTest.php +++ b/tests/Ukraine/EasterTest.php @@ -60,6 +60,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ukraine/IndependenceDayTest.php b/tests/Ukraine/IndependenceDayTest.php index 0104ac792..628f8cfca 100644 --- a/tests/Ukraine/IndependenceDayTest.php +++ b/tests/Ukraine/IndependenceDayTest.php @@ -50,6 +50,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, 2020, Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, 2020, Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ukraine/InternationalWomensDayTest.php b/tests/Ukraine/InternationalWomensDayTest.php index 99c7b2fb7..5133b8e7e 100644 --- a/tests/Ukraine/InternationalWomensDayTest.php +++ b/tests/Ukraine/InternationalWomensDayTest.php @@ -65,6 +65,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ukraine/InternationalWorkersDayTest.php b/tests/Ukraine/InternationalWorkersDayTest.php index 2a68247ac..436d7b6c9 100644 --- a/tests/Ukraine/InternationalWorkersDayTest.php +++ b/tests/Ukraine/InternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Ukraine/NewYearsDayTest.php b/tests/Ukraine/NewYearsDayTest.php index 02abe6920..164b83767 100644 --- a/tests/Ukraine/NewYearsDayTest.php +++ b/tests/Ukraine/NewYearsDayTest.php @@ -67,6 +67,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ukraine/PentecostTest.php b/tests/Ukraine/PentecostTest.php index f9aac55c7..8329bb198 100644 --- a/tests/Ukraine/PentecostTest.php +++ b/tests/Ukraine/PentecostTest.php @@ -60,6 +60,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/Ukraine/SecondInternationalWorkersDayTest.php b/tests/Ukraine/SecondInternationalWorkersDayTest.php index a11eda065..f1ab0da79 100644 --- a/tests/Ukraine/SecondInternationalWorkersDayTest.php +++ b/tests/Ukraine/SecondInternationalWorkersDayTest.php @@ -57,7 +57,7 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Ukraine/UkraineTest.php b/tests/Ukraine/UkraineTest.php index d6ab9bb19..e6a36e12c 100644 --- a/tests/Ukraine/UkraineTest.php +++ b/tests/Ukraine/UkraineTest.php @@ -26,9 +26,9 @@ class UkraineTest extends UkraineBaseTestCase protected $year; /** - * Tests if all national holidays in Ukraine are defined by the provider class + * Tests if all official holidays in Ukraine are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'newYearsDay', @@ -42,7 +42,7 @@ public function testNationalHolidays() 'constitutionDay', 'independenceDay', 'defenderOfUkraineDay', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/Ukraine/VictoryDayTest.php b/tests/Ukraine/VictoryDayTest.php index 89756f94d..0775c91b0 100644 --- a/tests/Ukraine/VictoryDayTest.php +++ b/tests/Ukraine/VictoryDayTest.php @@ -65,6 +65,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/UnitedKingdom/ChristmasDayTest.php b/tests/UnitedKingdom/ChristmasDayTest.php index 6d1d91366..ed2f4c5c0 100644 --- a/tests/UnitedKingdom/ChristmasDayTest.php +++ b/tests/UnitedKingdom/ChristmasDayTest.php @@ -85,6 +85,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/UnitedKingdom/GoodFridayTest.php b/tests/UnitedKingdom/GoodFridayTest.php index b9f982999..5cac285e0 100644 --- a/tests/UnitedKingdom/GoodFridayTest.php +++ b/tests/UnitedKingdom/GoodFridayTest.php @@ -59,6 +59,6 @@ public function testTranslation() */ public function testHolidayType() { - $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_NATIONAL); + $this->assertHolidayType(self::REGION, self::HOLIDAY, $this->generateRandomYear(), Holiday::TYPE_OFFICIAL); } } diff --git a/tests/UnitedKingdom/UnitedKingdomTest.php b/tests/UnitedKingdom/UnitedKingdomTest.php index 534054fd3..ac11f72f2 100644 --- a/tests/UnitedKingdom/UnitedKingdomTest.php +++ b/tests/UnitedKingdom/UnitedKingdomTest.php @@ -25,14 +25,14 @@ class UnitedKingdomTest extends UnitedKingdomBaseTestCase protected $year; /** - * Tests if all national holidays in the United Kingdom are defined by the provider class + * Tests if all official holidays in the United Kingdom are defined by the provider class */ - public function testNationalHolidays() + public function testOfficialHolidays() { $this->assertDefinedHolidays([ 'goodFriday', 'christmasDay', - ], self::REGION, $this->year, Holiday::TYPE_NATIONAL); + ], self::REGION, $this->year, Holiday::TYPE_OFFICIAL); } /** diff --git a/tests/YasumiBase.php b/tests/YasumiBase.php index 72ea1e65f..fe5182255 100644 --- a/tests/YasumiBase.php +++ b/tests/YasumiBase.php @@ -38,7 +38,7 @@ trait YasumiBase * @param string $provider the holiday provider (i.e. country/state) for which the holidays need to be * tested * @param int $year holiday calendar year - * @param string $type The type of holiday. Use the following constants: TYPE_NATIONAL, + * @param string $type The type of holiday. Use the following constants: TYPE_OFFICIAL, * TYPE_OBSERVANCE, TYPE_SEASON, TYPE_BANK or TYPE_OTHER. * * @throws \InvalidArgumentException @@ -50,7 +50,7 @@ public function assertDefinedHolidays($expectedHolidays, $provider, $year, $type $holidays = Yasumi::create($provider, $year); switch ($type) { - case Holiday::TYPE_NATIONAL: + case Holiday::TYPE_OFFICIAL: $holidays = new OfficialHolidaysFilter($holidays->getIterator()); break; case Holiday::TYPE_OBSERVANCE: