| @@ -15,11 +15,11 @@ | ||
| 15 | 15 | */ | 
| 16 | 16 |  class Calendar extends AbstractCalendar { | 
| 17 | 17 | |
| 18 | - /** | |
| 19 | - * @param $units | |
| 20 | - * @param $store | |
| 21 | - * @param $default_value | |
| 22 | - */ | |
| 18 | + /** | |
| 19 | + * @param $units | |
| 20 | + * @param $store | |
| 21 | + * @param $default_value | |
| 22 | + */ | |
| 23 | 23 |    public function __construct($units, $store, $default_value = 0) { | 
| 24 | 24 | $this->units = $units; | 
| 25 | 25 | $this->store = $store; | 
| @@ -126,8 +126,7 @@ | ||
| 126 | 126 | unset($this->included_set[$unit->getUnitId()]); | 
| 127 | 127 | $this->addMiss($unit, $reason, $constraint); | 
| 128 | 128 | return TRUE; | 
| 129 | - } | |
| 130 | -    else { | |
| 129 | +    } else { | |
| 131 | 130 | return FALSE; | 
| 132 | 131 | } | 
| 133 | 132 | } | 
| @@ -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; | 
| @@ -405,8 +405,7 @@ discard block | ||
| 405 | 405 | $itemized[BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[BAT_HOUR][$sy][$sm]['d' . $sd]; | 
| 406 | 406 | $itemized[BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[BAT_MINUTE][$sy][$sm]['d' . $sd]; | 
| 407 | 407 | } | 
| 408 | - } | |
| 409 | -    else { | |
| 408 | +    } else { | |
| 410 | 409 | // Deal with the start day unless it starts on midnight precisely at which point the whole day is booked | 
| 411 | 410 |        if (!($this->start_date->format('H:i') == '00:00')) { | 
| 412 | 411 |          $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59"))); | 
| @@ -414,8 +413,7 @@ discard block | ||
| 414 | 413 | $itemized[BAT_DAY][$sy][$sm]['d' . $sd] = -1; | 
| 415 | 414 | $itemized[BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[BAT_HOUR][$sy][$sm]['d' . $sd]; | 
| 416 | 415 | $itemized[BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[BAT_MINUTE][$sy][$sm]['d' . $sd]; | 
| 417 | - } | |
| 418 | -      else { | |
| 416 | +      } else { | |
| 419 | 417 | // Just set an empty hour and minute | 
| 420 | 418 | $itemized[BAT_HOUR][$sy][$sm]['d' . $sd] = array(); | 
| 421 | 419 | $itemized[BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); | 
| @@ -455,8 +453,7 @@ discard block | ||
| 455 | 453 | // Not a real hour - leave as is and move on | 
| 456 | 454 | $counter = 0; | 
| 457 | 455 | $start_minute = 0; | 
| 458 | - } | |
| 459 | -      elseif ($counter == 60 && $start_minute == 0) { | |
| 456 | +      } elseif ($counter == 60 && $start_minute == 0) { | |
| 460 | 457 | // Did a real whole hour so initialize the hour | 
| 461 | 458 |          $itemized[BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue(); | 
| 462 | 459 | // We have a whole hour so get rid of the minute info | 
| @@ -497,8 +494,7 @@ discard block | ||
| 497 | 494 | // If we are in the same month the end date is the end date of the event | 
| 498 | 495 |          if ($this->isSameMonth()) { | 
| 499 | 496 |            $dayrange = new \DatePeriod($this->start_date, $dayinterval, new \DateTime($this->end_date->format("Y-n-j 23:59:59"))); | 
| 500 | - } | |
| 501 | -        else { // alternatively it is the last day of the start month | |
| 497 | +        } else { // alternatively it is the last day of the start month | |
| 502 | 498 | $dayrange = new \DatePeriod($this->start_date, $dayinterval, $this->endMonthDate($this->start_date)); | 
| 503 | 499 | } | 
| 504 | 500 |          foreach ($dayrange as $day) { | 
| @@ -444,14 +444,14 @@ discard block | ||
| 444 | 444 | |
| 445 | 445 |      $counter = (int)$period_start->format('i'); | 
| 446 | 446 | $start_minute = $counter; | 
| 447 | -    foreach($period as $minute) { | |
| 447 | +    foreach ($period as $minute) { | |
| 448 | 448 | // Doing minutes so set the values in the minute array | 
| 449 | -      $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]['m' .$minute->format('i')] = $this->getValue(); | |
| 449 | +      $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->getValue(); | |
| 450 | 450 | // Let the hours know that it cannot determine availability | 
| 451 | -      $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')] = -1; | |
| 451 | +      $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1; | |
| 452 | 452 | $counter++; | 
| 453 | 453 | |
| 454 | -      if ($counter == 60 && $start_minute!==0) { | |
| 454 | +      if ($counter == 60 && $start_minute !== 0) { | |
| 455 | 455 | // Not a real hour - leave as is and move on | 
| 456 | 456 | $counter = 0; | 
| 457 | 457 | $start_minute = 0; | 
| @@ -460,7 +460,7 @@ discard block | ||
| 460 | 460 | // Did a real whole hour so initialize the hour | 
| 461 | 461 |          $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue(); | 
| 462 | 462 | // We have a whole hour so get rid of the minute info | 
| 463 | -        unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]); | |
| 463 | +        unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]); | |
| 464 | 464 | $counter = 0; | 
| 465 | 465 | $start_minute = 0; | 
| 466 | 466 | } | 
| @@ -481,12 +481,12 @@ discard block | ||
| 481 | 481 | // Set the end date to the last day of the month so that we are sure to get that last month | 
| 482 | 482 |      $adjusted_end_day = new \DateTime($this->end_date->format('Y-n-t')); | 
| 483 | 483 | |
| 484 | - $daterange = new \DatePeriod($this->start_date, $interval ,$adjusted_end_day); | |
| 484 | + $daterange = new \DatePeriod($this->start_date, $interval, $adjusted_end_day); | |
| 485 | 485 | |
| 486 | 486 | $itemized = array(); | 
| 487 | 487 | |
| 488 | 488 | // Cycle through each month | 
| 489 | -    foreach($daterange as $date) { | |
| 489 | +    foreach ($daterange as $date) { | |
| 490 | 490 | |
| 491 | 491 |        $year = $date->format("Y"); | 
| 492 | 492 |        $dayinterval = new \DateInterval('P1D'); | 
| @@ -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); | 
| @@ -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()) { | 
| @@ -535,7 +536,7 @@ discard block | ||
| 535 | 536 | /** | 
| 536 | 537 | * Saves an event to whatever Drupal tables are defined in the store array | 
| 537 | 538 | * | 
| 538 | - * @param \ROomify\Bat\\Store\Store $store | |
| 539 | + * @param Store $store | |
| 539 | 540 | * @param string $granularity | 
| 540 | 541 | * | 
| 541 | 542 | * @throws \Exception | 
| @@ -110,8 +110,7 @@ discard block | ||
| 110 | 110 |        for ($i = 0; $i<=59; $i++) { | 
| 111 | 111 |          if ($i <= 9) { | 
| 112 | 112 | $index = 'm0'.$i; | 
| 113 | - } | |
| 114 | -        else { | |
| 113 | +        } else { | |
| 115 | 114 | $index = 'm'.$i; | 
| 116 | 115 | } | 
| 117 | 116 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; | 
| @@ -190,8 +189,7 @@ discard block | ||
| 190 | 189 | } | 
| 191 | 190 | } | 
| 192 | 191 | } | 
| 193 | - } | |
| 194 | -    catch (\Exception $e) { | |
| 192 | +    } catch (\Exception $e) { | |
| 195 | 193 | $saved = FALSE; | 
| 196 | 194 | $transaction->rollback(); | 
| 197 | 195 |        watchdog_exception('BAT Event Save Exception', $e); | 
| @@ -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 | } | 
| @@ -70,8 +70,7 @@ discard block | ||
| 70 | 70 | $calendar_response->removeFromMatched($included_set[$unit_id]['unit'], CalendarResponse::CONSTRAINT, $this); | 
| 71 | 71 | |
| 72 | 72 | $this->affected_units[$unit_id] = $included_set[$unit_id]['unit']; | 
| 73 | - } | |
| 74 | -          elseif (is_numeric($this->max_days) && $diff > $this->max_days) { | |
| 73 | +          } elseif (is_numeric($this->max_days) && $diff > $this->max_days) { | |
| 75 | 74 | $calendar_response->removeFromMatched($included_set[$unit_id]['unit'], CalendarResponse::CONSTRAINT, $this); | 
| 76 | 75 | |
| 77 | 76 | $this->affected_units[$unit_id] = $included_set[$unit_id]['unit']; | 
| @@ -122,8 +121,7 @@ discard block | ||
| 122 | 121 |      if ($day_of_the_week) { | 
| 123 | 122 |        if ($start_date && $end_date) { | 
| 124 | 123 |          $text = t('From @start_date to @end_date, if booking starts on @day_of_the_week', $args); | 
| 125 | - } | |
| 126 | -      else { | |
| 124 | +      } else { | |
| 127 | 125 |          $text = t('If booking starts on @day_of_the_week', $args); | 
| 128 | 126 | } | 
| 129 | 127 | } | 
| @@ -132,8 +130,7 @@ discard block | ||
| 132 | 130 |      if ($minimum_stay || $maximum_stay) { | 
| 133 | 131 |        if (empty($text)) { | 
| 134 | 132 |          $text = t('The stay') . ' '; | 
| 135 | - } | |
| 136 | -      else { | |
| 133 | +      } else { | |
| 137 | 134 |          $text .=   ' ' . t('the stay') . ' '; | 
| 138 | 135 | } | 
| 139 | 136 | } | 
| @@ -141,15 +138,12 @@ discard block | ||
| 141 | 138 | // Special case when min stay and max stay are the same. | 
| 142 | 139 |        if ($minimum_stay == $maximum_stay) { | 
| 143 | 140 |          $text .= t('must be for @minimum_stay', $args); | 
| 144 | - } | |
| 145 | -      else { | |
| 141 | +      } else { | |
| 146 | 142 |          $text .= t('must be at least @minimum_stay and at most @maximum_stay', $args); | 
| 147 | 143 | } | 
| 148 | - } | |
| 149 | -    elseif ($minimum_stay) { | |
| 144 | +    } elseif ($minimum_stay) { | |
| 150 | 145 |        $text .= t('must be for at least @minimum_stay', $args); | 
| 151 | - } | |
| 152 | -    elseif ($maximum_stay) { | |
| 146 | +    } elseif ($maximum_stay) { | |
| 153 | 147 |        $text .= t('cannot be more than @maximum_stay', $args); | 
| 154 | 148 | } | 
| 155 | 149 | |
| @@ -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 | |
| @@ -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 | 
| @@ -123,7 +123,7 @@ discard block | ||
| 123 | 123 | $current_states = array_keys($unit_states); | 
| 124 | 124 | // Compare the current states with the set of valid states | 
| 125 | 125 | $remaining_states = array_diff($current_states, $valid_states); | 
| 126 | -      if (count($remaining_states) == 0 ) { | |
| 126 | +      if (count($remaining_states) == 0) { | |
| 127 | 127 | // Unit is in a state that is within the set of valid states so add to result set | 
| 128 | 128 | $units[$unit] = $unit; | 
| 129 | 129 | $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE); | 
| @@ -212,7 +212,7 @@ discard block | ||
| 212 | 212 |          foreach ($months as $month => $days) { | 
| 213 | 213 |            foreach ($days as $day => $hours) { | 
| 214 | 214 |              foreach ($hours as $hour => $value) { | 
| 215 | - $events[$unit][Event::BAT_HOUR][$year][$month]['d'.$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); | |
| 215 | + $events[$unit][Event::BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); | |
| 216 | 216 | } | 
| 217 | 217 | } | 
| 218 | 218 | } | 
| @@ -226,7 +226,7 @@ discard block | ||
| 226 | 226 |              foreach ($hours as $hour => $minutes) { | 
| 227 | 227 |                foreach ($minutes as $minute => $value) { | 
| 228 | 228 |                  if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { | 
| 229 | - $events[$unit][Event::BAT_MINUTE][$year][$month]['d' .$day]['h'.$hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]); | |
| 229 | + $events[$unit][Event::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]); | |
| 230 | 230 | } | 
| 231 | 231 |                  else { | 
| 232 | 232 | // If nothing from db - then revert to the defaults | 
| @@ -244,7 +244,7 @@ discard block | ||
| 244 | 244 |            foreach ($days as $day => $hours) { | 
| 245 | 245 |              foreach ($hours as $hour => $minutes) { | 
| 246 | 246 |                foreach ($minutes as $minute => $value) { | 
| 247 | - $events[$unit][Event::BAT_MINUTE][$year][$month]['d'.$day]['h'.$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); | |
| 247 | + $events[$unit][Event::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); | |
| 248 | 248 | } | 
| 249 | 249 | } | 
| 250 | 250 | } | 
| @@ -316,12 +316,12 @@ discard block | ||
| 316 | 316 | // Value just switched - let us wrap up with current event and start a new one | 
| 317 | 317 | $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $current_value); | 
| 318 | 318 |                        $start_event = clone($end_event->add(new \DateInterval('PT1M'))); | 
| 319 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); | |
| 319 | + $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); | |
| 320 | 320 | $current_value = $minute_value; | 
| 321 | 321 | } | 
| 322 | 322 |                      if ($current_value === NULL) { | 
| 323 | 323 | // We are down to minutes and haven't created and event yet - do one now | 
| 324 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); | |
| 324 | + $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); | |
| 325 | 325 | $end_event = clone($start_event); | 
| 326 | 326 | } | 
| 327 | 327 | $current_value = $minute_value; | 
| @@ -127,8 +127,7 @@ discard block | ||
| 127 | 127 | // Unit is in a state that is within the set of valid states so add to result set | 
| 128 | 128 | $units[$unit] = $unit; | 
| 129 | 129 | $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE); | 
| 130 | - } | |
| 131 | -      else { | |
| 130 | +      } else { | |
| 132 | 131 | $response->addMiss($keyed_units[$unit], CalendarResponse::INVALID_STATE); | 
| 133 | 132 | } | 
| 134 | 133 | |
| @@ -178,8 +177,7 @@ discard block | ||
| 178 | 177 |              foreach ($days as $day => $value) { | 
| 179 | 178 | $events[$unit][Event::BAT_DAY][$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]); | 
| 180 | 179 | } | 
| 181 | - } | |
| 182 | -          else { | |
| 180 | +          } else { | |
| 183 | 181 |              foreach ($days as $day => $value) { | 
| 184 | 182 | $events[$unit][Event::BAT_DAY][$year][$month][$day] = $keyed_units[$unit]->getDefaultValue(); | 
| 185 | 183 | } | 
| @@ -196,8 +194,7 @@ discard block | ||
| 196 | 194 |              foreach ($hours as $hour => $value) { | 
| 197 | 195 |                if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { | 
| 198 | 196 | $events[$unit][Event::BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int)$db_events[$unit][Event::BAT_DAY][$year][$month][$day][$hour] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour]); | 
| 199 | - } | |
| 200 | -              else { | |
| 197 | +              } else { | |
| 201 | 198 | // If nothing from db - then revert to the defaults | 
| 202 | 199 | $events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue(); | 
| 203 | 200 | } | 
| @@ -227,8 +224,7 @@ discard block | ||
| 227 | 224 |                foreach ($minutes as $minute => $value) { | 
| 228 | 225 |                  if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { | 
| 229 | 226 | $events[$unit][Event::BAT_MINUTE][$year][$month]['d' .$day]['h'.$hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]); | 
| 230 | - } | |
| 231 | -                else { | |
| 227 | +                } else { | |
| 232 | 228 | // If nothing from db - then revert to the defaults | 
| 233 | 229 | $events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue(); | 
| 234 | 230 | } | 
| @@ -311,8 +307,7 @@ discard block | ||
| 311 | 307 |                      if ($current_value === $minute_value) { | 
| 312 | 308 | // We are still in minutes and going through so add a minute | 
| 313 | 309 |                        $end_event->add(new \DateInterval('PT1M')); | 
| 314 | - } | |
| 315 | -                    elseif (($current_value != $minute_value) && ($current_value !== NULL)) { | |
| 310 | +                    } elseif (($current_value != $minute_value) && ($current_value !== NULL)) { | |
| 316 | 311 | // Value just switched - let us wrap up with current event and start a new one | 
| 317 | 312 | $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $current_value); | 
| 318 | 313 |                        $start_event = clone($end_event->add(new \DateInterval('PT1M'))); | 
| @@ -326,12 +321,10 @@ discard block | ||
| 326 | 321 | } | 
| 327 | 322 | $current_value = $minute_value; | 
| 328 | 323 | } | 
| 329 | - } | |
| 330 | -                elseif ($current_value === $hour_value) { | |
| 324 | +                } elseif ($current_value === $hour_value) { | |
| 331 | 325 | // We are in hours and can add something | 
| 332 | 326 |                    $end_event->add(new \DateInterval('PT1H')); | 
| 333 | - } | |
| 334 | -                elseif (($current_value != $hour_value) && ($current_value !== NULL)) { | |
| 327 | +                } elseif (($current_value != $hour_value) && ($current_value !== NULL)) { | |
| 335 | 328 | // Value just switched - let us wrap up with current event and start a new one | 
| 336 | 329 | $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $current_value); | 
| 337 | 330 | // Start event becomes the end event with a minute added | 
| @@ -348,12 +341,10 @@ discard block | ||
| 348 | 341 | $current_value = $hour_value; | 
| 349 | 342 | } | 
| 350 | 343 | } | 
| 351 | - } | |
| 352 | -            elseif ($current_value === $value) { | |
| 344 | +            } elseif ($current_value === $value) { | |
| 353 | 345 | // We are adding a whole day so the end event gets moved to the end of the day we are adding | 
| 354 | 346 | $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); | 
| 355 | - } | |
| 356 | -            elseif (($current_value !== $value) && ($current_value !== NULL)) { | |
| 347 | +            } elseif (($current_value !== $value) && ($current_value !== NULL)) { | |
| 357 | 348 | // Value just switched - let us wrap up with current event and start a new one | 
| 358 | 349 | $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $current_value); | 
| 359 | 350 | // Start event becomes the end event with a minute added | 
| @@ -388,8 +379,7 @@ discard block | ||
| 388 | 379 |            if ($event->endsLater($end_date)) { | 
| 389 | 380 | $event->setEndDate($end_date); | 
| 390 | 381 | } | 
| 391 | - } | |
| 392 | -        else { | |
| 382 | +        } else { | |
| 393 | 383 | // Event completely not in range so unset it | 
| 394 | 384 | unset($normalized_events[$unit][$key]); | 
| 395 | 385 | } | 
| @@ -420,8 +410,7 @@ discard block | ||
| 420 | 410 | $e++; | 
| 421 | 411 | $flipped[$e][$value][$datum] = $datum; | 
| 422 | 412 | $old_value = $value; | 
| 423 | - } | |
| 424 | -        else { | |
| 413 | +        } else { | |
| 425 | 414 | $flipped[$e][$value][$datum] = $datum; | 
| 426 | 415 | } | 
| 427 | 416 | } | 
| @@ -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 | } | 
| @@ -110,8 +110,7 @@ discard block | ||
| 110 | 110 |        for ($i = 0; $i<=59; $i++) { | 
| 111 | 111 |          if ($i <= 9) { | 
| 112 | 112 | $index = 'm0'.$i; | 
| 113 | - } | |
| 114 | -        else { | |
| 113 | +        } else { | |
| 115 | 114 | $index = 'm'.$i; | 
| 116 | 115 | } | 
| 117 | 116 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; | 
| @@ -190,8 +189,7 @@ discard block | ||
| 190 | 189 | } | 
| 191 | 190 | } | 
| 192 | 191 | } | 
| 193 | - } | |
| 194 | -    catch (\Exception $e) { | |
| 192 | +    } catch (\Exception $e) { | |
| 195 | 193 | $saved = FALSE; | 
| 196 | 194 | $transaction->rollback(); | 
| 197 | 195 |        watchdog_exception('BAT Event Save Exception', $e); | 
| @@ -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 | } |