@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $current_states = array_keys($unit_states); |
126 | 126 | // Compare the current states with the set of valid states |
127 | 127 | $remaining_states = array_diff($current_states, $valid_states); |
128 | - if (count($remaining_states) == 0 ) { |
|
128 | + if (count($remaining_states) == 0) { |
|
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); |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | // Create a mock itemized event for the period in question - since event data is either |
165 | 165 | // in the database or the default value we first create a mock event and then fill it in |
166 | 166 | // accordingly |
167 | - $mock_event = new Event($start_date, $end_date, new Unit(0,0), $this->default_value); |
|
167 | + $mock_event = new Event($start_date, $end_date, new Unit(0, 0), $this->default_value); |
|
168 | 168 | $itemized = $mock_event->itemize(new EventItemizer($mock_event, $granularity)); |
169 | 169 | |
170 | 170 | // Cycle through each unit retrieved and provide it with a fully configured itemized mock event |
@@ -255,11 +255,11 @@ discard block |
||
255 | 255 | foreach ($days as $day => $hours) { |
256 | 256 | foreach ($hours as $hour => $value) { |
257 | 257 | if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
258 | - $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]); |
|
258 | + $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 | 259 | } |
260 | 260 | else { |
261 | 261 | // If nothing from db - then revert to the defaults |
262 | - $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
262 | + $result[$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
263 | 263 | } |
264 | 264 | } |
265 | 265 | } |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | foreach ($months as $month => $days) { |
274 | 274 | foreach ($days as $day => $hours) { |
275 | 275 | foreach ($hours as $hour => $value) { |
276 | - $result[$year][$month][$day][$hour] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
276 | + $result[$year][$month][$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
277 | 277 | } |
278 | 278 | ksort($result[$year][$month][$day], SORT_NATURAL); |
279 | 279 | } |
@@ -304,11 +304,11 @@ discard block |
||
304 | 304 | foreach ($hours as $hour => $minutes) { |
305 | 305 | foreach ($minutes as $minute => $value) { |
306 | 306 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
307 | - $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]); |
|
307 | + $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 | 308 | } |
309 | 309 | else { |
310 | 310 | // If nothing from db - then revert to the defaults |
311 | - $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue(); |
|
311 | + $result[$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue(); |
|
312 | 312 | } |
313 | 313 | } |
314 | 314 | } |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | foreach ($days as $day => $hours) { |
325 | 325 | foreach ($hours as $hour => $minutes) { |
326 | 326 | foreach ($minutes as $minute => $value) { |
327 | - $result[$year][$month][$day][$hour][$minute] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value); |
|
327 | + $result[$year][$month][$day][$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
328 | 328 | } |
329 | 329 | ksort($result[$year][$month][$day][$hour], SORT_NATURAL); |
330 | 330 | } |
@@ -386,12 +386,12 @@ discard block |
||
386 | 386 | // Value just switched - let us wrap up with current event and start a new one |
387 | 387 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
388 | 388 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
389 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
389 | + $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); |
|
390 | 390 | $current_value = $minute_value; |
391 | 391 | } |
392 | 392 | if ($current_value === NULL) { |
393 | 393 | // We are down to minutes and haven't created and event yet - do one now |
394 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
394 | + $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); |
|
395 | 395 | $end_event = clone($start_event); |
396 | 396 | } |
397 | 397 | $current_value = $minute_value; |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | * @return Unit |
535 | 535 | */ |
536 | 536 | protected function getUnit($unit_id) { |
537 | - $keyed = $this->keyUnitsById(); |
|
537 | + $keyed = $this->keyUnitsById(); |
|
538 | 538 | return $keyed[$unit_id]; |
539 | 539 | } |
540 | 540 |