Roomify / bat

src/Store/SqlDBStore.php

Spacing +18 added lines, -18 removed lines

@@ -77,23 +77,23 @@ 
     $this->event_type = $event_type;
 
     if ($event_data == SqlDBStore::BAT_STATE) {
-      $this->day_table = $prefix . 'bat_event_' . $event_type . '_day_' . SqlDBStore::BAT_STATE;
-      $this->hour_table = $prefix . 'bat_event_' . $event_type . '_hour_' . SqlDBStore::BAT_STATE;
-      $this->minute_table = $prefix . 'bat_event_' . $event_type . '_minute_' . SqlDBStore::BAT_STATE;
+      $this->day_table = $prefix.'bat_event_'.$event_type.'_day_'.SqlDBStore::BAT_STATE;
+      $this->hour_table = $prefix.'bat_event_'.$event_type.'_hour_'.SqlDBStore::BAT_STATE;
+      $this->minute_table = $prefix.'bat_event_'.$event_type.'_minute_'.SqlDBStore::BAT_STATE;
 
-      $this->day_table_no_prefix = 'bat_event_' . $event_type . '_day_' . SqlDBStore::BAT_STATE;
-      $this->hour_table_no_prefix = 'bat_event_' . $event_type . '_hour_' . SqlDBStore::BAT_STATE;
-      $this->minute_table_no_prefix = 'bat_event_' . $event_type . '_minute_' . SqlDBStore::BAT_STATE;
+      $this->day_table_no_prefix = 'bat_event_'.$event_type.'_day_'.SqlDBStore::BAT_STATE;
+      $this->hour_table_no_prefix = 'bat_event_'.$event_type.'_hour_'.SqlDBStore::BAT_STATE;
+      $this->minute_table_no_prefix = 'bat_event_'.$event_type.'_minute_'.SqlDBStore::BAT_STATE;
     }
 
     if ($event_data == SqlDBStore::BAT_EVENT) {
-      $this->day_table = $prefix . 'bat_event_' . $event_type . '_day_' . SqlDBStore::BAT_EVENT;
-      $this->hour_table = $prefix . 'bat_event_' . $event_type . '_hour_' . SqlDBStore::BAT_EVENT;
-      $this->minute_table = $prefix . 'bat_event_' . $event_type . '_minute_' . SqlDBStore::BAT_EVENT;
+      $this->day_table = $prefix.'bat_event_'.$event_type.'_day_'.SqlDBStore::BAT_EVENT;
+      $this->hour_table = $prefix.'bat_event_'.$event_type.'_hour_'.SqlDBStore::BAT_EVENT;
+      $this->minute_table = $prefix.'bat_event_'.$event_type.'_minute_'.SqlDBStore::BAT_EVENT;
 
-      $this->day_table_no_prefix = 'bat_event_' . $event_type . '_day_' . SqlDBStore::BAT_EVENT;
-      $this->hour_table_no_prefix = 'bat_event_' . $event_type . '_hour_' . SqlDBStore::BAT_EVENT;
-      $this->minute_table_no_prefix = 'bat_event_' . $event_type . '_minute_' . SqlDBStore::BAT_EVENT;
+      $this->day_table_no_prefix = 'bat_event_'.$event_type.'_day_'.SqlDBStore::BAT_EVENT;
+      $this->hour_table_no_prefix = 'bat_event_'.$event_type.'_hour_'.SqlDBStore::BAT_EVENT;
+      $this->minute_table_no_prefix = 'bat_event_'.$event_type.'_minute_'.SqlDBStore::BAT_EVENT;
     }
 
   }
