Roomify / bat

src/Event/AbstractEvent.php

Doc Comments +6 added lines, -5 removed lines

@@ -85,7 +85,7 @@ 
   /**
    * Returns the start date.
    *
-   * @return DateTime
+   * @return \DateTime
    */
   public function getStartDate() {
     return clone($this->start_date);
@@ -102,7 +102,7 @@ 
   /**
    * Set the start date.
    *
-   * @param DateTime $start_date
+   * @param \DateTime $start_date
    */
   public function setStartDate(\DateTime $start_date) {
     $this->start_date = clone($start_date);
@@ -111,7 +111,7 @@ 
   /**
    * Returns the end date.
    *
-   * @return DateTime
+   * @return \DateTime
    */
   public function getEndDate() {
     return clone($this->end_date);
@@ -128,7 +128,7 @@ 
   /**
    * Set the end date.
    *
-   * @param DateTime $end_date
+   * @param \DateTime $end_date
    */
   public function setEndDate(\DateTime $end_date) {
     $this->end_date = clone($end_date);
@@ -240,6 +240,7 @@ 
 
   /**
    * {@inheritdoc}
+   * @param \DateTime $date
    */
   public function isLastMonth($date) {
     if ($date->format("n") == $this->endMonth() && $date->format("Y") == $this->endYear()) {
@@ -608,7 +609,7 @@ 
   /**
    * Saves an event to whatever Drupal tables are defined in the store array
    *
-   * @param \ROomify\Bat\\Store\Store $store
+   * @param Store $store
    * @param string $granularity
    *
    * @throws \Exception

Spacing +8 added lines, -8 removed lines

@@ -490,7 +490,7 @@ 
       }
 
       // Deal with the end date unless it ends just before midnight at which point we don't need to go further
-      if ($this->end_date->format('H:i') == '23:59' ) {
+      if ($this->end_date->format('H:i') == '23:59') {
         $itemized[AbstractEvent::BAT_HOUR][$ey][$em]['d' . $ed] = array();
         $itemized[AbstractEvent::BAT_MINUTE][$ey][$em]['d' . $ed] = array();
       } else {
@@ -518,14 +518,14 @@ 
 
     $counter = (int)$period_start->format('i');
     $start_minute = $counter;
-    foreach($period as $minute) {
+    foreach ($period as $minute) {
       // Doing minutes so set the values in the minute array
-      $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]['m' .$minute->format('i')] = $this->getValue();
+      $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->getValue();
       // Let the hours know that it cannot determine availability
-      $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')] = -1;
+      $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1;
       $counter++;
 
-      if ($counter == 60 && $start_minute!==0) {
+      if ($counter == 60 && $start_minute !== 0) {
         // Not a real hour - leave as is and move on
         $counter = 0;
         $start_minute = 0;
@@ -534,7 +534,7 @@ 
         // Did a real whole hour so initialize the hour
         $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue();
         // We have a whole hour so get rid of the minute info
-        unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]);
+        unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]);
         $counter = 0;
         $start_minute = 0;
       }
@@ -555,12 +555,12 @@ 
     // Set the end date to the last day of the month so that we are sure to get that last month
     $adjusted_end_day = new \DateTime($this->end_date->format('Y-n-t'));
 
-    $daterange = new \DatePeriod($this->start_date, $interval ,$adjusted_end_day);
+    $daterange = new \DatePeriod($this->start_date, $interval, $adjusted_end_day);
 
     $itemized = array();
 
     // Cycle through each month
-    foreach($daterange as $date) {
+    foreach ($daterange as $date) {
 
       $year = $date->format("Y");
       $dayinterval = new \DateInterval('P1D');

Braces +5 added lines, -10 removed lines

@@ -337,8 +337,7 @@ 
     if ($this->dateIsEarlier($start) &&
       ($this->dateIsInRange($end) || $this->dateIsLater($end))) {
       $overlaps = TRUE;
-    }
-    elseif ($this->dateIsInRange($start) &&
+    } elseif ($this->dateIsInRange($start) &&
       ($this->dateIsInRange($end) || $this->dateIsLater($end))) {
       $overlaps = TRUE;
     }
@@ -473,8 +472,7 @@ 
         $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd];
         $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd];
       }
-    }
-    else {
+    } else {
       // Deal with the start day unless it starts on midnight precisely at which point the whole day is booked
       if (!($this->start_date->format('H:i') == '00:00')) {
         $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59")));
@@ -482,8 +480,7 @@ 
         $itemized[AbstractEvent::BAT_DAY][$sy][$sm]['d' . $sd] = -1;
         $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd];
         $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd];
-      }
-      else {
+      } else {
         // Just set an empty hour and minute
         $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = array();
         $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = array();
@@ -529,8 +526,7 @@ 
         // Not a real hour - leave as is and move on
         $counter = 0;
         $start_minute = 0;
-      }
-      elseif ($counter == 60 && $start_minute == 0) {
+      } elseif ($counter == 60 && $start_minute == 0) {
         // Did a real whole hour so initialize the hour
         $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue();
         // We have a whole hour so get rid of the minute info
@@ -571,8 +567,7 @@ 
         // If we are in the same month the end date is the end date of the event
         if ($this->isSameMonth()) {
           $dayrange = new \DatePeriod($this->start_date, $dayinterval, new \DateTime($this->end_date->format("Y-n-j 23:59:59")));
-        }
-        else { // alternatively it is the last day of the start month
+        } else { // alternatively it is the last day of the start month
           $dayrange = new \DatePeriod($this->start_date, $dayinterval, $this->endMonthDate($this->start_date));
         }
         foreach ($dayrange as $day) {

src/Store/SqlLiteDBStore.php

Spacing +17 added lines, -17 removed lines

@@ -34,7 +34,7 @@ 
    */
   public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) {
 
-    $queries  = $this->buildQueries($start_date, $end_date, $unit_ids);
+    $queries = $this->buildQueries($start_date, $end_date, $unit_ids);
 
     $results = array();
     // Run each query and store results
@@ -49,26 +49,26 @@ 
       // Figure out how many days the current month has
       $temp_date = new \DateTime($data['year'] . "-" . $data['month']);
       $days_in_month = (int)$temp_date->format('t');
-      for ($i = 1; $i<=$days_in_month; $i++) {
-        $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i];
+      for ($i = 1; $i <= $days_in_month; $i++) {
+        $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i];
       }
     }
 
     // With the day events taken care off let's cycle through hours
     foreach ($results[Event::BAT_HOUR]->fetchAll() as $data) {
-      for ($i = 0; $i<=23; $i++) {
-        $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h'. $i] = $data['h'.$i];
+      for ($i = 0; $i <= 23; $i++) {
+        $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h' . $i] = $data['h' . $i];
       }
     }
 
     // With the hour events taken care off let's cycle through minutes
     foreach ($results[Event::BAT_MINUTE]->fetchAll() as $data) {
-      for ($i = 0; $i<=59; $i++) {
+      for ($i = 0; $i <= 59; $i++) {
         if ($i <= 9) {
-          $index = 'm0'.$i;
+          $index = 'm0' . $i;
         }
         else {
-          $index = 'm'.$i;
+          $index = 'm' . $i;
         }
         $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index];
       }
@@ -102,11 +102,11 @@ 
           // 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
           if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month])) {
             $command = "UPDATE $this->day_table SET ";
-            foreach ($days as $day => $value){
-              $command .=   "$day = $value,";
+            foreach ($days as $day => $value) {
+              $command .= "$day = $value,";
             }
             $command = rtrim($command, ',');
-            $command .= " WHERE unit_id = " . $event->getUnitId() ." AND year = $year AND month = $month";
+            $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month";
             $this->pdo->exec($command);
           } else {
             $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 @@ 
                 $keys = array_keys($hours);
                 if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month][$day])) {
                   $command = "UPDATE $this->hour_table SET ";
-                  foreach ($hours as $hour => $value){
-                    $command .=   "$hour = $value,";
+                  foreach ($hours as $hour => $value) {
+                    $command .= "$hour = $value,";
                   }
                   $command = rtrim($command, ',');
-                  $command .= " WHERE unit_id = " . $event->getUnitId() ." AND year = $year AND month = $month AND day = ". substr($day,1);
+                  $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day, 1);
                   $this->pdo->exec($command);
                 } else {
                   $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 @@ 
                 $keys = array_keys($minutes);
                 if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month][$day][$hour])) {
                   $command = "UPDATE $this->minute_table SET ";
-                  foreach ($minutes as $minute => $value){
-                    $command .=   "$minute = $value,";
+                  foreach ($minutes as $minute => $value) {
+                    $command .= "$minute = $value,";
                   }
                   $command = rtrim($command, ',');
-                  $command .= " WHERE unit_id = " . $event->getUnitId() ." AND year = $year AND month = $month AND day = ". substr($day,1) . " AND hour = " . substr($hour,1);
+                  $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day, 1) . " AND hour = " . substr($hour, 1);
                   $this->pdo->exec($command);
                 } else {
                   $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) . ")");

