Skip to content

Commit 862f9b4

Browse files
stelgenhofstelgenhof
committed
Merge branch 'task/cs-fix' into develop
2 parents e7b3392 + d559357 commit 862f9b4

20 files changed

+93
-93
lines changed

‎src/Yasumi/Filters/BetweenFilter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __construct(
5050
\Iterator $iterator,
5151
\DateTimeInterface $startDate,
5252
\DateTimeInterface $endDate,
53-
private bool $equal = true
53+
private bool $equal = true,
5454
) {
5555
parent::__construct($iterator);
5656
$this->startDate = $startDate->format(self::DATE_FORMAT);

‎src/Yasumi/Filters/OnFilter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class OnFilter extends AbstractFilter
4141
*/
4242
public function __construct(
4343
\Iterator $iterator,
44-
\DateTimeInterface $date
44+
\DateTimeInterface $date,
4545
) {
4646
parent::__construct($iterator);
4747
$this->date = $date->format(self::DATE_FORMAT);

‎src/Yasumi/Holiday.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function __construct(
9999
public array $translations,
100100
\DateTimeInterface $date,
101101
string $displayLocale = self::DEFAULT_LOCALE,
102-
protected string $type = self::TYPE_OFFICIAL
102+
protected string $type = self::TYPE_OFFICIAL,
103103
) {
104104
// Validate if key is not empty
105105
if ('' === $key) {

‎src/Yasumi/Provider/AbstractProvider.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ abstract class AbstractProvider implements \Countable, ProviderInterface, \Itera
9797
public function __construct(
9898
int $year,
9999
?string $locale = null,
100-
private ?TranslationsInterface $globalTranslations = null
100+
private ?TranslationsInterface $globalTranslations = null,
101101
) {
102102
$this->clearHolidays();
103103

@@ -217,7 +217,7 @@ public function previous(string $key): ?Holiday
217217
public function between(
218218
\DateTimeInterface $startDate,
219219
\DateTimeInterface $endDate,
220-
?bool $equals = null
220+
?bool $equals = null,
221221
): BetweenFilter {
222222
if ($startDate > $endDate) {
223223
throw new \InvalidArgumentException('Start date must be a date before the end date.');

‎src/Yasumi/Provider/Australia/AustralianCapitalTerritory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ protected function easterSunday(
7575
int $year,
7676
string $timezone,
7777
string $locale,
78-
?string $type = null
78+
?string $type = null,
7979
): Holiday {
8080
return new Holiday(
8181
'easter',
@@ -107,7 +107,7 @@ protected function easterSaturday(
107107
int $year,
108108
string $timezone,
109109
string $locale,
110-
?string $type = null
110+
?string $type = null,
111111
): Holiday {
112112
$date = $this->calculateEaster($year, $timezone)->sub(new \DateInterval('P1D'));
113113

‎src/Yasumi/Provider/Australia/NewSouthWales.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected function easterSaturday(
7474
int $year,
7575
string $timezone,
7676
string $locale,
77-
?string $type = null
77+
?string $type = null,
7878
): Holiday {
7979
$date = $this->calculateEaster($year, $timezone)->sub(new \DateInterval('P1D'));
8080

‎src/Yasumi/Provider/Australia/NorthernTerritory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected function easterSaturday(
7373
int $year,
7474
string $timezone,
7575
string $locale,
76-
?string $type = null
76+
?string $type = null,
7777
): Holiday {
7878
$date = $this->calculateEaster($year, $timezone)->sub(new \DateInterval('P1D'));
7979

‎src/Yasumi/Provider/Australia/SouthAustralia.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected function easterSaturday(
8181
int $year,
8282
string $timezone,
8383
string $locale,
84-
?string $type = null
84+
?string $type = null,
8585
): Holiday {
8686
$date = $this->calculateEaster($year, $timezone)->sub(new \DateInterval('P1D'));
8787

‎src/Yasumi/Provider/Australia/Victoria.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ protected function easterSunday(
7575
int $year,
7676
string $timezone,
7777
string $locale,
78-
?string $type = null
78+
?string $type = null,
7979
): Holiday {
8080
return new Holiday(
8181
'easter',
@@ -107,7 +107,7 @@ protected function easterSaturday(
107107
int $year,
108108
string $timezone,
109109
string $locale,
110-
?string $type = null
110+
?string $type = null,
111111
): Holiday {
112112
$date = $this->calculateEaster($year, $timezone)->sub(new \DateInterval('P1D'));
113113

‎src/Yasumi/Provider/Canada/Quebec.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected function saintJeanBaptisteDay(
7979
int $year,
8080
string $timezone,
8181
string $locale,
82-
string $type = Holiday::TYPE_OFFICIAL
82+
string $type = Holiday::TYPE_OFFICIAL,
8383
): Holiday {
8484
return new Holiday(
8585
'saintJeanBaptisteDay',

‎src/Yasumi/Provider/ChristianHolidays.php

+22-22
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected function corpusChristi(
5050
int $year,
5151
string $timezone,
5252
string $locale,
53-
string $type = Holiday::TYPE_OTHER
53+
string $type = Holiday::TYPE_OTHER,
5454
): Holiday {
5555
return new Holiday(
5656
'corpusChristi',
@@ -85,7 +85,7 @@ protected function allSaintsDay(
8585
int $year,
8686
string $timezone,
8787
string $locale,
88-
string $type = Holiday::TYPE_OFFICIAL
88+
string $type = Holiday::TYPE_OFFICIAL,
8989
): Holiday {
9090
return new Holiday('allSaintsDay', [], new \DateTime("{$year}-11-1", DateTimeZoneFactory::getDateTimeZone($timezone)), $locale, $type);
9191
}
@@ -113,7 +113,7 @@ protected function assumptionOfMary(
113113
int $year,
114114
string $timezone,
115115
string $locale,
116-
string $type = Holiday::TYPE_OFFICIAL
116+
string $type = Holiday::TYPE_OFFICIAL,
117117
): Holiday {
118118
return new Holiday(
119119
'assumptionOfMary',
@@ -145,7 +145,7 @@ protected function goodFriday(
145145
int $year,
146146
string $timezone,
147147
string $locale,
148-
string $type = Holiday::TYPE_OFFICIAL
148+
string $type = Holiday::TYPE_OFFICIAL,
149149
): Holiday {
150150
$holiday = 'goodFriday';
151151
$date = $this->calculateEaster($year, $timezone)->sub(new \DateInterval('P2D'));
@@ -182,7 +182,7 @@ protected function epiphany(
182182
int $year,
183183
string $timezone,
184184
string $locale,
185-
string $type = Holiday::TYPE_OFFICIAL
185+
string $type = Holiday::TYPE_OFFICIAL,
186186
): Holiday {
187187
return new Holiday('epiphany', [], new \DateTime("{$year}-1-6", DateTimeZoneFactory::getDateTimeZone($timezone)), $locale, $type);
188188
}
@@ -212,7 +212,7 @@ protected function stJosephsDay(
212212
int $year,
213213
string $timezone,
214214
string $locale,
215-
string $type = Holiday::TYPE_OFFICIAL
215+
string $type = Holiday::TYPE_OFFICIAL,
216216
): Holiday {
217217
return new Holiday('stJosephsDay', [], new \DateTime("{$year}-3-19", DateTimeZoneFactory::getDateTimeZone($timezone)), $locale, $type);
218218
}
@@ -241,7 +241,7 @@ protected function stGeorgesDay(
241241
int $year,
242242
string $timezone,
243243
string $locale,
244-
string $type = Holiday::TYPE_OFFICIAL
244+
string $type = Holiday::TYPE_OFFICIAL,
245245
): Holiday {
246246
return new Holiday('stGeorgesDay', [], new \DateTime("{$year}-4-23", DateTimeZoneFactory::getDateTimeZone($timezone)), $locale, $type);
247247
}
@@ -301,7 +301,7 @@ protected function reformationDay(
301301
int $year,
302302
string $timezone,
303303
string $locale,
304-
string $type = Holiday::TYPE_OFFICIAL
304+
string $type = Holiday::TYPE_OFFICIAL,
305305
): Holiday {
306306
return new Holiday(
307307
'reformationDay',
@@ -412,7 +412,7 @@ protected function easter(
412412
int $year,
413413
string $timezone,
414414
string $locale,
415-
string $type = Holiday::TYPE_OFFICIAL
415+
string $type = Holiday::TYPE_OFFICIAL,
416416
): Holiday {
417417
return new Holiday('easter', [], $this->calculateEaster($year, $timezone), $locale, $type);
418418
}
@@ -437,7 +437,7 @@ protected function pentecost(
437437
int $year,
438438
string $timezone,
439439
string $locale,
440-
string $type = Holiday::TYPE_OFFICIAL
440+
string $type = Holiday::TYPE_OFFICIAL,
441441
): Holiday {
442442
return new Holiday(
443443
'pentecost',
@@ -471,7 +471,7 @@ protected function easterMonday(
471471
int $year,
472472
string $timezone,
473473
string $locale,
474-
string $type = Holiday::TYPE_OFFICIAL
474+
string $type = Holiday::TYPE_OFFICIAL,
475475
): Holiday {
476476
return new Holiday(
477477
'easterMonday',
@@ -505,7 +505,7 @@ protected function ascensionDay(
505505
int $year,
506506
string $timezone,
507507
string $locale,
508-
string $type = Holiday::TYPE_OFFICIAL
508+
string $type = Holiday::TYPE_OFFICIAL,
509509
): Holiday {
510510
return new Holiday(
511511
'ascensionDay',
@@ -536,7 +536,7 @@ protected function pentecostMonday(
536536
int $year,
537537
string $timezone,
538538
string $locale,
539-
string $type = Holiday::TYPE_OFFICIAL
539+
string $type = Holiday::TYPE_OFFICIAL,
540540
): Holiday {
541541
return new Holiday(
542542
'pentecostMonday',
@@ -571,7 +571,7 @@ protected function christmasEve(
571571
int $year,
572572
string $timezone,
573573
string $locale,
574-
string $type = Holiday::TYPE_OBSERVANCE
574+
string $type = Holiday::TYPE_OBSERVANCE,
575575
): Holiday {
576576
return new Holiday(
577577
'christmasEve',
@@ -603,7 +603,7 @@ protected function christmasDay(
603603
int $year,
604604
string $timezone,
605605
string $locale,
606-
string $type = Holiday::TYPE_OFFICIAL
606+
string $type = Holiday::TYPE_OFFICIAL,
607607
): Holiday {
608608
return new Holiday(
609609
'christmasDay',
@@ -635,7 +635,7 @@ protected function secondChristmasDay(
635635
int $year,
636636
string $timezone,
637637
string $locale,
638-
string $type = Holiday::TYPE_OFFICIAL
638+
string $type = Holiday::TYPE_OFFICIAL,
639639
): Holiday {
640640
return new Holiday(
641641
'secondChristmasDay',
@@ -669,7 +669,7 @@ protected function ashWednesday(
669669
int $year,
670670
string $timezone,
671671
string $locale,
672-
string $type = Holiday::TYPE_OFFICIAL
672+
string $type = Holiday::TYPE_OFFICIAL,
673673
): Holiday {
674674
$holiday = 'ashWednesday';
675675
$date = $this->calculateEaster($year, $timezone)->sub(new \DateInterval('P46D'));
@@ -705,7 +705,7 @@ protected function immaculateConception(
705705
int $year,
706706
string $timezone,
707707
string $locale,
708-
string $type = Holiday::TYPE_OFFICIAL
708+
string $type = Holiday::TYPE_OFFICIAL,
709709
): Holiday {
710710
return new Holiday(
711711
'immaculateConception',
@@ -741,7 +741,7 @@ protected function stStephensDay(
741741
int $year,
742742
string $timezone,
743743
string $locale,
744-
string $type = Holiday::TYPE_OFFICIAL
744+
string $type = Holiday::TYPE_OFFICIAL,
745745
): Holiday {
746746
return new Holiday(
747747
'stStephensDay',
@@ -776,7 +776,7 @@ protected function maundyThursday(
776776
int $year,
777777
string $timezone,
778778
string $locale,
779-
string $type = Holiday::TYPE_OFFICIAL
779+
string $type = Holiday::TYPE_OFFICIAL,
780780
): Holiday {
781781
$holiday = 'maundyThursday';
782782
$date = $this->calculateEaster($year, $timezone)->sub(new \DateInterval('P3D'));
@@ -813,7 +813,7 @@ protected function stJohnsDay(
813813
int $year,
814814
string $timezone,
815815
string $locale,
816-
string $type = Holiday::TYPE_OFFICIAL
816+
string $type = Holiday::TYPE_OFFICIAL,
817817
): Holiday {
818818
return new Holiday('stJohnsDay', [], new \DateTime("{$year}-06-24", DateTimeZoneFactory::getDateTimeZone($timezone)), $locale, $type);
819819
}
@@ -843,7 +843,7 @@ protected function annunciation(
843843
int $year,
844844
string $timezone,
845845
string $locale,
846-
string $type = Holiday::TYPE_OFFICIAL
846+
string $type = Holiday::TYPE_OFFICIAL,
847847
): Holiday {
848848
return new Holiday(
849849
'annunciation',

0 commit comments

Comments
 (0)