@@ -129,8 +129,7 @@ discard block |
||
129 | 129 | // We add a minute to compensate |
130 | 130 | elseif (($this->event->getStartDate()->format('Y-m-d H:i') == $this->event->getEndDate()->format('Y-m-d H:i')) && $this->granularity == EventItemizer::BAT_DAILY) { |
131 | 131 | $adjusted_end_day = new \DateTime($this->event->getEndDate()->add(new \DateInterval('PT1M'))->format('Y-m-d H:i')); |
132 | - } |
|
133 | - else { |
|
132 | + } else { |
|
134 | 133 | $adjusted_end_day = new \DateTime($this->event->getEndDate()->format('Y-m-d H:i')); |
135 | 134 | } |
136 | 135 | |
@@ -222,8 +221,7 @@ discard block |
||
222 | 221 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
223 | 222 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
224 | 223 | } |
225 | - } |
|
226 | - else { |
|
224 | + } else { |
|
227 | 225 | // Deal with the start day unless it starts on midnight precisely at which point the whole day is booked |
228 | 226 | if (!($this->event->getStartDate()->format('H:i') == '00:00')) { |
229 | 227 | $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59"))); |
@@ -231,8 +229,7 @@ discard block |
||
231 | 229 | $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
232 | 230 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
233 | 231 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
234 | - } |
|
235 | - else { |
|
232 | + } else { |
|
236 | 233 | // Just set an empty hour and minute |
237 | 234 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = array(); |
238 | 235 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); |
@@ -242,8 +239,7 @@ discard block |
||
242 | 239 | if ($this->event->getEndDate()->format('H:i') == '23:59') { |
243 | 240 | $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
244 | 241 | $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
245 | - } |
|
246 | - else { |
|
242 | + } else { |
|
247 | 243 | $end_period = new \DatePeriod(new \DateTime($end_date->format("Y-n-j 00:00:00")), $interval, $end_date->add(new \DateInterval('PT1M'))); |
248 | 244 | $itemized_end = $this->createHourlyGranular($end_period, new \DateTime($end_date->format("Y-n-j 00:00:00"))); |
249 | 245 | $itemized[EventItemizer::BAT_DAY][$ey][$em]['d' . $ed] = -1; |
@@ -294,8 +290,7 @@ discard block |
||
294 | 290 | $min = 0; |
295 | 291 | $hour++; |
296 | 292 | $start_minute = 0; |
297 | - } |
|
298 | - elseif ($min == 60 && $start_minute == 0) { |
|
293 | + } elseif ($min == 60 && $start_minute == 0) { |
|
299 | 294 | // Did a real whole hour so initialize the hour |
300 | 295 | $itemized[EventItemizer::BAT_HOUR][$year][$month]['d' . $day]['h' . $hour] = $event_value; |
301 | 296 |