@@ -69,12 +69,12 @@ |
||
69 | 69 | $this->day |
70 | 70 | )); |
71 | 71 | |
72 | - /** @var DateTimeImmutable|false $day */ |
|
72 | + /** @var DateTimeImmutable|false $day */ |
|
73 | 73 | $day = $day->modify($this->relation); |
74 | 74 | |
75 | - if ($day === false) { |
|
76 | - return false; |
|
77 | - } |
|
75 | + if ($day === false) { |
|
76 | + return false; |
|
77 | + } |
|
78 | 78 | |
79 | 79 | return $date->format('Y-m-d') === $day->format('Y-m-d'); |
80 | 80 | } |
@@ -20,136 +20,136 @@ |
||
20 | 20 | |
21 | 21 | final class GregorianWeekday |
22 | 22 | { |
23 | - /** @var string */ |
|
24 | - private $value; |
|
23 | + /** @var string */ |
|
24 | + private $value; |
|
25 | 25 | |
26 | - /** @var array<string, GregorianWeekday> */ |
|
27 | - private static $instances = []; |
|
26 | + /** @var array<string, GregorianWeekday> */ |
|
27 | + private static $instances = []; |
|
28 | 28 | |
29 | - private const MONDAY = 'monday'; |
|
30 | - private const TUESDAY = 'tuesday'; |
|
31 | - private const WEDNESDAY = 'wednesday'; |
|
32 | - private const THURSDAY = 'thursday'; |
|
33 | - private const FRIDAY = 'friday'; |
|
34 | - private const SATURDAY = 'saturday'; |
|
35 | - private const SUNDAY = 'sunday'; |
|
29 | + private const MONDAY = 'monday'; |
|
30 | + private const TUESDAY = 'tuesday'; |
|
31 | + private const WEDNESDAY = 'wednesday'; |
|
32 | + private const THURSDAY = 'thursday'; |
|
33 | + private const FRIDAY = 'friday'; |
|
34 | + private const SATURDAY = 'saturday'; |
|
35 | + private const SUNDAY = 'sunday'; |
|
36 | 36 | |
37 | - private function __construct(string $value) |
|
37 | + private function __construct(string $value) |
|
38 | 38 | { |
39 | - $this->value = $value; |
|
40 | - } |
|
41 | - |
|
42 | - public function getValue(): string |
|
43 | - { |
|
44 | - return $this->value; |
|
45 | - } |
|
46 | - |
|
47 | - public static function monday(): self |
|
48 | - { |
|
49 | - if (! isset(self::$instances[self::MONDAY])) { |
|
50 | - self::$instances[self::MONDAY] = new self(self::MONDAY); |
|
51 | - } |
|
52 | - |
|
53 | - return self::$instances[self::MONDAY]; |
|
54 | - } |
|
55 | - |
|
56 | - public static function tuesday(): self |
|
57 | - { |
|
58 | - if (! isset(self::$instances[self::TUESDAY])) { |
|
59 | - self::$instances[self::TUESDAY] = new self(self::TUESDAY); |
|
60 | - } |
|
61 | - |
|
62 | - return self::$instances[self::TUESDAY]; |
|
63 | - } |
|
64 | - |
|
65 | - public static function wednesday(): self |
|
66 | - { |
|
67 | - if (! isset(self::$instances[self::WEDNESDAY])) { |
|
68 | - self::$instances[self::WEDNESDAY] = new self(self::WEDNESDAY); |
|
69 | - } |
|
70 | - |
|
71 | - return self::$instances[self::WEDNESDAY]; |
|
72 | - } |
|
73 | - |
|
74 | - public static function thursday(): self |
|
75 | - { |
|
76 | - if (! isset(self::$instances[self::THURSDAY])) { |
|
77 | - self::$instances[self::THURSDAY] = new self(self::THURSDAY); |
|
78 | - } |
|
79 | - |
|
80 | - return self::$instances[self::THURSDAY]; |
|
81 | - } |
|
82 | - |
|
83 | - public static function friday(): self |
|
84 | - { |
|
85 | - if (! isset(self::$instances[self::FRIDAY])) { |
|
86 | - self::$instances[self::FRIDAY] = new self(self::FRIDAY); |
|
87 | - } |
|
88 | - |
|
89 | - return self::$instances[self::FRIDAY]; |
|
90 | - } |
|
91 | - |
|
92 | - public static function saturday(): self |
|
93 | - { |
|
94 | - if (! isset(self::$instances[self::SATURDAY])) { |
|
95 | - self::$instances[self::SATURDAY] = new self(self::SATURDAY); |
|
96 | - } |
|
97 | - |
|
98 | - return self::$instances[self::SATURDAY]; |
|
99 | - } |
|
100 | - |
|
101 | - public static function sunday(): self |
|
102 | - { |
|
103 | - if (! isset(self::$instances[self::SUNDAY])) { |
|
104 | - self::$instances[self::SUNDAY] = new self(self::SUNDAY); |
|
105 | - } |
|
106 | - |
|
107 | - return self::$instances[self::SUNDAY]; |
|
108 | - } |
|
109 | - |
|
110 | - public static function fromString(string $weekday): self |
|
111 | - { |
|
112 | - if (! method_exists(self::class, strtolower($weekday))) { |
|
113 | - throw new RuntimeException(sprintf( |
|
114 | - 'Weekday "%s" is not known', |
|
115 | - $weekday |
|
116 | - )); |
|
117 | - } |
|
118 | - |
|
119 | - /** @var GregorianWeekday $gregorianWeekday */ |
|
120 | - $gregorianWeekday = [self::class, strtolower($weekday)](); |
|
121 | - |
|
122 | - return $gregorianWeekday; |
|
123 | - } |
|
124 | - |
|
125 | - public static function fromDateTimeInterface(DateTimeInterface $date): self |
|
126 | - { |
|
127 | - return self::fromString($date->format('l')); |
|
128 | - } |
|
129 | - |
|
130 | - public static function fromIntlWeekday(int $weekday): self |
|
131 | - { |
|
132 | - $mapper = [ |
|
133 | - IntlCalendar::DOW_SUNDAY => 'sunday', |
|
134 | - IntlCalendar::DOW_MONDAY => 'monday', |
|
135 | - IntlCalendar::DOW_TUESDAY => 'tuesday', |
|
136 | - IntlCalendar::DOW_WEDNESDAY => 'wednesday', |
|
137 | - IntlCalendar::DOW_THURSDAY => 'thursday', |
|
138 | - IntlCalendar::DOW_FRIDAY => 'friday', |
|
139 | - IntlCalendar::DOW_SATURDAY => 'saturday', |
|
140 | - ]; |
|
141 | - if (! isset($mapper[$weekday])) { |
|
142 | - throw new UnexpectedValueException(sprintf( |
|
143 | - 'IntlCalendar weekday %s could not be resolved', |
|
144 | - $weekday |
|
145 | - )); |
|
146 | - } |
|
147 | - |
|
148 | - return self::fromString($mapper[$weekday]); |
|
149 | - } |
|
150 | - |
|
151 | - public function __toString(): string |
|
152 | - { |
|
153 | - return $this->getValue(); |
|
154 | - } |
|
39 | + $this->value = $value; |
|
40 | + } |
|
41 | + |
|
42 | + public function getValue(): string |
|
43 | + { |
|
44 | + return $this->value; |
|
45 | + } |
|
46 | + |
|
47 | + public static function monday(): self |
|
48 | + { |
|
49 | + if (! isset(self::$instances[self::MONDAY])) { |
|
50 | + self::$instances[self::MONDAY] = new self(self::MONDAY); |
|
51 | + } |
|
52 | + |
|
53 | + return self::$instances[self::MONDAY]; |
|
54 | + } |
|
55 | + |
|
56 | + public static function tuesday(): self |
|
57 | + { |
|
58 | + if (! isset(self::$instances[self::TUESDAY])) { |
|
59 | + self::$instances[self::TUESDAY] = new self(self::TUESDAY); |
|
60 | + } |
|
61 | + |
|
62 | + return self::$instances[self::TUESDAY]; |
|
63 | + } |
|
64 | + |
|
65 | + public static function wednesday(): self |
|
66 | + { |
|
67 | + if (! isset(self::$instances[self::WEDNESDAY])) { |
|
68 | + self::$instances[self::WEDNESDAY] = new self(self::WEDNESDAY); |
|
69 | + } |
|
70 | + |
|
71 | + return self::$instances[self::WEDNESDAY]; |
|
72 | + } |
|
73 | + |
|
74 | + public static function thursday(): self |
|
75 | + { |
|
76 | + if (! isset(self::$instances[self::THURSDAY])) { |
|
77 | + self::$instances[self::THURSDAY] = new self(self::THURSDAY); |
|
78 | + } |
|
79 | + |
|
80 | + return self::$instances[self::THURSDAY]; |
|
81 | + } |
|
82 | + |
|
83 | + public static function friday(): self |
|
84 | + { |
|
85 | + if (! isset(self::$instances[self::FRIDAY])) { |
|
86 | + self::$instances[self::FRIDAY] = new self(self::FRIDAY); |
|
87 | + } |
|
88 | + |
|
89 | + return self::$instances[self::FRIDAY]; |
|
90 | + } |
|
91 | + |
|
92 | + public static function saturday(): self |
|
93 | + { |
|
94 | + if (! isset(self::$instances[self::SATURDAY])) { |
|
95 | + self::$instances[self::SATURDAY] = new self(self::SATURDAY); |
|
96 | + } |
|
97 | + |
|
98 | + return self::$instances[self::SATURDAY]; |
|
99 | + } |
|
100 | + |
|
101 | + public static function sunday(): self |
|
102 | + { |
|
103 | + if (! isset(self::$instances[self::SUNDAY])) { |
|
104 | + self::$instances[self::SUNDAY] = new self(self::SUNDAY); |
|
105 | + } |
|
106 | + |
|
107 | + return self::$instances[self::SUNDAY]; |
|
108 | + } |
|
109 | + |
|
110 | + public static function fromString(string $weekday): self |
|
111 | + { |
|
112 | + if (! method_exists(self::class, strtolower($weekday))) { |
|
113 | + throw new RuntimeException(sprintf( |
|
114 | + 'Weekday "%s" is not known', |
|
115 | + $weekday |
|
116 | + )); |
|
117 | + } |
|
118 | + |
|
119 | + /** @var GregorianWeekday $gregorianWeekday */ |
|
120 | + $gregorianWeekday = [self::class, strtolower($weekday)](); |
|
121 | + |
|
122 | + return $gregorianWeekday; |
|
123 | + } |
|
124 | + |
|
125 | + public static function fromDateTimeInterface(DateTimeInterface $date): self |
|
126 | + { |
|
127 | + return self::fromString($date->format('l')); |
|
128 | + } |
|
129 | + |
|
130 | + public static function fromIntlWeekday(int $weekday): self |
|
131 | + { |
|
132 | + $mapper = [ |
|
133 | + IntlCalendar::DOW_SUNDAY => 'sunday', |
|
134 | + IntlCalendar::DOW_MONDAY => 'monday', |
|
135 | + IntlCalendar::DOW_TUESDAY => 'tuesday', |
|
136 | + IntlCalendar::DOW_WEDNESDAY => 'wednesday', |
|
137 | + IntlCalendar::DOW_THURSDAY => 'thursday', |
|
138 | + IntlCalendar::DOW_FRIDAY => 'friday', |
|
139 | + IntlCalendar::DOW_SATURDAY => 'saturday', |
|
140 | + ]; |
|
141 | + if (! isset($mapper[$weekday])) { |
|
142 | + throw new UnexpectedValueException(sprintf( |
|
143 | + 'IntlCalendar weekday %s could not be resolved', |
|
144 | + $weekday |
|
145 | + )); |
|
146 | + } |
|
147 | + |
|
148 | + return self::fromString($mapper[$weekday]); |
|
149 | + } |
|
150 | + |
|
151 | + public function __toString(): string |
|
152 | + { |
|
153 | + return $this->getValue(); |
|
154 | + } |
|
155 | 155 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | public static function monday(): self |
48 | 48 | { |
49 | - if (! isset(self::$instances[self::MONDAY])) { |
|
49 | + if (!isset(self::$instances[self::MONDAY])) { |
|
50 | 50 | self::$instances[self::MONDAY] = new self(self::MONDAY); |
51 | 51 | } |
52 | 52 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | public static function tuesday(): self |
57 | 57 | { |
58 | - if (! isset(self::$instances[self::TUESDAY])) { |
|
58 | + if (!isset(self::$instances[self::TUESDAY])) { |
|
59 | 59 | self::$instances[self::TUESDAY] = new self(self::TUESDAY); |
60 | 60 | } |
61 | 61 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | public static function wednesday(): self |
66 | 66 | { |
67 | - if (! isset(self::$instances[self::WEDNESDAY])) { |
|
67 | + if (!isset(self::$instances[self::WEDNESDAY])) { |
|
68 | 68 | self::$instances[self::WEDNESDAY] = new self(self::WEDNESDAY); |
69 | 69 | } |
70 | 70 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | |
74 | 74 | public static function thursday(): self |
75 | 75 | { |
76 | - if (! isset(self::$instances[self::THURSDAY])) { |
|
76 | + if (!isset(self::$instances[self::THURSDAY])) { |
|
77 | 77 | self::$instances[self::THURSDAY] = new self(self::THURSDAY); |
78 | 78 | } |
79 | 79 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | public static function friday(): self |
84 | 84 | { |
85 | - if (! isset(self::$instances[self::FRIDAY])) { |
|
85 | + if (!isset(self::$instances[self::FRIDAY])) { |
|
86 | 86 | self::$instances[self::FRIDAY] = new self(self::FRIDAY); |
87 | 87 | } |
88 | 88 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | public static function saturday(): self |
93 | 93 | { |
94 | - if (! isset(self::$instances[self::SATURDAY])) { |
|
94 | + if (!isset(self::$instances[self::SATURDAY])) { |
|
95 | 95 | self::$instances[self::SATURDAY] = new self(self::SATURDAY); |
96 | 96 | } |
97 | 97 | |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | |
101 | 101 | public static function sunday(): self |
102 | 102 | { |
103 | - if (! isset(self::$instances[self::SUNDAY])) { |
|
103 | + if (!isset(self::$instances[self::SUNDAY])) { |
|
104 | 104 | self::$instances[self::SUNDAY] = new self(self::SUNDAY); |
105 | 105 | } |
106 | 106 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | public static function fromString(string $weekday): self |
111 | 111 | { |
112 | - if (! method_exists(self::class, strtolower($weekday))) { |
|
112 | + if (!method_exists(self::class, strtolower($weekday))) { |
|
113 | 113 | throw new RuntimeException(sprintf( |
114 | 114 | 'Weekday "%s" is not known', |
115 | 115 | $weekday |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | IntlCalendar::DOW_FRIDAY => 'friday', |
139 | 139 | IntlCalendar::DOW_SATURDAY => 'saturday', |
140 | 140 | ]; |
141 | - if (! isset($mapper[$weekday])) { |
|
141 | + if (!isset($mapper[$weekday])) { |
|
142 | 142 | throw new UnexpectedValueException(sprintf( |
143 | 143 | 'IntlCalendar weekday %s could not be resolved', |
144 | 144 | $weekday |
@@ -60,12 +60,12 @@ discard block |
||
60 | 60 | { |
61 | 61 | $year = (int) $date->format('Y'); |
62 | 62 | |
63 | - $easter = $this->getEaster($year); |
|
64 | - $day = $this->getOffsetDay($easter, $this->offset); |
|
63 | + $easter = $this->getEaster($year); |
|
64 | + $day = $this->getOffsetDay($easter, $this->offset); |
|
65 | 65 | |
66 | - if (false === $day) { |
|
67 | - return false; |
|
68 | - } |
|
66 | + if (false === $day) { |
|
67 | + return false; |
|
68 | + } |
|
69 | 69 | |
70 | 70 | $comparator = new DateIntervalComparator(); |
71 | 71 | return 0 > $comparator->compare($day->diff($date), new DateInterval('P1D')); |
@@ -89,16 +89,16 @@ discard block |
||
89 | 89 | return $base->add(new DateInterval("P{$days}D")); |
90 | 90 | } |
91 | 91 | |
92 | - /** |
|
93 | - * @param DateTime|DateTimeImmutable $date |
|
94 | - * @return DateTime|DateTimeImmutable|false |
|
95 | - */ |
|
96 | - private function getOffsetDay($date, int $offset) |
|
97 | - { |
|
98 | - if ($offset < 0) { |
|
99 | - return $date->sub(new DateInterval('P' . $offset * -1 . 'D')); |
|
100 | - } |
|
101 | - |
|
102 | - return $date->add(new DateInterval('P' . $offset . 'D')); |
|
103 | - } |
|
92 | + /** |
|
93 | + * @param DateTime|DateTimeImmutable $date |
|
94 | + * @return DateTime|DateTimeImmutable|false |
|
95 | + */ |
|
96 | + private function getOffsetDay($date, int $offset) |
|
97 | + { |
|
98 | + if ($offset < 0) { |
|
99 | + return $date->sub(new DateInterval('P' . $offset * -1 . 'D')); |
|
100 | + } |
|
101 | + |
|
102 | + return $date->add(new DateInterval('P' . $offset . 'D')); |
|
103 | + } |
|
104 | 104 | } |