@@ -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 |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
28 | 28 | |
29 | - $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
29 | + $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
30 | 30 | |
31 | 31 | $results = array(); |
32 | 32 | // Run each query and store results |
@@ -37,30 +37,30 @@ discard block |
||
37 | 37 | $db_events = array(); |
38 | 38 | |
39 | 39 | // Cycle through day results and setup an event array |
40 | - while( $data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
40 | + while ($data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
41 | 41 | // Figure out how many days the current month has |
42 | 42 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
43 | 43 | $days_in_month = (int)$temp_date->format('t'); |
44 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
45 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i]; |
|
44 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
45 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
49 | 49 | // With the day events taken care off let's cycle through hours |
50 | - while( $data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
51 | - for ($i = 0; $i<=23; $i++) { |
|
52 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h'. $i] = $data['h'.$i]; |
|
50 | + while ($data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
51 | + for ($i = 0; $i <= 23; $i++) { |
|
52 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h' . $i] = $data['h' . $i]; |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
56 | 56 | // With the hour events taken care off let's cycle through minutes |
57 | - while( $data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
58 | - for ($i = 0; $i<=59; $i++) { |
|
57 | + while ($data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
58 | + for ($i = 0; $i <= 59; $i++) { |
|
59 | 59 | if ($i <= 9) { |
60 | - $index = 'm0'.$i; |
|
60 | + $index = 'm0' . $i; |
|
61 | 61 | } |
62 | 62 | else { |
63 | - $index = 'm'.$i; |
|
63 | + $index = 'm' . $i; |
|
64 | 64 | } |
65 | 65 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
66 | 66 | } |
@@ -100,16 +100,16 @@ |
||
100 | 100 | |
101 | 101 | $query_parameters = ''; |
102 | 102 | |
103 | - foreach($itemized[Event::BAT_DAY] as $year => $months) { |
|
103 | + foreach ($itemized[Event::BAT_DAY] as $year => $months) { |
|
104 | 104 | if ($year_count > 0) { |
105 | 105 | // We are dealing with multiple years so add an OR |
106 | 106 | $query_parameters .= ' OR '; |
107 | 107 | } |
108 | 108 | $query_parameters .= 'year IN (' . $year . ') '; |
109 | - $query_parameters .= 'AND month IN (' . implode("," ,array_keys($months)) .') '; |
|
109 | + $query_parameters .= 'AND month IN (' . implode(",", array_keys($months)) . ') '; |
|
110 | 110 | if (count($unit_ids) > 0) { |
111 | 111 | // Unit ids are defined so add this as a filter |
112 | - $query_parameters .= 'AND unit_id in (' . implode("," , $unit_ids) .') '; |
|
112 | + $query_parameters .= 'AND unit_id in (' . implode(",", $unit_ids) . ') '; |
|
113 | 113 | } |
114 | 114 | $year_count++; |
115 | 115 | } |
@@ -87,7 +87,7 @@ |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
90 | - * @return array |
|
90 | + * @return null|Constraint |
|
91 | 91 | */ |
92 | 92 | public function getIncluded() { |
93 | 93 | return $this->included_set; |
@@ -167,7 +167,7 @@ |
||
167 | 167 | } |
168 | 168 | |
169 | 169 | /** |
170 | - * @param $day |
|
170 | + * @param integer $day |
|
171 | 171 | * @return string |
172 | 172 | */ |
173 | 173 | private function getWeekDay($day) { |
@@ -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 |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | /** |
86 | 86 | * Returns the start date. |
87 | 87 | * |
88 | - * @return DateTime |
|
88 | + * @return \DateTime |
|
89 | 89 | */ |
90 | 90 | public function getStartDate() { |
91 | 91 | return clone($this->start_date); |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | /** |
103 | 103 | * Set the start date. |
104 | 104 | * |
105 | - * @param DateTime $start_date |
|
105 | + * @param \DateTime $start_date |
|
106 | 106 | */ |
107 | 107 | public function setStartDate(\DateTime $start_date) { |
108 | 108 | $this->start_date = clone($start_date); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | /** |
112 | 112 | * Returns the end date. |
113 | 113 | * |
114 | - * @return DateTime |
|
114 | + * @return \DateTime |
|
115 | 115 | */ |
116 | 116 | public function getEndDate() { |
117 | 117 | return clone($this->end_date); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | /** |
129 | 129 | * Set the end date. |
130 | 130 | * |
131 | - * @param DateTime $end_date |
|
131 | + * @param \DateTime $end_date |
|
132 | 132 | */ |
133 | 133 | public function setEndDate(\DateTime $end_date) { |
134 | 134 | $this->end_date = clone($end_date); |
@@ -240,6 +240,7 @@ discard block |
||
240 | 240 | |
241 | 241 | /** |
242 | 242 | * {@inheritdoc} |
243 | + * @param \DateTime $date |
|
243 | 244 | */ |
244 | 245 | public function isLastMonth($date) { |
245 | 246 | if ($date->format("n") == $this->endMonth() && $date->format("Y") == $this->endYear()) { |
@@ -608,7 +609,7 @@ discard block |
||
608 | 609 | /** |
609 | 610 | * Saves an event to whatever Drupal tables are defined in the store array |
610 | 611 | * |
611 | - * @param \ROomify\Bat\\Store\Store $store |
|
612 | + * @param Store $store |
|
612 | 613 | * @param string $granularity |
613 | 614 | * |
614 | 615 | * @throws \Exception |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | } |
491 | 491 | |
492 | 492 | // Deal with the end date unless it ends just before midnight at which point we don't need to go further |
493 | - if ($this->end_date->format('H:i') == '23:59' ) { |
|
493 | + if ($this->end_date->format('H:i') == '23:59') { |
|
494 | 494 | $itemized[AbstractEvent::BAT_HOUR][$ey][$em]['d' . $ed] = array(); |
495 | 495 | $itemized[AbstractEvent::BAT_MINUTE][$ey][$em]['d' . $ed] = array(); |
496 | 496 | } else { |
@@ -518,14 +518,14 @@ discard block |
||
518 | 518 | |
519 | 519 | $counter = (int)$period_start->format('i'); |
520 | 520 | $start_minute = $counter; |
521 | - foreach($period as $minute) { |
|
521 | + foreach ($period as $minute) { |
|
522 | 522 | // Doing minutes so set the values in the minute array |
523 | - $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]['m' .$minute->format('i')] = $this->getValue(); |
|
523 | + $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->getValue(); |
|
524 | 524 | // Let the hours know that it cannot determine availability |
525 | - $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')] = -1; |
|
525 | + $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1; |
|
526 | 526 | $counter++; |
527 | 527 | |
528 | - if ($counter == 60 && $start_minute!==0) { |
|
528 | + if ($counter == 60 && $start_minute !== 0) { |
|
529 | 529 | // Not a real hour - leave as is and move on |
530 | 530 | $counter = 0; |
531 | 531 | $start_minute = 0; |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | // Did a real whole hour so initialize the hour |
535 | 535 | $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue(); |
536 | 536 | // We have a whole hour so get rid of the minute info |
537 | - unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]); |
|
537 | + unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]); |
|
538 | 538 | $counter = 0; |
539 | 539 | $start_minute = 0; |
540 | 540 | } |
@@ -555,12 +555,12 @@ discard block |
||
555 | 555 | // Set the end date to the last day of the month so that we are sure to get that last month |
556 | 556 | $adjusted_end_day = new \DateTime($this->end_date->format('Y-n-t')); |
557 | 557 | |
558 | - $daterange = new \DatePeriod($this->start_date, $interval ,$adjusted_end_day); |
|
558 | + $daterange = new \DatePeriod($this->start_date, $interval, $adjusted_end_day); |
|
559 | 559 | |
560 | 560 | $itemized = array(); |
561 | 561 | |
562 | 562 | // Cycle through each month |
563 | - foreach($daterange as $date) { |
|
563 | + foreach ($daterange as $date) { |
|
564 | 564 | |
565 | 565 | $year = $date->format("Y"); |
566 | 566 | $dayinterval = new \DateInterval('P1D'); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
36 | 36 | |
37 | - $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
37 | + $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
38 | 38 | |
39 | 39 | $results = array(); |
40 | 40 | // Run each query and store results |
@@ -49,26 +49,26 @@ discard block |
||
49 | 49 | // Figure out how many days the current month has |
50 | 50 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
51 | 51 | $days_in_month = (int)$temp_date->format('t'); |
52 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
53 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i]; |
|
52 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
53 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | |
57 | 57 | // With the day events taken care off let's cycle through hours |
58 | 58 | foreach ($results[Event::BAT_HOUR]->fetchAll() as $data) { |
59 | - for ($i = 0; $i<=23; $i++) { |
|
60 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h'. $i] = $data['h'.$i]; |
|
59 | + for ($i = 0; $i <= 23; $i++) { |
|
60 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h' . $i] = $data['h' . $i]; |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
64 | 64 | // With the hour events taken care off let's cycle through minutes |
65 | 65 | foreach ($results[Event::BAT_MINUTE]->fetchAll() as $data) { |
66 | - for ($i = 0; $i<=59; $i++) { |
|
66 | + for ($i = 0; $i <= 59; $i++) { |
|
67 | 67 | if ($i <= 9) { |
68 | - $index = 'm0'.$i; |
|
68 | + $index = 'm0' . $i; |
|
69 | 69 | } |
70 | 70 | else { |
71 | - $index = 'm'.$i; |
|
71 | + $index = 'm' . $i; |
|
72 | 72 | } |
73 | 73 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
74 | 74 | } |
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | // Because SQLite does not have a nice merge first we have to check if a row exists to determine whether to do an insert or an update |
103 | 103 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month])) { |
104 | 104 | $command = "UPDATE $this->day_table SET "; |
105 | - foreach ($days as $day => $value){ |
|
106 | - $command .= "$day = $value,"; |
|
105 | + foreach ($days as $day => $value) { |
|
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 | } else { |
112 | 112 | $this->pdo->exec("INSERT INTO $this->day_table (unit_id, year, month, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . implode(', ', $values) . ")"); |
@@ -125,11 +125,11 @@ discard block |
||
125 | 125 | $keys = array_keys($hours); |
126 | 126 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month][$day])) { |
127 | 127 | $command = "UPDATE $this->hour_table SET "; |
128 | - foreach ($hours as $hour => $value){ |
|
129 | - $command .= "$hour = $value,"; |
|
128 | + foreach ($hours as $hour => $value) { |
|
129 | + $command .= "$hour = $value,"; |
|
130 | 130 | } |
131 | 131 | $command = rtrim($command, ','); |
132 | - $command .= " WHERE unit_id = " . $event->getUnitId() ." AND year = $year AND month = $month AND day = ". substr($day,1); |
|
132 | + $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day, 1); |
|
133 | 133 | $this->pdo->exec($command); |
134 | 134 | } else { |
135 | 135 | $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) . ")"); |
@@ -148,11 +148,11 @@ discard block |
||
148 | 148 | $keys = array_keys($minutes); |
149 | 149 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month][$day][$hour])) { |
150 | 150 | $command = "UPDATE $this->minute_table SET "; |
151 | - foreach ($minutes as $minute => $value){ |
|
152 | - $command .= "$minute = $value,"; |
|
151 | + foreach ($minutes as $minute => $value) { |
|
152 | + $command .= "$minute = $value,"; |
|
153 | 153 | } |
154 | 154 | $command = rtrim($command, ','); |
155 | - $command .= " WHERE unit_id = " . $event->getUnitId() ." AND year = $year AND month = $month AND day = ". substr($day,1) . " AND hour = " . substr($hour,1); |
|
155 | + $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day, 1) . " AND hour = " . substr($hour, 1); |
|
156 | 156 | $this->pdo->exec($command); |
157 | 157 | } else { |
158 | 158 | $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) . ")"); |