@@ -71,9 +71,9 @@ |
||
| 71 | 71 | |
| 72 | 72 | $day = $day->modify($this->relation); |
| 73 | 73 | |
| 74 | - if ($day === false) { |
|
| 75 | - return false; |
|
| 76 | - } |
|
| 74 | + if ($day === false) { |
|
| 75 | + return false; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | 78 | return $date->format('Y-m-d') === $day->format('Y-m-d'); |
| 79 | 79 | } |
@@ -59,16 +59,16 @@ |
||
| 59 | 59 | { |
| 60 | 60 | $year = (int) $date->format('Y'); |
| 61 | 61 | |
| 62 | - $easter = $this->getEaster($year); |
|
| 62 | + $easter = $this->getEaster($year); |
|
| 63 | 63 | if ($this->offset < 0) { |
| 64 | 64 | $day = $easter->sub(new DateInterval('P' . $this->offset * -1 . 'D')); |
| 65 | 65 | } else { |
| 66 | 66 | $day = $easter->add(new DateInterval('P' . $this->offset . 'D')); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - if (false === $day) { |
|
| 70 | - return false; |
|
| 71 | - } |
|
| 69 | + if (false === $day) { |
|
| 70 | + return false; |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | 73 | $comparator = new DateIntervalComparator(); |
| 74 | 74 | return 0 > $comparator->compare($day->diff($date), new DateInterval('P1D')); |
@@ -12,35 +12,35 @@ |
||
| 12 | 12 | |
| 13 | 13 | class SwapRule |
| 14 | 14 | { |
| 15 | - private $swapDirection; |
|
| 16 | - |
|
| 17 | - private $swapToDay; |
|
| 18 | - |
|
| 19 | - /** @var GregorianWeekday[] */ |
|
| 20 | - private $swapWhenDay; |
|
| 21 | - |
|
| 22 | - /** |
|
| 23 | - * @param GregorianWeekday[] $swapWhenGregorianDay |
|
| 24 | - */ |
|
| 25 | - public function __construct(SwapDirection $direction, GregorianWeekday $swapToGregorianDay, GregorianWeekday ...$swapWhenGregorianDay) |
|
| 26 | - { |
|
| 27 | - $this->swapDirection = $direction; |
|
| 28 | - $this->swapToDay = $swapToGregorianDay; |
|
| 29 | - $this->swapWhenDay = $swapWhenGregorianDay; |
|
| 30 | - } |
|
| 31 | - |
|
| 32 | - public function getDirection(): SwapDirection |
|
| 33 | - { |
|
| 34 | - return $this->swapDirection; |
|
| 35 | - } |
|
| 36 | - |
|
| 37 | - public function getSwapToDay(): GregorianWeekday |
|
| 38 | - { |
|
| 39 | - return $this->swapToDay; |
|
| 40 | - } |
|
| 41 | - |
|
| 42 | - public function getSwapWhenDays(): array |
|
| 43 | - { |
|
| 44 | - return $this->swapWhenDay; |
|
| 45 | - } |
|
| 15 | + private $swapDirection; |
|
| 16 | + |
|
| 17 | + private $swapToDay; |
|
| 18 | + |
|
| 19 | + /** @var GregorianWeekday[] */ |
|
| 20 | + private $swapWhenDay; |
|
| 21 | + |
|
| 22 | + /** |
|
| 23 | + * @param GregorianWeekday[] $swapWhenGregorianDay |
|
| 24 | + */ |
|
| 25 | + public function __construct(SwapDirection $direction, GregorianWeekday $swapToGregorianDay, GregorianWeekday ...$swapWhenGregorianDay) |
|
| 26 | + { |
|
| 27 | + $this->swapDirection = $direction; |
|
| 28 | + $this->swapToDay = $swapToGregorianDay; |
|
| 29 | + $this->swapWhenDay = $swapWhenGregorianDay; |
|
| 30 | + } |
|
| 31 | + |
|
| 32 | + public function getDirection(): SwapDirection |
|
| 33 | + { |
|
| 34 | + return $this->swapDirection; |
|
| 35 | + } |
|
| 36 | + |
|
| 37 | + public function getSwapToDay(): GregorianWeekday |
|
| 38 | + { |
|
| 39 | + return $this->swapToDay; |
|
| 40 | + } |
|
| 41 | + |
|
| 42 | + public function getSwapWhenDays(): array |
|
| 43 | + { |
|
| 44 | + return $this->swapWhenDay; |
|
| 45 | + } |
|
| 46 | 46 | } |