@@ -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 |
@@ -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) { |