Roomify / bat

src/Calendar/AbstractCalendar.php

Doc Comments +1 added lines, -1 removed lines

@@ -527,7 +527,7 @@
    * Returns the unit object.
    *
    * @param $unit_id
-   * @return mixed
+   * @return Unit
    */
   protected function getUnit($unit_id) {
     $keyed =  $this->keyUnitsById();

Spacing +11 added lines, -11 removed lines

@@ -124,7 +124,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);
@@ -163,7 +163,7 @@ 
     // Create a mock itemized event for the period in question - since event data is either
     // in the database or the default value we first create a mock event and then fill it in
     // accordingly
-    $mock_event = new Event($start_date, $end_date, new Unit(0,0,null), $this->default_value);
+    $mock_event = new Event($start_date, $end_date, new Unit(0, 0, null), $this->default_value);
     $itemized = $mock_event->itemizeEvent();
 
     // Cycle through each unit retrieved and provide it with a fully configured itemized mock event
@@ -253,11 +253,11 @@ 
         foreach ($days as $day => $hours) {
           foreach ($hours as $hour => $value) {
             if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) {
-              $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]);
+              $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]);
             }
             else {
               // If nothing from db - then revert to the defaults
-              $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue();
+              $result[$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue();
             }
           }
         }
@@ -270,7 +270,7 @@ 
         foreach ($months as $month => $days) {
           foreach ($days as $day => $hours) {
             foreach ($hours as $hour => $value) {
-              $result[$year][$month][$day][$hour] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value);
+              $result[$year][$month][$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
             }
             ksort($result[$year][$month][$day], SORT_NATURAL);
           }
@@ -300,11 +300,11 @@ 
           foreach ($hours as $hour => $minutes) {
             foreach ($minutes as $minute => $value) {
               if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) {
-                $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]);
+                $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]);
               }
               else {
                 // If nothing from db - then revert to the defaults
-                $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue();
+                $result[$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue();
               }
             }
           }
@@ -319,7 +319,7 @@ 
           foreach ($days as $day => $hours) {
             foreach ($hours as $hour => $minutes) {
               foreach ($minutes as $minute => $value) {
-                $result[$year][$month][$day][$hour][$minute] = ((int) $value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $value);
+                $result[$year][$month][$day][$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
               }
               ksort($result[$year][$month][$day][$hour], SORT_NATURAL);
             }
@@ -382,12 +382,12 @@ 
                       // Value just switched - let us wrap up with current event and start a new one
                       $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $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;
@@ -530,7 +530,7 @@ 
    * @return mixed
    */
   protected function getUnit($unit_id) {
-    $keyed =  $this->keyUnitsById();
+    $keyed = $this->keyUnitsById();
     return $keyed[$unit_id];
   }
 

Braces +11 added lines, -22 removed lines

@@ -128,8 +128,7 @@ 
         // 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);
-      }
-      else {
+      } else {
         $response->addMiss($keyed_units[$unit], CalendarResponse::INVALID_STATE);
       }
 
@@ -223,8 +222,7 @@ 
           foreach ($days as $day => $value) {
             $result[$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]);
           }
-        }
-        else {
+        } else {
           foreach ($days as $day => $value) {
             $result[$year][$month][$day] = $keyed_units[$unit]->getDefaultValue();
           }
@@ -254,8 +252,7 @@ 
           foreach ($hours as $hour => $value) {
             if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) {
               $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]);
-            }
-            else {
+            } else {
               // If nothing from db - then revert to the defaults
               $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue();
             }
@@ -301,8 +298,7 @@ 
             foreach ($minutes as $minute => $value) {
               if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) {
                 $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]);
-              }
-              else {
+              } else {
                 // If nothing from db - then revert to the defaults
                 $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue();
               }
@@ -377,8 +373,7 @@ 
                     if ($current_value === $minute_value) {
                       // We are still in minutes and going through so add a minute
                       $end_event->add(new \DateInterval('PT1M'));
-                    }
-                    elseif (($current_value != $minute_value) && ($current_value !== NULL)) {
+                    } elseif (($current_value != $minute_value) && ($current_value !== NULL)) {
                       // Value just switched - let us wrap up with current event and start a new one
                       $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value);
                       $start_event = clone($end_event->add(new \DateInterval('PT1M')));
