Roomify / bat

src/Constraint/ConstraintInterface.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
    *
    * @param $calendar_response
    */
-  public function applyConstraint(CalendarResponse &$calendar_response);
+  public function applyConstraint(CalendarResponse & $calendar_response);
 
   /**
    * @param $start_date

src/Constraint/MinMaxDaysConstraint.php

Doc Comments +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
   }
 
   /**
-   * @param $day
+   * @param integer $day
    * @return string
    */
   private function getWeekDay($day) {

Spacing +3 added lines, -3 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) {
@@ -62,13 +62,13 @@ 
       $this->end_date = new \DateTime('2999-12-31');
     }
 
-    if ( (($calendar_response->getStartDate()->getTimestamp() >= $this->start_date->getTimestamp() &&
+    if ((($calendar_response->getStartDate()->getTimestamp() >= $this->start_date->getTimestamp() &&
            $calendar_response->getStartDate()->getTimestamp() <= $this->end_date->getTimestamp()) ||
           ($calendar_response->getEndDate()->getTimestamp() >= $this->start_date->getTimestamp() &&
            $calendar_response->getEndDate()->getTimestamp() <= $this->end_date->getTimestamp()) ||
           ($calendar_response->getStartDate()->getTimestamp() <= $this->start_date->getTimestamp() &&
            $calendar_response->getEndDate()->getTimestamp() >= $this->end_date->getTimestamp())) &&
-         ($this->checkin_day === NULL || $this->checkin_day == $calendar_response->getStartDate()->format('N')) ) {
+         ($this->checkin_day === NULL || $this->checkin_day == $calendar_response->getStartDate()->format('N'))) {
 
       $units = $this->getUnits();
 

src/Constraint/AbstractConstraint.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
   /**
    * {@inheritdoc}
    */
-  public function applyConstraint(CalendarResponse &$calendar_response) {
+  public function applyConstraint(CalendarResponse & $calendar_response) {
     $this->calendar_response = $calendar_response;
   }
 

src/Store/DrupalDBStore.php

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,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
@@ -38,30 +38,30 @@ 
     $db_events = array();
 
     // Cycle through day results and setup an event array
-    while( $data = $results[Event::BAT_DAY]->fetchAssoc()) {
+    while ($data = $results[Event::BAT_DAY]->fetchAssoc()) {
       // 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
-    while( $data = $results[Event::BAT_HOUR]->fetchAssoc()) {
-      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];
+    while ($data = $results[Event::BAT_HOUR]->fetchAssoc()) {
+      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
-    while( $data = $results[Event::BAT_MINUTE]->fetchAssoc()) {
-      for ($i = 0; $i<=59; $i++) {
+    while ($data = $results[Event::BAT_MINUTE]->fetchAssoc()) {
+      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];
       }

src/Store/SqlDBStore.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
       $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 +6 added lines, -6 removed lines

@@ -50,14 +50,14 @@ 
       // 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++) {
+      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++) {
+      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];
       }
     }
@@ -126,11 +126,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){
+                  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) . ")");
@@ -149,11 +149,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){
+                  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) . ")");

Braces +1 added lines, -2 removed lines

@@ -108,8 +108,7 @@
             $command = rtrim($command, ',');
             $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month";
             $this->pdo->exec($command);
-          }
-          else {
+          } else {
             $this->pdo->exec("INSERT INTO $this->day_table (unit_id, year, month, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . implode(', ', $values) . ")");
           }
         }

src/Event/EventItemizer.php

Braces +2 added lines, -4 removed lines

@@ -211,8 +211,7 @@ 
         $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd];
         $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::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->event->getStartDate()->format('H:i') == '00:00')) {
         $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59")));
@@ -266,8 +265,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[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->event->getValue();
         // We have a whole hour so get rid of the minute info

src/Calendar/AbstractCalendar.php

Spacing +10 added lines, -10 removed lines

@@ -174,7 +174,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
@@ -265,11 +265,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();
               }
             }
           }
@@ -283,7 +283,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);
           }
@@ -314,11 +314,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();
                 }
               }
             }
@@ -334,7 +334,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);
             }
@@ -396,12 +396,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;
@@ -544,7 +544,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

@@ -130,8 +130,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);
       }
 
@@ -139,8 +138,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);
       }
 
@@ -234,8 +232,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();
           }
@@ -266,8 +263,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();
               }
@@ -315,8 +311,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();
                 }
@@ -365,8 +360,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;
@@ -391,8 +390,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')));
@@ -406,12 +404,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
@@ -428,12 +424,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
@@ -468,8 +462,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]);
         }
@@ -500,8 +493,7 @@ 
           $e++;
           $flipped[$e][$value][$datum] = $datum;
           $old_value = $value;
-        }
-        else {
+        } else {
           $flipped[$e][$value][$datum] = $datum;
         }
       }

src/Event/AbstractEvent.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
    * @return int
    */
   public function getValue() {
-    return (int) $this->value;
+    return (int)$this->value;
   }
 
   /**