@@ -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 |
@@ -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 |
@@ -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 | } |
@@ -48,17 +48,17 @@ discard block |
||
48 | 48 | // Cycle through day results and setup an event array |
49 | 49 | foreach ($results[Event::BAT_DAY]->fetchAll() as $data) { |
50 | 50 | // Figure out how many days the current month has |
51 | - $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
|
51 | + $temp_date = new \DateTime($data['year']."-".$data['month']); |
|
52 | 52 | $days_in_month = (int)$temp_date->format('t'); |
53 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
54 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
53 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
54 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d'.$i] = $data['d'.$i]; |
|
55 | 55 | } |
56 | 56 | } |
57 | 57 | |
58 | 58 | // With the day events taken care off let's cycle through hours |
59 | 59 | foreach ($results[Event::BAT_HOUR]->fetchAll() as $data) { |
60 | - for ($i = 0; $i<=23; $i++) { |
|
61 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d' . $data['day']]['h' . $i] = $data['h' . $i]; |
|
60 | + for ($i = 0; $i <= 23; $i++) { |
|
61 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d'.$data['day']]['h'.$i] = $data['h'.$i]; |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
@@ -66,11 +66,11 @@ discard block |
||
66 | 66 | foreach ($results[Event::BAT_MINUTE]->fetchAll() as $data) { |
67 | 67 | for ($i = 0; $i <= 59; $i++) { |
68 | 68 | if ($i <= 9) { |
69 | - $index = 'm0' . $i; |
|
69 | + $index = 'm0'.$i; |
|
70 | 70 | } else { |
71 | - $index = 'm' . $i; |
|
71 | + $index = 'm'.$i; |
|
72 | 72 | } |
73 | - $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']]['d' . $data['day']]['h' . $data['hour']][$index] = $data[$index]; |
|
73 | + $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']]['d'.$data['day']]['h'.$data['hour']][$index] = $data[$index]; |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
@@ -106,11 +106,11 @@ discard block |
||
106 | 106 | $command .= "$day = $value,"; |
107 | 107 | } |
108 | 108 | $command = rtrim($command, ','); |
109 | - $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month"; |
|
109 | + $command .= " WHERE unit_id = ".$event->getUnitId()." AND year = $year AND month = $month"; |
|
110 | 110 | $this->pdo->exec($command); |
111 | 111 | } |
112 | 112 | else { |
113 | - $this->pdo->exec("INSERT INTO $this->day_table (unit_id, year, month, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . implode(', ', $values) . ")"); |
|
113 | + $this->pdo->exec("INSERT INTO $this->day_table (unit_id, year, month, ".implode(', ', $keys).") VALUES (".$event->getUnitId().", $year, $month, ".implode(', ', $values).")"); |
|
114 | 114 | } |
115 | 115 | } |
116 | 116 | } |
@@ -126,14 +126,14 @@ discard block |
||
126 | 126 | $keys = array_keys($hours); |
127 | 127 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_HOUR][$year][$month][$day])) { |
128 | 128 | $command = "UPDATE $this->hour_table SET "; |
129 | - foreach ($hours as $hour => $value){ |
|
129 | + foreach ($hours as $hour => $value) { |
|
130 | 130 | $command .= "$hour = $value,"; |
131 | 131 | } |
132 | 132 | $command = rtrim($command, ','); |
133 | - $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day,1); |
|
133 | + $command .= " WHERE unit_id = ".$event->getUnitId()." AND year = $year AND month = $month AND day = ".substr($day, 1); |
|
134 | 134 | $this->pdo->exec($command); |
135 | 135 | } else { |
136 | - $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) . ")"); |
|
136 | + $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).")"); |
|
137 | 137 | } |
138 | 138 | } |
139 | 139 | } |
@@ -149,14 +149,14 @@ discard block |
||
149 | 149 | $keys = array_keys($minutes); |
150 | 150 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_MINUTE][$year][$month][$day][$hour])) { |
151 | 151 | $command = "UPDATE $this->minute_table SET "; |
152 | - foreach ($minutes as $minute => $value){ |
|
152 | + foreach ($minutes as $minute => $value) { |
|
153 | 153 | $command .= "$minute = $value,"; |
154 | 154 | } |
155 | 155 | $command = rtrim($command, ','); |
156 | - $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day,1) . " AND hour = " . substr($hour,1); |
|
156 | + $command .= " WHERE unit_id = ".$event->getUnitId()." AND year = $year AND month = $month AND day = ".substr($day, 1)." AND hour = ".substr($hour, 1); |
|
157 | 157 | $this->pdo->exec($command); |
158 | 158 | } else { |
159 | - $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) . ")"); |
|
159 | + $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).")"); |
|
160 | 160 | } |
161 | 161 | } |
162 | 162 | } |
@@ -62,7 +62,7 @@ |
||
62 | 62 | * @return int |
63 | 63 | */ |
64 | 64 | public function getValue() { |
65 | - return (int) $this->value; |
|
65 | + return (int)$this->value; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -44,7 +44,7 @@ |
||
44 | 44 | * {@inheritdoc} |
45 | 45 | */ |
46 | 46 | public function getDefaultValue() { |
47 | - return (int) $this->default_value; |
|
47 | + return (int)$this->default_value; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
@@ -130,8 +130,7 @@ discard block |
||
130 | 130 | // Compare the current states with the set of valid states |
131 | 131 | if ($intersect) { |
132 | 132 | $remaining_states = array_intersect($current_states, $valid_states); |
133 | - } |
|
134 | - else { |
|
133 | + } else { |
|
135 | 134 | $remaining_states = array_diff($current_states, $valid_states); |
136 | 135 | } |
137 | 136 | |
@@ -139,8 +138,7 @@ discard block |
||
139 | 138 | // Unit is in a state that is within the set of valid states so add to result set |
140 | 139 | $units[$unit] = $unit; |
141 | 140 | $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE); |
142 | - } |
|
143 | - else { |
|
141 | + } else { |
|
144 | 142 | $response->addMiss($keyed_units[$unit], CalendarResponse::INVALID_STATE); |
145 | 143 | } |
146 | 144 | |
@@ -234,8 +232,7 @@ discard block |
||
234 | 232 | foreach ($days as $day => $value) { |
235 | 233 | $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]); |
236 | 234 | } |
237 | - } |
|
238 | - else { |
|
235 | + } else { |
|
239 | 236 | foreach ($days as $day => $value) { |
240 | 237 | $result[$year][$month][$day] = $keyed_units[$unit]->getDefaultValue(); |
241 | 238 | } |
@@ -266,8 +263,7 @@ discard block |
||
266 | 263 | foreach ($hours as $hour => $value) { |
267 | 264 | if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
268 | 265 | $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]); |
269 | - } |
|
270 | - else { |
|
266 | + } else { |
|
271 | 267 | // If nothing from db - then revert to the defaults |
272 | 268 | $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue(); |
273 | 269 | } |
@@ -315,8 +311,7 @@ discard block |
||
315 | 311 | foreach ($minutes as $minute => $value) { |
316 | 312 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
317 | 313 | $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]); |
318 | - } |
|
319 | - else { |
|
314 | + } else { |
|
320 | 315 | // If nothing from db - then revert to the defaults |
321 | 316 | $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue(); |
322 | 317 | } |
@@ -365,8 +360,12 @@ discard block |
||
365 | 360 | |
366 | 361 | // Make sure years are sorted |
367 | 362 | ksort($data[Event::BAT_DAY]); |
368 | - if (isset($data[Event::BAT_HOUR])) ksort($data[Event::BAT_HOUR]); |
|
369 | - if (isset($data[Event::BAT_MINUTE])) ksort($data[Event::BAT_MINUTE]); |
|
363 | + if (isset($data[Event::BAT_HOUR])) { |
|
364 | + ksort($data[Event::BAT_HOUR]); |
|
365 | + } |
|
366 | + if (isset($data[Event::BAT_MINUTE])) { |
|
367 | + ksort($data[Event::BAT_MINUTE]); |
|
368 | + } |
|
370 | 369 | |
371 | 370 | // Set up variables to keep track of stuff |
372 | 371 | $current_value = NULL; |
@@ -391,8 +390,7 @@ discard block |
||
391 | 390 | if ($current_value === $minute_value) { |
392 | 391 | // We are still in minutes and going through so add a minute |
393 | 392 | $end_event->add(new \DateInterval('PT1M')); |
394 | - } |
|
395 | - elseif (($current_value != $minute_value) && ($current_value !== NULL)) { |
|
393 | + } elseif (($current_value != $minute_value) && ($current_value !== NULL)) { |
|
396 | 394 | // Value just switched - let us wrap up with current event and start a new one |
397 | 395 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
398 | 396 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
@@ -406,12 +404,10 @@ discard block |
||
406 | 404 | } |
407 | 405 | $current_value = $minute_value; |
408 | 406 | } |
409 | - } |
|
410 | - elseif ($current_value === $hour_value) { |
|
407 | + } elseif ($current_value === $hour_value) { |
|
411 | 408 | // We are in hours and can add something |
412 | 409 | $end_event->add(new \DateInterval('PT1H')); |
413 | - } |
|
414 | - elseif (($current_value != $hour_value) && ($current_value !== NULL)) { |
|
410 | + } elseif (($current_value != $hour_value) && ($current_value !== NULL)) { |
|
415 | 411 | // Value just switched - let us wrap up with current event and start a new one |
416 | 412 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
417 | 413 | // Start event becomes the end event with a minute added |
@@ -428,12 +424,10 @@ discard block |
||
428 | 424 | $current_value = $hour_value; |
429 | 425 | } |
430 | 426 | } |
431 | - } |
|
432 | - elseif ($current_value === $value) { |
|
427 | + } elseif ($current_value === $value) { |
|
433 | 428 | // We are adding a whole day so the end event gets moved to the end of the day we are adding |
434 | 429 | $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
435 | - } |
|
436 | - elseif (($current_value !== $value) && ($current_value !== NULL)) { |
|
430 | + } elseif (($current_value !== $value) && ($current_value !== NULL)) { |
|
437 | 431 | // Value just switched - let us wrap up with current event and start a new one |
438 | 432 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
439 | 433 | // Start event becomes the end event with a minute added |
@@ -468,8 +462,7 @@ discard block |
||
468 | 462 | if ($event->endsLater($end_date)) { |
469 | 463 | $event->setEndDate($end_date); |
470 | 464 | } |
471 | - } |
|
472 | - else { |
|
465 | + } else { |
|
473 | 466 | // Event completely not in range so unset it |
474 | 467 | unset($normalized_events[$unit_id][$key]); |
475 | 468 | } |
@@ -500,8 +493,7 @@ discard block |
||
500 | 493 | $e++; |
501 | 494 | $flipped[$e][$value][$datum] = $datum; |
502 | 495 | $old_value = $value; |
503 | - } |
|
504 | - else { |
|
496 | + } else { |
|
505 | 497 | $flipped[$e][$value][$datum] = $datum; |
506 | 498 | } |
507 | 499 | } |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | // Create a mock itemized event for the period in question - since event data is either |
175 | 175 | // in the database or the default value we first create a mock event and then fill it in |
176 | 176 | // accordingly |
177 | - $mock_event = new Event($start_date, $end_date, new Unit(0,0), $this->default_value); |
|
177 | + $mock_event = new Event($start_date, $end_date, new Unit(0, 0), $this->default_value); |
|
178 | 178 | $itemized = $mock_event->itemize(new EventItemizer($mock_event, $granularity)); |
179 | 179 | |
180 | 180 | // Cycle through each unit retrieved and provide it with a fully configured itemized mock event |
@@ -265,11 +265,11 @@ discard block |
||
265 | 265 | foreach ($days as $day => $hours) { |
266 | 266 | foreach ($hours as $hour => $value) { |
267 | 267 | if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
268 | - $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]); |
|
268 | + $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]); |
|
269 | 269 | } |
270 | 270 | else { |
271 | 271 | // If nothing from db - then revert to the defaults |
272 | - $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
272 | + $result[$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
273 | 273 | } |
274 | 274 | } |
275 | 275 | } |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | foreach ($months as $month => $days) { |
284 | 284 | foreach ($days as $day => $hours) { |
285 | 285 | foreach ($hours as $hour => $value) { |
286 | - $result[$year][$month][$day][$hour] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
286 | + $result[$year][$month][$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
287 | 287 | } |
288 | 288 | ksort($result[$year][$month][$day], SORT_NATURAL); |
289 | 289 | } |
@@ -314,11 +314,11 @@ discard block |
||
314 | 314 | foreach ($hours as $hour => $minutes) { |
315 | 315 | foreach ($minutes as $minute => $value) { |
316 | 316 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
317 | - $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]); |
|
317 | + $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]); |
|
318 | 318 | } |
319 | 319 | else { |
320 | 320 | // If nothing from db - then revert to the defaults |
321 | - $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
321 | + $result[$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
322 | 322 | } |
323 | 323 | } |
324 | 324 | } |
@@ -334,7 +334,7 @@ discard block |
||
334 | 334 | foreach ($days as $day => $hours) { |
335 | 335 | foreach ($hours as $hour => $minutes) { |
336 | 336 | foreach ($minutes as $minute => $value) { |
337 | - $result[$year][$month][$day][$hour][$minute] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
337 | + $result[$year][$month][$day][$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
338 | 338 | } |
339 | 339 | ksort($result[$year][$month][$day][$hour], SORT_NATURAL); |
340 | 340 | } |
@@ -396,12 +396,12 @@ discard block |
||
396 | 396 | // Value just switched - let us wrap up with current event and start a new one |
397 | 397 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
398 | 398 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
399 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
399 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':'.substr($minute, 1)); |
|
400 | 400 | $current_value = $minute_value; |
401 | 401 | } |
402 | 402 | if ($current_value === NULL) { |
403 | 403 | // We are down to minutes and haven't created and event yet - do one now |
404 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
404 | + $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':'.substr($minute, 1)); |
|
405 | 405 | $end_event = clone($start_event); |
406 | 406 | } |
407 | 407 | $current_value = $minute_value; |
@@ -417,21 +417,21 @@ discard block |
||
417 | 417 | // Start event becomes the end event with a minute added |
418 | 418 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
419 | 419 | // End event comes the current point in time |
420 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':59'); |
|
420 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':59'); |
|
421 | 421 | $current_value = $hour_value; |
422 | 422 | } |
423 | 423 | if ($current_value === NULL) { |
424 | 424 | // Got into hours and still haven't created an event so |
425 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':00'); |
|
425 | + $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':00'); |
|
426 | 426 | // We will be occupying at least this hour so might as well mark it |
427 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':59'); |
|
427 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':59'); |
|
428 | 428 | $current_value = $hour_value; |
429 | 429 | } |
430 | 430 | } |
431 | 431 | } |
432 | 432 | elseif ($current_value === $value) { |
433 | 433 | // We are adding a whole day so the end event gets moved to the end of the day we are adding |
434 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
|
434 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59'); |
|
435 | 435 | } |
436 | 436 | elseif (($current_value !== $value) && ($current_value !== NULL)) { |
437 | 437 | // Value just switched - let us wrap up with current event and start a new one |
@@ -439,13 +439,13 @@ discard block |
||
439 | 439 | // Start event becomes the end event with a minute added |
440 | 440 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
441 | 441 | // End event becomes the current day which we have not account for yet |
442 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
|
442 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59'); |
|
443 | 443 | $current_value = $value; |
444 | 444 | } |
445 | 445 | if ($current_value === NULL) { |
446 | 446 | // We have not created an event yet so let's do it now |
447 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '00:00'); |
|
448 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
|
447 | + $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'00:00'); |
|
448 | + $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59'); |
|
449 | 449 | $current_value = $value; |
450 | 450 | } |
451 | 451 | } |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | * @return Unit |
545 | 545 | */ |
546 | 546 | protected function getUnit($unit_id) { |
547 | - $keyed = $this->keyUnitsById(); |
|
547 | + $keyed = $this->keyUnitsById(); |
|
548 | 548 | return $keyed[$unit_id]; |
549 | 549 | } |
550 | 550 |
@@ -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 |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | /** |
36 | 36 | * {@inheritdoc} |
37 | 37 | */ |
38 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
38 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
39 | 39 | parent::applyConstraint($calendar_response); |
40 | 40 | |
41 | 41 | if ($this->start_date === NULL) { |
@@ -45,11 +45,11 @@ discard block |
||
45 | 45 | $this->end_date = new \DateTime('2999-12-31'); |
46 | 46 | } |
47 | 47 | |
48 | - if ( (($calendar_response->getStartDate()->getTimestamp() >= $this->start_date->getTimestamp() && |
|
48 | + if ((($calendar_response->getStartDate()->getTimestamp() >= $this->start_date->getTimestamp() && |
|
49 | 49 | $calendar_response->getStartDate()->getTimestamp() <= $this->end_date->getTimestamp()) || |
50 | 50 | ($calendar_response->getStartDate()->getTimestamp() <= $this->start_date->getTimestamp() && |
51 | 51 | $calendar_response->getEndDate()->getTimestamp() >= $this->end_date->getTimestamp())) && |
52 | - $this->checkin_day != $calendar_response->getStartDate()->format('N') ) { |
|
52 | + $this->checkin_day != $calendar_response->getStartDate()->format('N')) { |
|
53 | 53 | |
54 | 54 | $units = $this->getUnits(); |
55 | 55 |
@@ -52,7 +52,7 @@ discard block |
||
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) { |
@@ -62,13 +62,13 @@ discard block |
||
62 | 62 | $this->end_date = new \DateTime('2999-12-31'); |
63 | 63 | } |
64 | 64 | |
65 | - if ( (($calendar_response->getStartDate()->getTimestamp() >= $this->start_date->getTimestamp() && |
|
65 | + if ((($calendar_response->getStartDate()->getTimestamp() >= $this->start_date->getTimestamp() && |
|
66 | 66 | $calendar_response->getStartDate()->getTimestamp() <= $this->end_date->getTimestamp()) || |
67 | 67 | ($calendar_response->getEndDate()->getTimestamp() >= $this->start_date->getTimestamp() && |
68 | 68 | $calendar_response->getEndDate()->getTimestamp() <= $this->end_date->getTimestamp()) || |
69 | 69 | ($calendar_response->getStartDate()->getTimestamp() <= $this->start_date->getTimestamp() && |
70 | 70 | $calendar_response->getEndDate()->getTimestamp() >= $this->end_date->getTimestamp())) && |
71 | - ($this->checkin_day === NULL || $this->checkin_day == $calendar_response->getStartDate()->format('N')) ) { |
|
71 | + ($this->checkin_day === NULL || $this->checkin_day == $calendar_response->getStartDate()->format('N'))) { |
|
72 | 72 | |
73 | 73 | $units = $this->getUnits(); |
74 | 74 | |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | $text = ''; |
108 | 108 | |
109 | 109 | // Min/max stay length constraint variables. |
110 | - $minimum_stay = empty($this->min_days) ? '' : (($this->min_days == 1) ? $this->min_days . ' day' : $this->min_days . ' days'); |
|
111 | - $maximum_stay = empty($this->max_days) ? '' : (($this->max_days == 1) ? $this->max_days . ' day' : $this->max_days . ' days'); |
|
110 | + $minimum_stay = empty($this->min_days) ? '' : (($this->min_days == 1) ? $this->min_days.' day' : $this->min_days.' days'); |
|
111 | + $maximum_stay = empty($this->max_days) ? '' : (($this->max_days == 1) ? $this->max_days.' day' : $this->max_days.' days'); |
|
112 | 112 | |
113 | 113 | // Day of the week constraint variable. |
114 | 114 | $day_of_the_week = $this->getWeekDay($this->checkin_day); |