@@ -392,12 +387,10 @@ 
                     }
                     $current_value = $minute_value;
                   }
-                }
-                elseif ($current_value === $hour_value) {
+                } elseif ($current_value === $hour_value) {
                   // We are in hours and can add something
                   $end_event->add(new \DateInterval('PT1H'));
-                }
-                elseif (($current_value != $hour_value) && ($current_value !== NULL)) {
+                } elseif (($current_value != $hour_value) && ($current_value !== NULL)) {
                   // Value just switched - let us wrap up with current event and start a new one
                   $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value);
                   // Start event becomes the end event with a minute added
@@ -414,12 +407,10 @@ 
                   $current_value = $hour_value;
                 }
               }
-            }
-            elseif ($current_value === $value) {
+            } elseif ($current_value === $value) {
               // We are adding a whole day so the end event gets moved to the end of the day we are adding
               $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59');
-            }
-            elseif (($current_value !== $value) && ($current_value !== NULL)) {
+            } elseif (($current_value !== $value) && ($current_value !== NULL)) {
               // Value just switched - let us wrap up with current event and start a new one
               $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value);
               // Start event becomes the end event with a minute added
@@ -454,8 +445,7 @@ 
           if ($event->endsLater($end_date)) {
             $event->setEndDate($end_date);
           }
-        }
-        else {
+        } else {
           // Event completely not in range so unset it
           unset($normalized_events[$unit_id][$key]);
         }
@@ -486,8 +476,7 @@ 
           $e++;
           $flipped[$e][$value][$datum] = $datum;
           $old_value = $value;
-        }
-        else {
+        } else {
           $flipped[$e][$value][$datum] = $datum;
         }
       }

src/Event/AbstractEvent.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 
 use Roomify\Bat\Event\EventInterface;
 use Roomify\Bat\Store\Store;
-use Roomify\Bat\Unit\Unit;
 
 abstract class AbstractEvent implements EventInterface {
 

src/Event/Event.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
    * @param $unit
    * @param $value
    */
-  public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit , $value = 0) {
+  public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit, $value = 0) {
     $this->unit_id = $unit->getUnitId();
     $this->unit = $unit;
     $this->start_date = clone($start_date);

src/Store/SqlDBStore.php

Spacing +4 added lines, -4 removed lines

@@ -89,7 +89,7 @@ 
     $minutes_query = TRUE;
 
     // Create a mock event which we will use to determine how to query the database
-    $mock_event = new Event($start_date, $end_date, new Unit(0,0,null), -10);
+    $mock_event = new Event($start_date, $end_date, new Unit(0, 0, null), -10);
     // We don't need a granular event even if we are retrieving granular data - since we don't
     // know what the event break-down is going to be we need to get the full range of data from
     // days, hours and minutes.
@@ -101,16 +101,16 @@ 
 
     $query_parameters = '';
 
-    foreach($itemized[Event::BAT_DAY] as $year => $months) {
+    foreach ($itemized[Event::BAT_DAY] as $year => $months) {
       if ($year_count > 0) {
         // We are dealing with multiple years so add an OR
         $query_parameters .= ' OR ';
       }
       $query_parameters .= 'year IN (' . $year . ') ';
-      $query_parameters .= 'AND month IN (' . implode("," ,array_keys($months)) .') ';
+      $query_parameters .= 'AND month IN (' . implode(",", array_keys($months)) . ') ';
       if (count($unit_ids) > 0) {
         // Unit ids are defined so add this as a filter
-        $query_parameters .= 'AND unit_id in (' . implode("," , $unit_ids) .') ';
+        $query_parameters .= 'AND unit_id in (' . implode(",", $unit_ids) . ') ';
       }
       $year_count++;
     }

src/Store/SqlLiteDBStore.php

Spacing +18 added lines, -18 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,28 +49,28 @@ 
       // 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']]['d'.$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']]['d' . $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']]['d'.$data['day']]['h'.$data['hour']][$index] = $data[$index];
+        $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']]['d' . $data['day']]['h' . $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_HOUR][$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_MINUTE][$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) . ")");