@@ -52,7 +52,7 @@ |
||
52 | 52 | /** |
53 | 53 | * {@inheritdoc} |
54 | 54 | */ |
55 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
55 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
56 | 56 | parent::applyConstraint($calendar_response); |
57 | 57 | |
58 | 58 | if ($this->start_date === NULL) { |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | // Create a mock itemized event for the period in question - since event data is either |
191 | 191 | // in the database or the default value we first create a mock event and then fill it in |
192 | 192 | // accordingly |
193 | - $mock_event = new Event($start_date, $end_date, new Unit(0,0), $this->default_value); |
|
193 | + $mock_event = new Event($start_date, $end_date, new Unit(0, 0), $this->default_value); |
|
194 | 194 | $itemized = $mock_event->itemize(new EventItemizer($mock_event, $granularity)); |
195 | 195 | |
196 | 196 | // Cycle through each unit retrieved and provide it with a fully configured itemized mock event |
@@ -281,11 +281,11 @@ discard block |
||
281 | 281 | foreach ($days as $day => $hours) { |
282 | 282 | foreach ($hours as $hour => $value) { |
283 | 283 | if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
284 | - $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]); |
|
284 | + $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]); |
|
285 | 285 | } |
286 | 286 | else { |
287 | 287 | // If nothing from db - then revert to the defaults |
288 | - $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
288 | + $result[$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
289 | 289 | } |
290 | 290 | } |
291 | 291 | } |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | foreach ($months as $month => $days) { |
300 | 300 | foreach ($days as $day => $hours) { |
301 | 301 | foreach ($hours as $hour => $value) { |
302 | - $result[$year][$month][$day][$hour] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
302 | + $result[$year][$month][$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
303 | 303 | } |
304 | 304 | ksort($result[$year][$month][$day], SORT_NATURAL); |
305 | 305 | } |
@@ -330,11 +330,11 @@ discard block |
||
330 | 330 | foreach ($hours as $hour => $minutes) { |
331 | 331 | foreach ($minutes as $minute => $value) { |
332 | 332 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
333 | - $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]); |
|
333 | + $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]); |
|
334 | 334 | } |
335 | 335 | else { |
336 | 336 | // If nothing from db - then revert to the defaults |
337 | - $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
337 | + $result[$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
338 | 338 | } |
339 | 339 | } |
340 | 340 | } |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | foreach ($days as $day => $hours) { |
351 | 351 | foreach ($hours as $hour => $minutes) { |
352 | 352 | foreach ($minutes as $minute => $value) { |
353 | - $result[$year][$month][$day][$hour][$minute] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
353 | + $result[$year][$month][$day][$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
354 | 354 | } |
355 | 355 | ksort($result[$year][$month][$day][$hour], SORT_NATURAL); |
356 | 356 | } |
@@ -424,12 +424,12 @@ discard block |
||
424 | 424 | // Value just switched - let us wrap up with current event and start a new one |
425 | 425 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
426 | 426 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
427 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
427 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':'.substr($minute, 1)); |
|
428 | 428 | $current_value = $minute_value; |
429 | 429 | } |
430 | 430 | if ($current_value === NULL) { |
431 | 431 | // We are down to minutes and haven't created and event yet - do one now |
432 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
432 | + $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':'.substr($minute, 1)); |
|
433 | 433 | $end_event = clone($start_event); |
434 | 434 | } |
435 | 435 | $current_value = $minute_value; |
@@ -454,22 +454,22 @@ discard block |
||
454 | 454 | // Start event becomes the end event with a minute added |
455 | 455 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
456 | 456 | // End event comes the current point in time |
457 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':59'); |
|
457 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':59'); |
|
458 | 458 | $current_value = $hour_value; |
459 | 459 | } |
460 | 460 | } |
461 | 461 | if ($current_value === NULL) { |
462 | 462 | // Got into hours and still haven't created an event so |
463 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':00'); |
|
463 | + $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':00'); |
|
464 | 464 | // We will be occupying at least this hour so might as well mark it |
465 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':59'); |
|
465 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':59'); |
|
466 | 466 | $current_value = $hour_value; |
467 | 467 | } |
468 | 468 | } |
469 | 469 | } |
470 | 470 | elseif ($current_value === $value) { |
471 | 471 | // We are adding a whole day so the end event gets moved to the end of the day we are adding |
472 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
|
472 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59'); |
|
473 | 473 | } |
474 | 474 | elseif (($current_value !== $value) && ($current_value !== NULL)) { |
475 | 475 | // Value just switched - let us wrap up with current event and start a new one |
@@ -477,13 +477,13 @@ discard block |
||
477 | 477 | // Start event becomes the end event with a minute added |
478 | 478 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
479 | 479 | // End event becomes the current day which we have not account for yet |
480 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
|
480 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59'); |
|
481 | 481 | $current_value = $value; |
482 | 482 | } |
483 | 483 | if ($current_value === NULL) { |
484 | 484 | // We have not created an event yet so let's do it now |
485 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '00:00'); |
|
486 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
|
485 | + $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'00:00'); |
|
486 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59'); |
|
487 | 487 | $current_value = $value; |
488 | 488 | } |
489 | 489 | } |
@@ -582,7 +582,7 @@ discard block |
||
582 | 582 | * @return Unit |
583 | 583 | */ |
584 | 584 | protected function getUnit($unit_id) { |
585 | - $keyed = $this->keyUnitsById(); |
|
585 | + $keyed = $this->keyUnitsById(); |
|
586 | 586 | return $keyed[$unit_id]; |
587 | 587 | } |
588 | 588 |
@@ -146,8 +146,7 @@ discard block |
||
146 | 146 | // Compare the current states with the set of valid states |
147 | 147 | if ($intersect) { |
148 | 148 | $remaining_states = array_intersect($current_states, $valid_states); |
149 | - } |
|
150 | - else { |
|
149 | + } else { |
|
151 | 150 | $remaining_states = array_diff($current_states, $valid_states); |
152 | 151 | } |
153 | 152 | |
@@ -155,8 +154,7 @@ discard block |
||
155 | 154 | // Unit is in a state that is within the set of valid states so add to result set |
156 | 155 | $units[$unit] = $unit; |
157 | 156 | $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE); |
158 | - } |
|
159 | - else { |
|
157 | + } else { |
|
160 | 158 | $response->addMiss($keyed_units[$unit], CalendarResponse::INVALID_STATE); |
161 | 159 | } |
162 | 160 | |
@@ -250,8 +248,7 @@ discard block |
||
250 | 248 | foreach ($days as $day => $value) { |
251 | 249 | $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]); |
252 | 250 | } |
253 | - } |
|
254 | - else { |
|
251 | + } else { |
|
255 | 252 | foreach ($days as $day => $value) { |
256 | 253 | $result[$year][$month][$day] = $keyed_units[$unit]->getDefaultValue(); |
257 | 254 | } |
@@ -282,8 +279,7 @@ discard block |
||
282 | 279 | foreach ($hours as $hour => $value) { |
283 | 280 | if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
284 | 281 | $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]); |
285 | - } |
|
286 | - else { |
|
282 | + } else { |
|
287 | 283 | // If nothing from db - then revert to the defaults |
288 | 284 | $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue(); |
289 | 285 | } |
@@ -331,8 +327,7 @@ discard block |
||
331 | 327 | foreach ($minutes as $minute => $value) { |
332 | 328 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
333 | 329 | $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]); |
334 | - } |
|
335 | - else { |
|
330 | + } else { |
|
336 | 331 | // If nothing from db - then revert to the defaults |
337 | 332 | $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue(); |
338 | 333 | } |
@@ -393,8 +388,12 @@ discard block |
||
393 | 388 | |
394 | 389 | // Make sure years are sorted |
395 | 390 | ksort($data[Event::BAT_DAY]); |
396 | - if (isset($data[Event::BAT_HOUR])) ksort($data[Event::BAT_HOUR]); |
|
397 | - if (isset($data[Event::BAT_MINUTE])) ksort($data[Event::BAT_MINUTE]); |
|
391 | + if (isset($data[Event::BAT_HOUR])) { |
|
392 | + ksort($data[Event::BAT_HOUR]); |
|
393 | + } |
|
394 | + if (isset($data[Event::BAT_MINUTE])) { |
|
395 | + ksort($data[Event::BAT_MINUTE]); |
|
396 | + } |
|
398 | 397 | |
399 | 398 | // Set up variables to keep track of stuff |
400 | 399 | $current_value = NULL; |
@@ -419,8 +418,7 @@ discard block |
||
419 | 418 | if ($current_value === $minute_value) { |
420 | 419 | // We are still in minutes and going through so add a minute |
421 | 420 | $end_event->add(new \DateInterval('PT1M')); |
422 | - } |
|
423 | - elseif (($current_value != $minute_value) && ($current_value !== NULL)) { |
|
421 | + } elseif (($current_value != $minute_value) && ($current_value !== NULL)) { |
|
424 | 422 | // Value just switched - let us wrap up with current event and start a new one |
425 | 423 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
426 | 424 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
@@ -434,12 +432,10 @@ discard block |
||
434 | 432 | } |
435 | 433 | $current_value = $minute_value; |
436 | 434 | } |
437 | - } |
|
438 | - elseif ($current_value === $hour_value) { |
|
435 | + } elseif ($current_value === $hour_value) { |
|
439 | 436 | // We are in hours and can add something |
440 | 437 | $end_event->add(new \DateInterval('PT1H')); |
441 | - } |
|
442 | - elseif (($current_value != $hour_value) && ($current_value !== NULL)) { |
|
438 | + } elseif (($current_value != $hour_value) && ($current_value !== NULL)) { |
|
443 | 439 | $skip_finalize_event = FALSE; |
444 | 440 | |
445 | 441 | if ($is_daylight_saving_time) { |
@@ -466,12 +462,10 @@ discard block |
||
466 | 462 | $current_value = $hour_value; |
467 | 463 | } |
468 | 464 | } |
469 | - } |
|
470 | - elseif ($current_value === $value) { |
|
465 | + } elseif ($current_value === $value) { |
|
471 | 466 | // We are adding a whole day so the end event gets moved to the end of the day we are adding |
472 | 467 | $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
473 | - } |
|
474 | - elseif (($current_value !== $value) && ($current_value !== NULL)) { |
|
468 | + } elseif (($current_value !== $value) && ($current_value !== NULL)) { |
|
475 | 469 | // Value just switched - let us wrap up with current event and start a new one |
476 | 470 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
477 | 471 | // Start event becomes the end event with a minute added |
@@ -506,8 +500,7 @@ discard block |
||
506 | 500 | if ($event->endsLater($end_date)) { |
507 | 501 | $event->setEndDate($end_date); |
508 | 502 | } |
509 | - } |
|
510 | - else { |
|
503 | + } else { |
|
511 | 504 | // Event completely not in range so unset it |
512 | 505 | unset($normalized_events[$unit_id][$key]); |
513 | 506 | } |
@@ -538,8 +531,7 @@ discard block |
||
538 | 531 | $e++; |
539 | 532 | $flipped[$e][$value][$datum] = $datum; |
540 | 533 | $old_value = $value; |
541 | - } |
|
542 | - else { |
|
534 | + } else { |
|
543 | 535 | $flipped[$e][$value][$datum] = $datum; |
544 | 536 | } |
545 | 537 | } |
@@ -8,7 +8,6 @@ |
||
8 | 8 | namespace Roomify\Bat\Event; |
9 | 9 | |
10 | 10 | use Roomify\Bat\Event\EventInterface; |
11 | -use Roomify\Bat\Unit\Unit; |
|
12 | 11 | |
13 | 12 | /** |
14 | 13 | * The EventItemizer class does the hard work of splitting an event into discrete time |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $dayrange = new \DatePeriod($this->event->getStartDate(), $dayinterval, $this->event->endMonthDate($this->event->getStartDate())); |
161 | 161 | } |
162 | 162 | foreach ($dayrange as $day) { |
163 | - $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue(); |
|
163 | + $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue(); |
|
164 | 164 | } |
165 | 165 | } |
166 | 166 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | elseif ($this->event->isLastMonth($date)) { |
169 | 169 | $dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1")), $dayinterval, $this->event->getEndDate()); |
170 | 170 | foreach ($dayrange as $day) { |
171 | - $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue(); |
|
171 | + $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue(); |
|
172 | 172 | } |
173 | 173 | } |
174 | 174 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | else { |
177 | 177 | $dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1")), $dayinterval, new \DateTime($date->format("Y-n-t 23:59:59"))); |
178 | 178 | foreach ($dayrange as $day) { |
179 | - $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue(); |
|
179 | + $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue(); |
|
180 | 180 | } |
181 | 181 | } |
182 | 182 | } |
@@ -217,35 +217,35 @@ discard block |
||
217 | 217 | if ($this->event->isSameDay()) { |
218 | 218 | if (!($this->event->getStartDate()->format('H:i') == '00:00' && $this->event->getEndDate()->format('H:i') == '23:59')) { |
219 | 219 | $itemized_same_day = $this->createHourlyGranular($start_date, $end_date->add(new \DateInterval('PT1M')), $interval, $start_date); |
220 | - $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
|
221 | - $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
|
222 | - $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
|
220 | + $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d'.$sd] = -1; |
|
221 | + $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd]; |
|
222 | + $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd]; |
|
223 | 223 | } |
224 | 224 | } |
225 | 225 | else { |
226 | 226 | // Deal with the start day unless it starts on midnight precisely at which point the whole day is booked |
227 | 227 | if (!($this->event->getStartDate()->format('H:i') == '00:00')) { |
228 | 228 | $itemized_start = $this->createHourlyGranular($start_date, new \DateTime($start_date->format("Y-n-j 23:59:59")), $interval, $start_date); |
229 | - $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
|
230 | - $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
|
231 | - $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
|
229 | + $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d'.$sd] = -1; |
|
230 | + $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd]; |
|
231 | + $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd]; |
|
232 | 232 | } |
233 | 233 | else { |
234 | 234 | // Just set an empty hour and minute |
235 | - $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = array(); |
|
236 | - $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); |
|
235 | + $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = array(); |
|
236 | + $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = array(); |
|
237 | 237 | } |
238 | 238 | |
239 | 239 | // Deal with the end date unless it ends just before midnight at which point we don't need to go further |
240 | 240 | if ($this->event->getEndDate()->format('H:i') == '23:59') { |
241 | - $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
|
242 | - $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
|
241 | + $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed] = array(); |
|
242 | + $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed] = array(); |
|
243 | 243 | } |
244 | 244 | else { |
245 | 245 | $itemized_end = $this->createHourlyGranular(new \DateTime($end_date->format("Y-n-j 00:00:00")), $end_date->add(new \DateInterval('PT1M')), $interval, new \DateTime($end_date->format("Y-n-j 00:00:00"))); |
246 | - $itemized[EventItemizer::BAT_DAY][$ey][$em]['d' . $ed] = -1; |
|
247 | - $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed]; |
|
248 | - $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed]; |
|
246 | + $itemized[EventItemizer::BAT_DAY][$ey][$em]['d'.$ed] = -1; |
|
247 | + $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed]; |
|
248 | + $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed] = $itemized_end[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed]; |
|
249 | 249 | } |
250 | 250 | } |
251 | 251 | |
@@ -284,9 +284,9 @@ discard block |
||
284 | 284 | } |
285 | 285 | |
286 | 286 | // Doing minutes so set the values in the minute array |
287 | - $itemized[EventItemizer::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour]['m' . $min] = $event_value; |
|
287 | + $itemized[EventItemizer::BAT_MINUTE][$year][$month]['d'.$day]['h'.$hour]['m'.$min] = $event_value; |
|
288 | 288 | // Let the hours know that it cannot determine availability |
289 | - $itemized[EventItemizer::BAT_HOUR][$year][$month]['d' . $day]['h' . $hour] = -1; |
|
289 | + $itemized[EventItemizer::BAT_HOUR][$year][$month]['d'.$day]['h'.$hour] = -1; |
|
290 | 290 | $min++; |
291 | 291 | |
292 | 292 | if ($min == 60 && $start_minute !== 0) { |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | } |
298 | 298 | elseif ($min == 60 && $start_minute == 0) { |
299 | 299 | // Did a real whole hour so initialize the hour |
300 | - $itemized[EventItemizer::BAT_HOUR][$year][$month]['d' . $day]['h' . $hour] = $event_value; |
|
300 | + $itemized[EventItemizer::BAT_HOUR][$year][$month]['d'.$day]['h'.$hour] = $event_value; |
|
301 | 301 | |
302 | 302 | $min = 0; |
303 | 303 | $hour++; |
@@ -324,9 +324,9 @@ discard block |
||
324 | 324 | |
325 | 325 | $hour = $date->format('G'); |
326 | 326 | for ($i = 0; $i < 60; $i++) { |
327 | - $minute = ($i < 10) ? '0' . $i : $i; |
|
327 | + $minute = ($i < 10) ? '0'.$i : $i; |
|
328 | 328 | |
329 | - $itemized[EventItemizer::BAT_MINUTE][$date->format('Y')][$date->format('n')]['d' . $date->format('j')]['h' . $hour]['m' . $minute] = $this->event->getValue(); |
|
329 | + $itemized[EventItemizer::BAT_MINUTE][$date->format('Y')][$date->format('n')]['d'.$date->format('j')]['h'.$hour]['m'.$minute] = $this->event->getValue(); |
|
330 | 330 | } |
331 | 331 | } |
332 | 332 | } |
@@ -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 | |
@@ -221,16 +220,14 @@ discard block |
||
221 | 220 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
222 | 221 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
223 | 222 | } |
224 | - } |
|
225 | - else { |
|
223 | + } else { |
|
226 | 224 | // Deal with the start day unless it starts on midnight precisely at which point the whole day is booked |
227 | 225 | if (!($this->event->getStartDate()->format('H:i') == '00:00')) { |
228 | 226 | $itemized_start = $this->createHourlyGranular($start_date, new \DateTime($start_date->format("Y-n-j 23:59:59")), $interval, $start_date); |
229 | 227 | $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
230 | 228 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
231 | 229 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
232 | - } |
|
233 | - else { |
|
230 | + } else { |
|
234 | 231 | // Just set an empty hour and minute |
235 | 232 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = array(); |
236 | 233 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); |
@@ -240,8 +237,7 @@ discard block |
||
240 | 237 | if ($this->event->getEndDate()->format('H:i') == '23:59') { |
241 | 238 | $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
242 | 239 | $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
243 | - } |
|
244 | - else { |
|
240 | + } else { |
|
245 | 241 | $itemized_end = $this->createHourlyGranular(new \DateTime($end_date->format("Y-n-j 00:00:00")), $end_date->add(new \DateInterval('PT1M')), $interval, new \DateTime($end_date->format("Y-n-j 00:00:00"))); |
246 | 242 | $itemized[EventItemizer::BAT_DAY][$ey][$em]['d' . $ed] = -1; |
247 | 243 | $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed]; |
@@ -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 |