@@ -108,9 +108,9 @@ 
   public function buildQueries(\DateTime $start_date, \DateTime $end_date, $unit_ids) {
     $queries = array();
 
-    $queries[Event::BAT_DAY] = 'SELECT * FROM ' . $this->day_table . ' WHERE ';
-    $queries[Event::BAT_HOUR] = 'SELECT * FROM ' . $this->hour_table . ' WHERE ';
-    $queries[Event::BAT_MINUTE] = 'SELECT * FROM ' . $this->minute_table . ' WHERE ';
+    $queries[Event::BAT_DAY] = 'SELECT * FROM '.$this->day_table.' WHERE ';
+    $queries[Event::BAT_HOUR] = 'SELECT * FROM '.$this->hour_table.' WHERE ';
+    $queries[Event::BAT_MINUTE] = 'SELECT * FROM '.$this->minute_table.' WHERE ';
 
     // 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);
@@ -128,11 +128,11 @@ 
         // 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 .= 'year IN ('.$year.') ';
+      $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/Constraint/DateConstraint.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
   /**
    * {@inheritdoc}
    */
-  public function applyConstraint(CalendarResponse &$calendar_response) {
+  public function applyConstraint(CalendarResponse & $calendar_response) {
     parent::applyConstraint($calendar_response);
 
     if ($this->start_date === NULL) {

src/Calendar/AbstractCalendar.php

Spacing +17 added lines, -17 removed lines

@@ -190,7 +190,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), $this->default_value);
+    $mock_event = new Event($start_date, $end_date, new Unit(0, 0), $this->default_value);
     $itemized = $mock_event->itemize(new EventItemizer($mock_event, $granularity));
 
     // Cycle through each unit retrieved and provide it with a fully configured itemized mock event
@@ -281,11 +281,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();
               }
             }
           }
@@ -299,7 +299,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);
           }
@@ -330,11 +330,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();
                 }
               }
             }
@@ -350,7 +350,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);
             }
@@ -424,12 +424,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;
@@ -454,22 +454,22 @@ 
                     // Start event becomes the end event with a minute added
                     $start_event = clone($end_event->add(new \DateInterval('PT1M')));
                     // End event comes the current point in time
-                    $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':59');
+                    $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':59');
                     $current_value = $hour_value;
                   }
                 }
                 if ($current_value === NULL) {
                   // Got into hours and still haven't created an event so
-                  $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':00');
+                  $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':00');
                   // We will be occupying at least this hour so might as well mark it
-                  $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':59');
+                  $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.substr($hour, 1).':59');
                   $current_value = $hour_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');
+              $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59');
             }
             elseif (($current_value !== $value) && ($current_value !== NULL)) {
               // Value just switched - let us wrap up with current event and start a new one
@@ -477,13 +477,13 @@ 
               // Start event becomes the end event with a minute added
               $start_event = clone($end_event->add(new \DateInterval('PT1M')));
               // End event becomes the current day which we have not account for yet
-              $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59');
+              $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59');
               $current_value = $value;
             }
             if ($current_value === NULL) {
               // We have not created an event yet so let's do it now
-              $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '00:00');
-              $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59');
+              $start_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'00:00');
+              $end_event = new \DateTime($year.'-'.$month.'-'.substr($day, 1).' '.'23:59');
               $current_value = $value;
             }
           }
@@ -582,7 +582,7 @@ 
    * @return Unit
    */
   protected function getUnit($unit_id) {
-    $keyed =  $this->keyUnitsById();
+    $keyed = $this->keyUnitsById();
     return $keyed[$unit_id];
   }
 

Braces +18 added lines, -26 removed lines

@@ -146,8 +146,7 @@ 
       // Compare the current states with the set of valid states
       if ($intersect) {
         $remaining_states = array_intersect($current_states, $valid_states);
-      }
-      else {
+      } else {
         $remaining_states = array_diff($current_states, $valid_states);
       }
 
@@ -155,8 +154,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);
       }
 
@@ -250,8 +248,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();
           }
@@ -282,8 +279,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();
               }
@@ -331,8 +327,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();
                 }
@@ -393,8 +388,12 @@ 
 
       // Make sure years are sorted
       ksort($data[Event::BAT_DAY]);
-      if (isset($data[Event::BAT_HOUR])) ksort($data[Event::BAT_HOUR]);
-      if (isset($data[Event::BAT_MINUTE])) ksort($data[Event::BAT_MINUTE]);
+      if (isset($data[Event::BAT_HOUR])) {
+        ksort($data[Event::BAT_HOUR]);
+      }
+      if (isset($data[Event::BAT_MINUTE])) {
+        ksort($data[Event::BAT_MINUTE]);
+      }
 
       // Set up variables to keep track of stuff
       $current_value = NULL;
@@ -419,8 +418,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')));
@@ -434,12 +432,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)) {
                   $skip_finalize_event = FALSE;
 
                   if ($is_daylight_saving_time) {
@@ -466,12 +462,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
@@ -506,8 +500,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]);
         }
@@ -538,8 +531,7 @@ 
           $e++;
           $flipped[$e][$value][$datum] = $datum;
           $old_value = $value;
-        }
-        else {
+        } else {
           $flipped[$e][$value][$datum] = $datum;
         }
       }