@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | /** |
| 91 | 91 | * Returns the start date. |
| 92 | 92 | * |
| 93 | - * @return DateTime |
|
| 93 | + * @return \DateTime |
|
| 94 | 94 | */ |
| 95 | 95 | public function getStartDate() { |
| 96 | 96 | return clone($this->start_date); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | /** |
| 108 | 108 | * Set the start date. |
| 109 | 109 | * |
| 110 | - * @param DateTime $start_date |
|
| 110 | + * @param \DateTime $start_date |
|
| 111 | 111 | */ |
| 112 | 112 | public function setStartDate(\DateTime $start_date) { |
| 113 | 113 | $this->start_date = clone($start_date); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | /** |
| 117 | 117 | * Returns the end date. |
| 118 | 118 | * |
| 119 | - * @return DateTime |
|
| 119 | + * @return \DateTime |
|
| 120 | 120 | */ |
| 121 | 121 | public function getEndDate() { |
| 122 | 122 | return clone($this->end_date); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | /** |
| 134 | 134 | * Set the end date. |
| 135 | 135 | * |
| 136 | - * @param DateTime $end_date |
|
| 136 | + * @param \DateTime $end_date |
|
| 137 | 137 | */ |
| 138 | 138 | public function setEndDate(\DateTime $end_date) { |
| 139 | 139 | $this->end_date = clone($end_date); |
@@ -451,6 +451,7 @@ discard block |
||
| 451 | 451 | /** |
| 452 | 452 | * Transforms the event in a breakdown of days, hours and minutes with associated states. |
| 453 | 453 | * |
| 454 | + * @param EventItemizer $itemizer |
|
| 454 | 455 | * @return array |
| 455 | 456 | */ |
| 456 | 457 | public function itemize($itemizer, $granularity = AbstractEvent::BAT_HOURLY) { |
@@ -461,7 +462,7 @@ discard block |
||
| 461 | 462 | /** |
| 462 | 463 | * Saves an event using the Store object |
| 463 | 464 | * |
| 464 | - * @param \Roomify\Bat\\Store\Store $store |
|
| 465 | + * @param Store $store |
|
| 465 | 466 | * @param string $granularity |
| 466 | 467 | * |
| 467 | 468 | * @return boolean |
@@ -342,8 +342,7 @@ |
||
| 342 | 342 | if ($this->dateIsEarlier($start) && |
| 343 | 343 | ($this->dateIsInRange($end) || $this->dateIsLater($end))) { |
| 344 | 344 | $overlaps = TRUE; |
| 345 | - } |
|
| 346 | - elseif ($this->dateIsInRange($start) && |
|
| 345 | + } elseif ($this->dateIsInRange($start) && |
|
| 347 | 346 | ($this->dateIsInRange($end) || $this->dateIsLater($end))) { |
| 348 | 347 | $overlaps = TRUE; |
| 349 | 348 | } |
@@ -147,8 +147,7 @@ discard block |
||
| 147 | 147 | // If we are in the same month the end date is the end date of the event |
| 148 | 148 | if ($this->event->isSameMonth()) { |
| 149 | 149 | $dayrange = new \DatePeriod($this->event->getStartDate(), $dayinterval, new \DateTime($this->event->getEndDate()->format("Y-n-j 23:59:59"))); |
| 150 | - } |
|
| 151 | - else { // alternatively it is the last day of the start month |
|
| 150 | + } else { // alternatively it is the last day of the start month |
|
| 152 | 151 | $dayrange = new \DatePeriod($this->event->getStartDate(), $dayinterval, $this->event->endMonthDate($this->event->getStartDate())); |
| 153 | 152 | } |
| 154 | 153 | foreach ($dayrange as $day) { |
@@ -214,8 +213,7 @@ discard block |
||
| 214 | 213 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
| 215 | 214 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
| 216 | 215 | } |
| 217 | - } |
|
| 218 | - else { |
|
| 216 | + } else { |
|
| 219 | 217 | // Deal with the start day unless it starts on midnight precisely at which point the whole day is booked |
| 220 | 218 | if (!($this->event->getStartDate()->format('H:i') == '00:00')) { |
| 221 | 219 | $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59"))); |
@@ -223,8 +221,7 @@ discard block |
||
| 223 | 221 | $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
| 224 | 222 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
| 225 | 223 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
| 226 | - } |
|
| 227 | - else { |
|
| 224 | + } else { |
|
| 228 | 225 | // Just set an empty hour and minute |
| 229 | 226 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = array(); |
| 230 | 227 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); |
@@ -270,8 +267,7 @@ discard block |
||
| 270 | 267 | // Not a real hour - leave as is and move on |
| 271 | 268 | $counter = 0; |
| 272 | 269 | $start_minute = 0; |
| 273 | - } |
|
| 274 | - elseif ($counter == 60 && $start_minute == 0) { |
|
| 270 | + } elseif ($counter == 60 && $start_minute == 0) { |
|
| 275 | 271 | // Did a real whole hour so initialize the hour |
| 276 | 272 | $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->event->getValue(); |
| 277 | 273 | // We have a whole hour so get rid of the minute info |
@@ -25,6 +25,7 @@ discard block |
||
| 25 | 25 | * Set the unit id. |
| 26 | 26 | * |
| 27 | 27 | * @param int $unit_id |
| 28 | + * @return void |
|
| 28 | 29 | */ |
| 29 | 30 | public function setUnitId($unit_id); |
| 30 | 31 | |
@@ -46,6 +47,7 @@ discard block |
||
| 46 | 47 | * Sets the StartDate |
| 47 | 48 | * |
| 48 | 49 | * @param \DateTime |
| 50 | + * @return void |
|
| 49 | 51 | */ |
| 50 | 52 | public function setStartDate(\DateTime $start_date); |
| 51 | 53 | |
@@ -53,6 +55,7 @@ discard block |
||
| 53 | 55 | * Sets the EndDate |
| 54 | 56 | * |
| 55 | 57 | * @param \DateTime |
| 58 | + * @return void |
|
| 56 | 59 | */ |
| 57 | 60 | public function setEndDate(\DateTime $end_date); |
| 58 | 61 | |
@@ -67,6 +70,7 @@ discard block |
||
| 67 | 70 | * Sets the event value. |
| 68 | 71 | * |
| 69 | 72 | * @param int $value |
| 73 | + * @return void |
|
| 70 | 74 | */ |
| 71 | 75 | public function setValue($value); |
| 72 | 76 | |
@@ -215,7 +219,7 @@ discard block |
||
| 215 | 219 | |
| 216 | 220 | /** |
| 217 | 221 | * Returns TRUE if the date supplied is the first month of the event |
| 218 | - * @param $date |
|
| 222 | + * @param \DateTime $date |
|
| 219 | 223 | * |
| 220 | 224 | * @return bool |
| 221 | 225 | */ |
@@ -231,7 +235,7 @@ discard block |
||
| 231 | 235 | |
| 232 | 236 | /** |
| 233 | 237 | * Returns TRUE if the date supplied is the last month of the event |
| 234 | - * @param $date |
|
| 238 | + * @param \DateTime $date |
|
| 235 | 239 | * |
| 236 | 240 | * @return bool |
| 237 | 241 | */ |
@@ -283,7 +287,6 @@ discard block |
||
| 283 | 287 | /** |
| 284 | 288 | * Returns the json version of this event. |
| 285 | 289 | * |
| 286 | - * @param \Roomify\Bat\Event\EventInterface $event |
|
| 287 | 290 | * |
| 288 | 291 | * @return mixed |
| 289 | 292 | */ |
@@ -129,8 +129,7 @@ discard block |
||
| 129 | 129 | // Unit is in a state that is within the set of valid states so add to result set |
| 130 | 130 | $units[$unit] = $unit; |
| 131 | 131 | $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE); |
| 132 | - } |
|
| 133 | - else { |
|
| 132 | + } else { |
|
| 134 | 133 | $response->addMiss($keyed_units[$unit], CalendarResponse::INVALID_STATE); |
| 135 | 134 | } |
| 136 | 135 | |
@@ -224,8 +223,7 @@ discard block |
||
| 224 | 223 | foreach ($days as $day => $value) { |
| 225 | 224 | $result[$year][$month][$day] = ((int)$db_events[$unit][Event::BAT_DAY][$year][$month][$day] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][Event::BAT_DAY][$year][$month][$day]); |
| 226 | 225 | } |
| 227 | - } |
|
| 228 | - else { |
|
| 226 | + } else { |
|
| 229 | 227 | foreach ($days as $day => $value) { |
| 230 | 228 | $result[$year][$month][$day] = $keyed_units[$unit]->getDefaultValue(); |
| 231 | 229 | } |
@@ -256,8 +254,7 @@ discard block |
||
| 256 | 254 | foreach ($hours as $hour => $value) { |
| 257 | 255 | if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
| 258 | 256 | $result[$year][$month][$day][$hour] = ((int) $db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour]); |
| 259 | - } |
|
| 260 | - else { |
|
| 257 | + } else { |
|
| 261 | 258 | // If nothing from db - then revert to the defaults |
| 262 | 259 | $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue(); |
| 263 | 260 | } |
@@ -305,8 +302,7 @@ discard block |
||
| 305 | 302 | foreach ($minutes as $minute => $value) { |
| 306 | 303 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
| 307 | 304 | $result[$year][$month][$day][$hour][$minute] = ((int) $db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute]); |
| 308 | - } |
|
| 309 | - else { |
|
| 305 | + } else { |
|
| 310 | 306 | // If nothing from db - then revert to the defaults |
| 311 | 307 | $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue(); |
| 312 | 308 | } |
@@ -381,8 +377,7 @@ discard block |
||
| 381 | 377 | if ($current_value === $minute_value) { |
| 382 | 378 | // We are still in minutes and going through so add a minute |
| 383 | 379 | $end_event->add(new \DateInterval('PT1M')); |
| 384 | - } |
|
| 385 | - elseif (($current_value != $minute_value) && ($current_value !== NULL)) { |
|
| 380 | + } elseif (($current_value != $minute_value) && ($current_value !== NULL)) { |
|
| 386 | 381 | // Value just switched - let us wrap up with current event and start a new one |
| 387 | 382 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
| 388 | 383 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
@@ -396,12 +391,10 @@ discard block |
||
| 396 | 391 | } |
| 397 | 392 | $current_value = $minute_value; |
| 398 | 393 | } |
| 399 | - } |
|
| 400 | - elseif ($current_value === $hour_value) { |
|
| 394 | + } elseif ($current_value === $hour_value) { |
|
| 401 | 395 | // We are in hours and can add something |
| 402 | 396 | $end_event->add(new \DateInterval('PT1H')); |
| 403 | - } |
|
| 404 | - elseif (($current_value != $hour_value) && ($current_value !== NULL)) { |
|
| 397 | + } elseif (($current_value != $hour_value) && ($current_value !== NULL)) { |
|
| 405 | 398 | // Value just switched - let us wrap up with current event and start a new one |
| 406 | 399 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
| 407 | 400 | // Start event becomes the end event with a minute added |
@@ -418,12 +411,10 @@ discard block |
||
| 418 | 411 | $current_value = $hour_value; |
| 419 | 412 | } |
| 420 | 413 | } |
| 421 | - } |
|
| 422 | - elseif ($current_value === $value) { |
|
| 414 | + } elseif ($current_value === $value) { |
|
| 423 | 415 | // We are adding a whole day so the end event gets moved to the end of the day we are adding |
| 424 | 416 | $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
| 425 | - } |
|
| 426 | - elseif (($current_value !== $value) && ($current_value !== NULL)) { |
|
| 417 | + } elseif (($current_value !== $value) && ($current_value !== NULL)) { |
|
| 427 | 418 | // Value just switched - let us wrap up with current event and start a new one |
| 428 | 419 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
| 429 | 420 | // Start event becomes the end event with a minute added |
@@ -458,8 +449,7 @@ discard block |
||
| 458 | 449 | if ($event->endsLater($end_date)) { |
| 459 | 450 | $event->setEndDate($end_date); |
| 460 | 451 | } |
| 461 | - } |
|
| 462 | - else { |
|
| 452 | + } else { |
|
| 463 | 453 | // Event completely not in range so unset it |
| 464 | 454 | unset($normalized_events[$unit_id][$key]); |
| 465 | 455 | } |
@@ -490,8 +480,7 @@ discard block |
||
| 490 | 480 | $e++; |
| 491 | 481 | $flipped[$e][$value][$datum] = $datum; |
| 492 | 482 | $old_value = $value; |
| 493 | - } |
|
| 494 | - else { |
|
| 483 | + } else { |
|
| 495 | 484 | $flipped[$e][$value][$datum] = $datum; |
| 496 | 485 | } |
| 497 | 486 | } |
@@ -158,11 +158,9 @@ |
||
| 158 | 158 | } else { |
| 159 | 159 | $text .= 'must be at least @minimum_stay and at most @maximum_stay'; |
| 160 | 160 | } |
| 161 | - } |
|
| 162 | - elseif ($minimum_stay) { |
|
| 161 | + } elseif ($minimum_stay) { |
|
| 163 | 162 | $text .= 'must be for at least @minimum_stay'; |
| 164 | - } |
|
| 165 | - elseif ($maximum_stay) { |
|
| 163 | + } elseif ($maximum_stay) { |
|
| 166 | 164 | $text .= 'cannot be more than @maximum_stay'; |
| 167 | 165 | } |
| 168 | 166 | |
@@ -108,8 +108,7 @@ |
||
| 108 | 108 | $command = rtrim($command, ','); |
| 109 | 109 | $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month"; |
| 110 | 110 | $this->pdo->exec($command); |
| 111 | - } |
|
| 112 | - else { |
|
| 111 | + } else { |
|
| 113 | 112 | $this->pdo->exec("INSERT INTO $this->day_table (unit_id, year, month, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . implode(', ', $values) . ")"); |
| 114 | 113 | } |
| 115 | 114 | } |