@@ -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 |
@@ -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 | /** |
@@ -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); |
@@ -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 |
@@ -59,15 +59,15 @@ discard block |
||
59 | 59 | $this->event_type = $event_type; |
60 | 60 | |
61 | 61 | if ($event_data == SqlDBStore::BAT_STATE) { |
62 | - $this->day_table = $prefix . 'bat_event_' . $event_type . '_day_' . SqlDBStore::BAT_STATE; |
|
63 | - $this->hour_table = $prefix . 'bat_event_' . $event_type . '_hour_' . SqlDBStore::BAT_STATE; |
|
64 | - $this->minute_table = $prefix . 'bat_event_' . $event_type . '_minute_' . SqlDBStore::BAT_STATE; |
|
62 | + $this->day_table = $prefix.'bat_event_'.$event_type.'_day_'.SqlDBStore::BAT_STATE; |
|
63 | + $this->hour_table = $prefix.'bat_event_'.$event_type.'_hour_'.SqlDBStore::BAT_STATE; |
|
64 | + $this->minute_table = $prefix.'bat_event_'.$event_type.'_minute_'.SqlDBStore::BAT_STATE; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | if ($event_data == SqlDBStore::BAT_EVENT) { |
68 | - $this->day_table = $prefix . 'bat_event_' . $event_type . '_day_' . SqlDBStore::BAT_EVENT; |
|
69 | - $this->hour_table = $prefix . 'bat_event_' . $event_type . '_hour_' . SqlDBStore::BAT_EVENT; |
|
70 | - $this->minute_table = $prefix . 'bat_event_' . $event_type . '_minute_' . SqlDBStore::BAT_EVENT; |
|
68 | + $this->day_table = $prefix.'bat_event_'.$event_type.'_day_'.SqlDBStore::BAT_EVENT; |
|
69 | + $this->hour_table = $prefix.'bat_event_'.$event_type.'_hour_'.SqlDBStore::BAT_EVENT; |
|
70 | + $this->minute_table = $prefix.'bat_event_'.$event_type.'_minute_'.SqlDBStore::BAT_EVENT; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | } |
@@ -82,9 +82,9 @@ discard block |
||
82 | 82 | public function buildQueries(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
83 | 83 | $queries = array(); |
84 | 84 | |
85 | - $queries[Event::BAT_DAY] = 'SELECT * FROM ' . $this->day_table . ' WHERE '; |
|
86 | - $queries[Event::BAT_HOUR] = 'SELECT * FROM ' . $this->hour_table . ' WHERE '; |
|
87 | - $queries[Event::BAT_MINUTE] = 'SELECT * FROM ' . $this->minute_table . ' WHERE '; |
|
85 | + $queries[Event::BAT_DAY] = 'SELECT * FROM '.$this->day_table.' WHERE '; |
|
86 | + $queries[Event::BAT_HOUR] = 'SELECT * FROM '.$this->hour_table.' WHERE '; |
|
87 | + $queries[Event::BAT_MINUTE] = 'SELECT * FROM '.$this->minute_table.' WHERE '; |
|
88 | 88 | |
89 | 89 | // Create a mock event which we will use to determine how to query the database |
90 | 90 | $mock_event = new Event($start_date, $end_date, new Unit(0, 0, NULL), -10); |
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | // We are dealing with multiple years so add an OR |
103 | 103 | $query_parameters .= ' OR '; |
104 | 104 | } |
105 | - $query_parameters .= 'year IN (' . $year . ') '; |
|
106 | - $query_parameters .= 'AND month IN (' . implode(",", array_keys($months)) . ') '; |
|
105 | + $query_parameters .= 'year IN ('.$year.') '; |
|
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 | } |