src/Calendar/AbstractCalendar.php

Spacing +6 added lines, -6 removed lines

@@ -123,7 +123,7 @@ 
       $current_states = array_keys($unit_states);
       // Compare the current states with the set of valid states
       $remaining_states = array_diff($current_states, $valid_states);
-      if (count($remaining_states) == 0 ) {
+      if (count($remaining_states) == 0) {
         // Unit is in a state that is within the set of valid states so add to result set
         $units[$unit] = $unit;
         $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE);
@@ -213,7 +213,7 @@ 
           foreach ($months as $month => $days) {
             foreach ($days as $day => $hours) {
               foreach ($hours as $hour => $value) {
-                $events[$unit][Event::BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value);
+                $events[$unit][Event::BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
               }
             }
           }
@@ -228,7 +228,7 @@ 
             foreach ($hours as $hour => $minutes) {
               foreach ($minutes as $minute => $value) {
                 if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) {
-                  $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]);
+                  $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]);
                 }
                 else {
                   // If nothing from db - then revert to the defaults
@@ -247,7 +247,7 @@ 
             foreach ($days as $day => $hours) {
               foreach ($hours as $hour => $minutes) {
                 foreach ($minutes as $minute => $value) {
-                  $events[$unit][Event::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value);
+                  $events[$unit][Event::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
                 }
               }
             }
@@ -320,12 +320,12 @@ 
                       // Value just switched - let us wrap up with current event and start a new one
                       $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $current_value);
                       $start_event = clone($end_event->add(new \DateInterval('PT1M')));
-                      $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1));
+                      $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1));
                       $current_value = $minute_value;
                     }
                     if ($current_value === NULL) {
                       // We are down to minutes and haven't created and event yet - do one now
-                      $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1));
+                      $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1));
                       $end_event = clone($start_event);
                     }
                     $current_value = $minute_value;

