@@ -15,11 +15,11 @@ |
||
15 | 15 | */ |
16 | 16 | class Calendar extends AbstractCalendar { |
17 | 17 | |
18 | - /** |
|
19 | - * @param $units |
|
20 | - * @param $store |
|
21 | - * @param $default_value |
|
22 | - */ |
|
18 | + /** |
|
19 | + * @param $units |
|
20 | + * @param $store |
|
21 | + * @param $default_value |
|
22 | + */ |
|
23 | 23 | public function __construct($units, $store, $default_value = 0) { |
24 | 24 | $this->units = $units; |
25 | 25 | $this->store = $store; |
@@ -126,8 +126,7 @@ |
||
126 | 126 | unset($this->included_set[$unit->getUnitId()]); |
127 | 127 | $this->addMiss($unit, $reason, $constraint); |
128 | 128 | return TRUE; |
129 | - } |
|
130 | - else { |
|
129 | + } else { |
|
131 | 130 | return FALSE; |
132 | 131 | } |
133 | 132 | } |
@@ -87,7 +87,7 @@ |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
90 | - * @return array |
|
90 | + * @return null|Constraint |
|
91 | 91 | */ |
92 | 92 | public function getIncluded() { |
93 | 93 | return $this->included_set; |
@@ -110,8 +110,7 @@ discard block |
||
110 | 110 | for ($i = 0; $i<=59; $i++) { |
111 | 111 | if ($i <= 9) { |
112 | 112 | $index = 'm0'.$i; |
113 | - } |
|
114 | - else { |
|
113 | + } else { |
|
115 | 114 | $index = 'm'.$i; |
116 | 115 | } |
117 | 116 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
@@ -190,8 +189,7 @@ discard block |
||
190 | 189 | } |
191 | 190 | } |
192 | 191 | } |
193 | - } |
|
194 | - catch (\Exception $e) { |
|
192 | + } catch (\Exception $e) { |
|
195 | 193 | $saved = FALSE; |
196 | 194 | $transaction->rollback(); |
197 | 195 | watchdog_exception('BAT Event Save Exception', $e); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
28 | 28 | |
29 | - $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
29 | + $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
30 | 30 | |
31 | 31 | $results = array(); |
32 | 32 | // Run each query and store results |
@@ -37,30 +37,30 @@ discard block |
||
37 | 37 | $db_events = array(); |
38 | 38 | |
39 | 39 | // Cycle through day results and setup an event array |
40 | - while( $data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
40 | + while ($data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
41 | 41 | // Figure out how many days the current month has |
42 | 42 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
43 | 43 | $days_in_month = (int)$temp_date->format('t'); |
44 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
45 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i]; |
|
44 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
45 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
49 | 49 | // With the day events taken care off let's cycle through hours |
50 | - while( $data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
51 | - for ($i = 0; $i<=23; $i++) { |
|
52 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h'. $i] = $data['h'.$i]; |
|
50 | + while ($data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
51 | + for ($i = 0; $i <= 23; $i++) { |
|
52 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h' . $i] = $data['h' . $i]; |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
56 | 56 | // With the hour events taken care off let's cycle through minutes |
57 | - while( $data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
58 | - for ($i = 0; $i<=59; $i++) { |
|
57 | + while ($data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
58 | + for ($i = 0; $i <= 59; $i++) { |
|
59 | 59 | if ($i <= 9) { |
60 | - $index = 'm0'.$i; |
|
60 | + $index = 'm0' . $i; |
|
61 | 61 | } |
62 | 62 | else { |
63 | - $index = 'm'.$i; |
|
63 | + $index = 'm' . $i; |
|
64 | 64 | } |
65 | 65 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
66 | 66 | } |
@@ -70,8 +70,7 @@ discard block |
||
70 | 70 | $calendar_response->removeFromMatched($included_set[$unit_id]['unit'], CalendarResponse::CONSTRAINT, $this); |
71 | 71 | |
72 | 72 | $this->affected_units[$unit_id] = $included_set[$unit_id]['unit']; |
73 | - } |
|
74 | - elseif (is_numeric($this->max_days) && $diff > $this->max_days) { |
|
73 | + } elseif (is_numeric($this->max_days) && $diff > $this->max_days) { |
|
75 | 74 | $calendar_response->removeFromMatched($included_set[$unit_id]['unit'], CalendarResponse::CONSTRAINT, $this); |
76 | 75 | |
77 | 76 | $this->affected_units[$unit_id] = $included_set[$unit_id]['unit']; |
@@ -122,8 +121,7 @@ discard block |
||
122 | 121 | if ($day_of_the_week) { |
123 | 122 | if ($start_date && $end_date) { |
124 | 123 | $text = t('From @start_date to @end_date, if booking starts on @day_of_the_week', $args); |
125 | - } |
|
126 | - else { |
|
124 | + } else { |
|
127 | 125 | $text = t('If booking starts on @day_of_the_week', $args); |
128 | 126 | } |
129 | 127 | } |
@@ -132,8 +130,7 @@ discard block |
||
132 | 130 | if ($minimum_stay || $maximum_stay) { |
133 | 131 | if (empty($text)) { |
134 | 132 | $text = t('The stay') . ' '; |
135 | - } |
|
136 | - else { |
|
133 | + } else { |
|
137 | 134 | $text .= ' ' . t('the stay') . ' '; |
138 | 135 | } |
139 | 136 | } |
@@ -141,15 +138,12 @@ discard block |
||
141 | 138 | // Special case when min stay and max stay are the same. |
142 | 139 | if ($minimum_stay == $maximum_stay) { |
143 | 140 | $text .= t('must be for @minimum_stay', $args); |
144 | - } |
|
145 | - else { |
|
141 | + } else { |
|
146 | 142 | $text .= t('must be at least @minimum_stay and at most @maximum_stay', $args); |
147 | 143 | } |
148 | - } |
|
149 | - elseif ($minimum_stay) { |
|
144 | + } elseif ($minimum_stay) { |
|
150 | 145 | $text .= t('must be for at least @minimum_stay', $args); |
151 | - } |
|
152 | - elseif ($maximum_stay) { |
|
146 | + } elseif ($maximum_stay) { |
|
153 | 147 | $text .= t('cannot be more than @maximum_stay', $args); |
154 | 148 | } |
155 | 149 |
@@ -111,7 +111,7 @@ |
||
111 | 111 | /** |
112 | 112 | * {@inheritdoc} |
113 | 113 | */ |
114 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
114 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
115 | 115 | $this->calendar_response = $calendar_response; |
116 | 116 | } |
117 | 117 |
@@ -19,7 +19,7 @@ |
||
19 | 19 | * |
20 | 20 | * @param $calendar_response |
21 | 21 | */ |
22 | - public function applyConstraint(CalendarResponse &$calendar_response); |
|
22 | + public function applyConstraint(CalendarResponse & $calendar_response); |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * @param $start_date |
@@ -110,8 +110,7 @@ discard block |
||
110 | 110 | for ($i = 0; $i<=59; $i++) { |
111 | 111 | if ($i <= 9) { |
112 | 112 | $index = 'm0'.$i; |
113 | - } |
|
114 | - else { |
|
113 | + } else { |
|
115 | 114 | $index = 'm'.$i; |
116 | 115 | } |
117 | 116 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
@@ -190,8 +189,7 @@ discard block |
||
190 | 189 | } |
191 | 190 | } |
192 | 191 | } |
193 | - } |
|
194 | - catch (\Exception $e) { |
|
192 | + } catch (\Exception $e) { |
|
195 | 193 | $saved = FALSE; |
196 | 194 | $transaction->rollback(); |
197 | 195 | watchdog_exception('BAT Event Save Exception', $e); |
@@ -49,14 +49,14 @@ discard block |
||
49 | 49 | // Figure out how many days the current month has |
50 | 50 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
51 | 51 | $days_in_month = (int)$temp_date->format('t'); |
52 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
52 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
53 | 53 | $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
54 | 54 | } |
55 | 55 | } |
56 | 56 | |
57 | 57 | // With the day events taken care off let's cycle through hours |
58 | 58 | foreach ($results[Event::BAT_HOUR]->fetchAll() as $data) { |
59 | - for ($i = 0; $i<=23; $i++) { |
|
59 | + for ($i = 0; $i <= 23; $i++) { |
|
60 | 60 | $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d' . $data['day']]['h' . $i] = $data['h' . $i]; |
61 | 61 | } |
62 | 62 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | // Because SQLite does not have a nice merge first we have to check if a row exists to determine whether to do an insert or an update |
103 | 103 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month])) { |
104 | 104 | $command = "UPDATE $this->day_table SET "; |
105 | - foreach ($days as $day => $value){ |
|
105 | + foreach ($days as $day => $value) { |
|
106 | 106 | $command .= "$day = $value,"; |
107 | 107 | } |
108 | 108 | $command = rtrim($command, ','); |
@@ -125,11 +125,11 @@ discard block |
||
125 | 125 | $keys = array_keys($hours); |
126 | 126 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_HOUR][$year][$month][$day])) { |
127 | 127 | $command = "UPDATE $this->hour_table SET "; |
128 | - foreach ($hours as $hour => $value){ |
|
128 | + foreach ($hours as $hour => $value) { |
|
129 | 129 | $command .= "$hour = $value,"; |
130 | 130 | } |
131 | 131 | $command = rtrim($command, ','); |
132 | - $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day,1); |
|
132 | + $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day, 1); |
|
133 | 133 | $this->pdo->exec($command); |
134 | 134 | } else { |
135 | 135 | $this->pdo->exec("INSERT INTO $this->hour_table (unit_id, year, month, day, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . substr($day, 1) . ", " . implode(', ', $values) . ")"); |
@@ -148,11 +148,11 @@ discard block |
||
148 | 148 | $keys = array_keys($minutes); |
149 | 149 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_MINUTE][$year][$month][$day][$hour])) { |
150 | 150 | $command = "UPDATE $this->minute_table SET "; |
151 | - foreach ($minutes as $minute => $value){ |
|
151 | + foreach ($minutes as $minute => $value) { |
|
152 | 152 | $command .= "$minute = $value,"; |
153 | 153 | } |
154 | 154 | $command = rtrim($command, ','); |
155 | - $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day,1) . " AND hour = " . substr($hour,1); |
|
155 | + $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day, 1) . " AND hour = " . substr($hour, 1); |
|
156 | 156 | $this->pdo->exec($command); |
157 | 157 | } else { |
158 | 158 | $this->pdo->exec("INSERT INTO $this->minute_table (unit_id, year, month, day, hour, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . substr($day, 1) . ", " . substr($hour, 1) . ", " . implode(', ', $values) . ")"); |
@@ -102,8 +102,7 @@ |
||
102 | 102 | if ($day_of_the_week) { |
103 | 103 | if ($start_date && $end_date) { |
104 | 104 | $text = 'From @start_date to @end_date, if booking starts on @day_of_the_week'; |
105 | - } |
|
106 | - else { |
|
105 | + } else { |
|
107 | 106 | $text = 'If booking starts on @day_of_the_week'; |
108 | 107 | } |
109 | 108 |
@@ -111,7 +111,7 @@ |
||
111 | 111 | /** |
112 | 112 | * {@inheritdoc} |
113 | 113 | */ |
114 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
114 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
115 | 115 | $this->calendar_response = $calendar_response; |
116 | 116 | } |
117 | 117 |
@@ -111,7 +111,7 @@ |
||
111 | 111 | /** |
112 | 112 | * {@inheritdoc} |
113 | 113 | */ |
114 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
114 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
115 | 115 | $this->calendar_response = $calendar_response; |
116 | 116 | } |
117 | 117 |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | /** |
86 | 86 | * Returns the start date. |
87 | 87 | * |
88 | - * @return DateTime |
|
88 | + * @return \DateTime |
|
89 | 89 | */ |
90 | 90 | public function getStartDate() { |
91 | 91 | return clone($this->start_date); |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | /** |
103 | 103 | * Set the start date. |
104 | 104 | * |
105 | - * @param DateTime $start_date |
|
105 | + * @param \DateTime $start_date |
|
106 | 106 | */ |
107 | 107 | public function setStartDate(\DateTime $start_date) { |
108 | 108 | $this->start_date = clone($start_date); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | /** |
112 | 112 | * Returns the end date. |
113 | 113 | * |
114 | - * @return DateTime |
|
114 | + * @return \DateTime |
|
115 | 115 | */ |
116 | 116 | public function getEndDate() { |
117 | 117 | return clone($this->end_date); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | /** |
129 | 129 | * Set the end date. |
130 | 130 | * |
131 | - * @param DateTime $end_date |
|
131 | + * @param \DateTime $end_date |
|
132 | 132 | */ |
133 | 133 | public function setEndDate(\DateTime $end_date) { |
134 | 134 | $this->end_date = clone($end_date); |
@@ -240,6 +240,7 @@ discard block |
||
240 | 240 | |
241 | 241 | /** |
242 | 242 | * {@inheritdoc} |
243 | + * @param \DateTime $date |
|
243 | 244 | */ |
244 | 245 | public function isLastMonth($date) { |
245 | 246 | if ($date->format("n") == $this->endMonth() && $date->format("Y") == $this->endYear()) { |
@@ -608,7 +609,7 @@ discard block |
||
608 | 609 | /** |
609 | 610 | * Saves an event to whatever Drupal tables are defined in the store array |
610 | 611 | * |
611 | - * @param \ROomify\Bat\\Store\Store $store |
|
612 | + * @param Store $store |
|
612 | 613 | * @param string $granularity |
613 | 614 | * |
614 | 615 | * @throws \Exception |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | } |
491 | 491 | |
492 | 492 | // Deal with the end date unless it ends just before midnight at which point we don't need to go further |
493 | - if ($this->end_date->format('H:i') == '23:59' ) { |
|
493 | + if ($this->end_date->format('H:i') == '23:59') { |
|
494 | 494 | $itemized[AbstractEvent::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
495 | 495 | $itemized[AbstractEvent::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
496 | 496 | } else { |
@@ -518,14 +518,14 @@ discard block |
||
518 | 518 | |
519 | 519 | $counter = (int)$period_start->format('i'); |
520 | 520 | $start_minute = $counter; |
521 | - foreach($period as $minute) { |
|
521 | + foreach ($period as $minute) { |
|
522 | 522 | // Doing minutes so set the values in the minute array |
523 | - $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]['m' .$minute->format('i')] = $this->getValue(); |
|
523 | + $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->getValue(); |
|
524 | 524 | // Let the hours know that it cannot determine availability |
525 | - $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')] = -1; |
|
525 | + $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1; |
|
526 | 526 | $counter++; |
527 | 527 | |
528 | - if ($counter == 60 && $start_minute!==0) { |
|
528 | + if ($counter == 60 && $start_minute !== 0) { |
|
529 | 529 | // Not a real hour - leave as is and move on |
530 | 530 | $counter = 0; |
531 | 531 | $start_minute = 0; |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | // Did a real whole hour so initialize the hour |
535 | 535 | $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue(); |
536 | 536 | // We have a whole hour so get rid of the minute info |
537 | - unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]); |
|
537 | + unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]); |
|
538 | 538 | $counter = 0; |
539 | 539 | $start_minute = 0; |
540 | 540 | } |
@@ -555,12 +555,12 @@ discard block |
||
555 | 555 | // Set the end date to the last day of the month so that we are sure to get that last month |
556 | 556 | $adjusted_end_day = new \DateTime($this->end_date->format('Y-n-t')); |
557 | 557 | |
558 | - $daterange = new \DatePeriod($this->start_date, $interval ,$adjusted_end_day); |
|
558 | + $daterange = new \DatePeriod($this->start_date, $interval, $adjusted_end_day); |
|
559 | 559 | |
560 | 560 | $itemized = array(); |
561 | 561 | |
562 | 562 | // Cycle through each month |
563 | - foreach($daterange as $date) { |
|
563 | + foreach ($daterange as $date) { |
|
564 | 564 | |
565 | 565 | $year = $date->format("Y"); |
566 | 566 | $dayinterval = new \DateInterval('P1D'); |
@@ -337,8 +337,7 @@ discard block |
||
337 | 337 | if ($this->dateIsEarlier($start) && |
338 | 338 | ($this->dateIsInRange($end) || $this->dateIsLater($end))) { |
339 | 339 | $overlaps = TRUE; |
340 | - } |
|
341 | - elseif ($this->dateIsInRange($start) && |
|
340 | + } elseif ($this->dateIsInRange($start) && |
|
342 | 341 | ($this->dateIsInRange($end) || $this->dateIsLater($end))) { |
343 | 342 | $overlaps = TRUE; |
344 | 343 | } |
@@ -473,8 +472,7 @@ discard block |
||
473 | 472 | $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd]; |
474 | 473 | $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
475 | 474 | } |
476 | - } |
|
477 | - else { |
|
475 | + } else { |
|
478 | 476 | // Deal with the start day unless it starts on midnight precisely at which point the whole day is booked |
479 | 477 | if (!($this->start_date->format('H:i') == '00:00')) { |
480 | 478 | $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59"))); |
@@ -482,8 +480,7 @@ discard block |
||
482 | 480 | $itemized[AbstractEvent::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
483 | 481 | $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd]; |
484 | 482 | $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
485 | - } |
|
486 | - else { |
|
483 | + } else { |
|
487 | 484 | // Just set an empty hour and minute |
488 | 485 | $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = array(); |
489 | 486 | $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); |
@@ -529,8 +526,7 @@ discard block |
||
529 | 526 | // Not a real hour - leave as is and move on |
530 | 527 | $counter = 0; |
531 | 528 | $start_minute = 0; |
532 | - } |
|
533 | - elseif ($counter == 60 && $start_minute == 0) { |
|
529 | + } elseif ($counter == 60 && $start_minute == 0) { |
|
534 | 530 | // Did a real whole hour so initialize the hour |
535 | 531 | $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue(); |
536 | 532 | // We have a whole hour so get rid of the minute info |
@@ -571,8 +567,7 @@ discard block |
||
571 | 567 | // If we are in the same month the end date is the end date of the event |
572 | 568 | if ($this->isSameMonth()) { |
573 | 569 | $dayrange = new \DatePeriod($this->start_date, $dayinterval, new \DateTime($this->end_date->format("Y-n-j 23:59:59"))); |
574 | - } |
|
575 | - else { // alternatively it is the last day of the start month |
|
570 | + } else { // alternatively it is the last day of the start month |
|
576 | 571 | $dayrange = new \DatePeriod($this->start_date, $dayinterval, $this->endMonthDate($this->start_date)); |
577 | 572 | } |
578 | 573 | foreach ($dayrange as $day) { |