@@ -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 | |
@@ -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 | |
@@ -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 | |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | $start = TRUE; |
| 135 | 135 | |
| 136 | 136 | // Cycle through each month |
| 137 | - foreach($daterange as $date) { |
|
| 137 | + foreach ($daterange as $date) { |
|
| 138 | 138 | |
| 139 | 139 | // Check if we have |
| 140 | - if (($date->format('Y-n') != $old_month) || ($start)) { |
|
| 140 | + if (($date->format('Y-n') != $old_month) || ($start)) { |
|
| 141 | 141 | |
| 142 | 142 | $year = $date->format("Y"); |
| 143 | 143 | $dayinterval = new \DateInterval('P1D'); |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | // Deal with the end date unless it ends just before midnight at which point we don't need to go further |
| 234 | - if ($this->event->getEndDate()->format('H:i') == '23:59' ) { |
|
| 234 | + if ($this->event->getEndDate()->format('H:i') == '23:59') { |
|
| 235 | 235 | $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
| 236 | 236 | $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
| 237 | 237 | } else { |
@@ -259,14 +259,14 @@ discard block |
||
| 259 | 259 | |
| 260 | 260 | $counter = (int)$period_start->format('i'); |
| 261 | 261 | $start_minute = $counter; |
| 262 | - foreach($period as $minute) { |
|
| 262 | + foreach ($period as $minute) { |
|
| 263 | 263 | // Doing minutes so set the values in the minute array |
| 264 | - $itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]['m' .$minute->format('i')] = $this->event->getValue(); |
|
| 264 | + $itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->event->getValue(); |
|
| 265 | 265 | // Let the hours know that it cannot determine availability |
| 266 | - $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')] = -1; |
|
| 266 | + $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1; |
|
| 267 | 267 | $counter++; |
| 268 | 268 | |
| 269 | - if ($counter == 60 && $start_minute!==0) { |
|
| 269 | + if ($counter == 60 && $start_minute !== 0) { |
|
| 270 | 270 | // Not a real hour - leave as is and move on |
| 271 | 271 | $counter = 0; |
| 272 | 272 | $start_minute = 0; |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | // Did a real whole hour so initialize the hour |
| 276 | 276 | $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->event->getValue(); |
| 277 | 277 | // We have a whole hour so get rid of the minute info |
| 278 | - unset($itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]); |
|
| 278 | + unset($itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]); |
|
| 279 | 279 | $counter = 0; |
| 280 | 280 | $start_minute = 0; |
| 281 | 281 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
| 29 | 29 | |
| 30 | - $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
| 30 | + $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
| 31 | 31 | |
| 32 | 32 | $results = array(); |
| 33 | 33 | // Run each query and store results |
@@ -38,30 +38,30 @@ discard block |
||
| 38 | 38 | $db_events = array(); |
| 39 | 39 | |
| 40 | 40 | // Cycle through day results and setup an event array |
| 41 | - while( $data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
| 41 | + while ($data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
| 42 | 42 | // Figure out how many days the current month has |
| 43 | 43 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
| 44 | 44 | $days_in_month = (int)$temp_date->format('t'); |
| 45 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
| 46 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i]; |
|
| 45 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
| 46 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | // With the day events taken care off let's cycle through hours |
| 51 | - while( $data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
| 52 | - for ($i = 0; $i<=23; $i++) { |
|
| 53 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d' . $data['day']]['h'. $i] = $data['h'.$i]; |
|
| 51 | + while ($data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
| 52 | + for ($i = 0; $i <= 23; $i++) { |
|
| 53 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d' . $data['day']]['h' . $i] = $data['h' . $i]; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | // With the hour events taken care off let's cycle through minutes |
| 58 | - while( $data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
| 59 | - for ($i = 0; $i<=59; $i++) { |
|
| 58 | + while ($data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
| 59 | + for ($i = 0; $i <= 59; $i++) { |
|
| 60 | 60 | if ($i <= 9) { |
| 61 | - $index = 'm0'.$i; |
|
| 61 | + $index = 'm0' . $i; |
|
| 62 | 62 | } |
| 63 | 63 | else { |
| 64 | - $index = 'm'.$i; |
|
| 64 | + $index = 'm' . $i; |
|
| 65 | 65 | } |
| 66 | 66 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']]['d' . $data['day']]['h' . $data['hour']][$index] = $data[$index]; |
| 67 | 67 | } |
@@ -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 | |
@@ -106,7 +106,7 @@ |
||
| 106 | 106 | $query_parameters .= 'AND month IN (' . implode(",", array_keys($months)) . ') '; |
| 107 | 107 | if (count($unit_ids) > 0) { |
| 108 | 108 | // Unit ids are defined so add this as a filter |
| 109 | - $query_parameters .= 'AND unit_id in (' . implode("," , $unit_ids) . ') '; |
|
| 109 | + $query_parameters .= 'AND unit_id in (' . implode(",", $unit_ids) . ') '; |
|
| 110 | 110 | } |
| 111 | 111 | $year_count++; |
| 112 | 112 | } |
@@ -16,27 +16,27 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | class EventInterval { |
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Return the number of times a duration fits into the start and end date taking into account |
|
| 21 | - * BAT's consideration that the end time for a BAT event includes that last minute. |
|
| 22 | - * |
|
| 23 | - * @param \DateTime $start_date |
|
| 24 | - * @param \DateTime $end_date |
|
| 25 | - * @param \DateInterval $duration |
|
| 26 | - * |
|
| 27 | - * @return float |
|
| 28 | - */ |
|
| 29 | - public static function divide(\DateTime $start_date, \DateTime $end_date, \DateInterval $duration) { |
|
| 30 | - // Clone so that we don't change the original object. We are not using ImmutableDateTime to support PHP5.4 |
|
| 31 | - $temp_end_date = clone($end_date); |
|
| 32 | - |
|
| 33 | - // Add a minute to deal with the fact that BAT considers the last minute included |
|
| 34 | - $temp_end_date->add(new \DateInterval('PT1M')); |
|
| 35 | - |
|
| 36 | - // Convert everything to seconds and calculate exactly how many times the duration fits in our event length |
|
| 37 | - $duration_seconds = $duration->d * 86400 + $duration->h * 3600 + $duration->i * 60 + $duration->s; |
|
| 38 | - |
|
| 39 | - return ($temp_end_date->getTimestamp() - $start_date->getTimestamp()) / $duration_seconds; |
|
| 40 | - } |
|
| 19 | + /** |
|
| 20 | + * Return the number of times a duration fits into the start and end date taking into account |
|
| 21 | + * BAT's consideration that the end time for a BAT event includes that last minute. |
|
| 22 | + * |
|
| 23 | + * @param \DateTime $start_date |
|
| 24 | + * @param \DateTime $end_date |
|
| 25 | + * @param \DateInterval $duration |
|
| 26 | + * |
|
| 27 | + * @return float |
|
| 28 | + */ |
|
| 29 | + public static function divide(\DateTime $start_date, \DateTime $end_date, \DateInterval $duration) { |
|
| 30 | + // Clone so that we don't change the original object. We are not using ImmutableDateTime to support PHP5.4 |
|
| 31 | + $temp_end_date = clone($end_date); |
|
| 32 | + |
|
| 33 | + // Add a minute to deal with the fact that BAT considers the last minute included |
|
| 34 | + $temp_end_date->add(new \DateInterval('PT1M')); |
|
| 35 | + |
|
| 36 | + // Convert everything to seconds and calculate exactly how many times the duration fits in our event length |
|
| 37 | + $duration_seconds = $duration->d * 86400 + $duration->h * 3600 + $duration->i * 60 + $duration->s; |
|
| 38 | + |
|
| 39 | + return ($temp_end_date->getTimestamp() - $start_date->getTimestamp()) / $duration_seconds; |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | 42 | } |