src/Valuator/IntervalValuator.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
   protected $duration_unit;
 
-  public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit, Store $store, \DateInterval $duration_unit){
+  public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit, Store $store, \DateInterval $duration_unit) {
     parent::__construct($start_date, $end_date, $unit, $store);
     $this->duration_unit = $duration_unit;
   }
@@ -53,21 +53,21 @@ 
       //var_dump($period);
       //var_dump($unit);
       //var_dump($unit_events);
-      foreach ($unit_events as $event){
-        if ($unit = $this->unit->getUnitId()){
+      foreach ($unit_events as $event) {
+        if ($unit = $this->unit->getUnitId()) {
           foreach ($period as $dt) {
               // If event in period involved add value of event
               // If event is not completely in period involved then add just the percentage that is
               $last_period = $dt;
             print_r("Event is: ");
-            print_r($event->getStartDate()->format('Y-m-d H:i:s') ." to ");
-            print_r($event->getEndDate()->format('Y-m-d H:i:s') ."\n");
+            print_r($event->getStartDate()->format('Y-m-d H:i:s') . " to ");
+            print_r($event->getEndDate()->format('Y-m-d H:i:s') . "\n");
             print_r("Period is: ");
-            print_r($dt->format('Y-m-d H:i:s') ."\n");
-            if ($event->dateIsInRange($dt)){
+            print_r($dt->format('Y-m-d H:i:s') . "\n");
+            if ($event->dateIsInRange($dt)) {
               print_r("In range adding: " . $event->getValue() . " to event.\n");
               $value = $value + $event->getValue();
-              print_r("Current Value " .$value . "\n");
+              print_r("Current Value " . $value . "\n");
             }
           }
         }