Roomify / bat

src/Store/SqlLiteDBStore.php

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) . ")");
           }
         }

Spacing +14 added lines, -14 removed lines

@@ -48,17 +48,17 @@ 
     // Cycle through day results and setup an event array
     foreach ($results[Event::BAT_DAY]->fetchAll() as $data) {
       // Figure out how many days the current month has
-      $temp_date = new \DateTime($data['year'] . "-" . $data['month']);
+      $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];
+        $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];
+        $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d'.$data['day']]['h'.$i] = $data['h'.$i];
       }
     }
 
@@ -66,11 +66,11 @@ 
     foreach ($results[Event::BAT_MINUTE]->fetchAll() as $data) {
       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];
       }
     }
 
@@ -105,11 +105,11 @@ 
               $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) . ")");
+            $this->pdo->exec("INSERT INTO $this->day_table (unit_id, year, month, ".implode(', ', $keys).") VALUES (".$event->getUnitId().", $year, $month, ".implode(', ', $values).")");
           }
         }
       }
@@ -125,14 +125,14 @@ 
                 $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) . ")");
+                  $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,14 +148,14 @@ 
                 $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) . ")");
+                  $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/Unit/AbstractUnit.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
    * {@inheritdoc}
    */
   public function getDefaultValue() {
-    return (int) $this->default_value;
+    return (int)$this->default_value;
   }
 
   /**

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,31 +38,31 @@ 
     $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']);
+      $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;
         } else {
           $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];
       }
     }
 

src/Constraint/ConstraintManager.php

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
   protected function normalizeMinMaxDaysConstraints() {
     $new_constraints = array();
 
-    $constraints = array_map(function ($object) { return clone $object; }, $this->constraints['Roomify\Bat\Constraint\MinMaxDaysConstraint']);
+    $constraints = array_map(function($object) { return clone $object; }, $this->constraints['Roomify\Bat\Constraint\MinMaxDaysConstraint']);
 
     foreach (array_reverse($constraints) as $constraint) {
       $start_date = $constraint->getStartDate();
@@ -172,7 +172,7 @@ 
   protected function normalizeCheckInDayConstraints() {
     $new_constraints = array();
 
-    $constraints = array_map(function ($object) { return clone $object; }, $this->constraints['Roomify\Bat\Constraint\CheckInDayConstraint']);
+    $constraints = array_map(function($object) { return clone $object; }, $this->constraints['Roomify\Bat\Constraint\CheckInDayConstraint']);
 
     foreach (array_reverse($constraints) as $constraint) {
       $start_date = $constraint->getStartDate();

Braces +3 added lines, -6 removed lines

@@ -115,12 +115,10 @@ 
             if ($start_date >= $new_start_date && $start_date <= $new_end_date) {
               $new_end_date_clone = clone($new_end_date);
               $constraint->setStartDate($new_end_date_clone->add(new \DateInterval('P1D')));
-            }
-            elseif ($end_date >= $new_start_date && $end_date <= $new_end_date) {
+            } elseif ($end_date >= $new_start_date && $end_date <= $new_end_date) {
               $new_start_date_clone = clone($new_start_date);
               $constraint->setEndDate($new_start_date_clone->sub(new \DateInterval('P1D')));
-            }
-            elseif ($start_date < $new_start_date && $end_date > $new_end_date) {
+            } elseif ($start_date < $new_start_date && $end_date > $new_end_date) {
               if ($constraint->getEndDate() > $new_start_date) {
                 $new_start_date_clone = clone($new_start_date);
                 $constraint->setEndDate($new_start_date_clone->sub(new \DateInterval('P1D')));
@@ -132,8 +130,7 @@ 
                 $split_end_date = $end_date;
 
                 $split_constraint = new MinMaxDaysConstraint($constraint->getUnits(), $constraint->getMinDays(), $constraint->getMaxDays(), $split_start_date, $split_end_date, $constraint->getCheckinDay());
-              }
-              else {
+              } else {
                 $split_start_date = $split_constraint->getStartDate();
                 $split_end_date = $split_constraint->getEndDate();
 

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;
         }
       }

src/Event/EventItemizer.php

Spacing +21 added lines, -21 removed lines

@@ -160,7 +160,7 @@ 
             $dayrange = new \DatePeriod($this->event->getStartDate(), $dayinterval, $this->event->endMonthDate($this->event->getStartDate()));
           }
           foreach ($dayrange as $day) {
-            $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue();
+            $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue();
           }
         }
 
@@ -168,7 +168,7 @@ 
         elseif ($this->event->isLastMonth($date)) {
           $dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1")), $dayinterval, $this->event->getEndDate());
           foreach ($dayrange as $day) {
-            $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue();
+            $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue();
           }
         }
 
@@ -176,7 +176,7 @@ 
         else {
           $dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1")), $dayinterval, new \DateTime($date->format("Y-n-t 23:59:59")));
           foreach ($dayrange as $day) {
-            $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue();
+            $itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d'.$day->format('j')] = $this->event->getValue();
           }
         }
       }
@@ -217,35 +217,35 @@ 
     if ($this->event->isSameDay()) {
       if (!($this->event->getStartDate()->format('H:i') == '00:00' && $this->event->getEndDate()->format('H:i') == '23:59')) {
         $itemized_same_day = $this->createHourlyGranular($start_date, $end_date->add(new \DateInterval('PT1M')), $interval);
-        $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1;
-        $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];
+        $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d'.$sd] = -1;
+        $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 {
       // 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')) {
         $itemized_start = $this->createHourlyGranular($start_date, new \DateTime($start_date->format("Y-n-j 23:59:59")), $interval);
-        $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1;
-        $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd];
-        $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd];
+        $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d'.$sd] = -1;
+        $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd];
+        $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd];
       }
       else {
         // Just set an empty hour and minute
-        $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = array();
-        $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = array();
+        $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d'.$sd] = array();
+        $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d'.$sd] = array();
       }
 
       // Deal with the end date unless it ends just before midnight at which point we don't need to go further
       if ($this->event->getEndDate()->format('H:i') == '23:59') {
-        $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = array();
-        $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = array();
+        $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed] = array();
+        $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed] = array();
       }
       else {
         $itemized_end = $this->createHourlyGranular(new \DateTime($end_date->format("Y-n-j 00:00:00")), $end_date->add(new \DateInterval('PT1M')), $interval);
-        $itemized[EventItemizer::BAT_DAY][$ey][$em]['d' . $ed] = -1;
-        $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed];
-        $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed];
+        $itemized[EventItemizer::BAT_DAY][$ey][$em]['d'.$ed] = -1;
+        $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d'.$ed];
+        $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed] = $itemized_end[EventItemizer::BAT_MINUTE][$ey][$em]['d'.$ed];
       }
     }
 
@@ -287,9 +287,9 @@ 
       }
 
       // Doing minutes so set the values in the minute array
-      $itemized[EventItemizer::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour]['m' . $min] = $event_value;
+      $itemized[EventItemizer::BAT_MINUTE][$year][$month]['d'.$day]['h'.$hour]['m'.$min] = $event_value;
       // Let the hours know that it cannot determine availability
-      $itemized[EventItemizer::BAT_HOUR][$year][$month]['d' . $day]['h' . $hour] = -1;
+      $itemized[EventItemizer::BAT_HOUR][$year][$month]['d'.$day]['h'.$hour] = -1;
       $min++;
 
       if ($min == 60 && $start_minute !== 0) {
@@ -300,7 +300,7 @@ 
       }
       elseif ($min == 60 && $start_minute == 0) {
         // Did a real whole hour so initialize the hour
-        $itemized[EventItemizer::BAT_HOUR][$year][$month]['d' . $day]['h' . $hour] = $event_value;
+        $itemized[EventItemizer::BAT_HOUR][$year][$month]['d'.$day]['h'.$hour] = $event_value;
 
         $min = 0;
         $hour++;
@@ -322,9 +322,9 @@ 
 
         $hour = $date->format('G');
         for ($i = 0; $i < 60; $i++) {
-          $minute = ($i < 10) ? '0' . $i : $i;
+          $minute = ($i < 10) ? '0'.$i : $i;
 
-          $itemized[EventItemizer::BAT_MINUTE][$date->format('Y')][$date->format('n')]['d' . $date->format('j')]['h' . $hour]['m' . $minute] = $this->event->getValue();
+          $itemized[EventItemizer::BAT_MINUTE][$date->format('Y')][$date->format('n')]['d'.$date->format('j')]['h'.$hour]['m'.$minute] = $this->event->getValue();
         }
       }
     }

Braces +5 added lines, -10 removed lines

@@ -129,8 +129,7 @@ 
     // We add a minute to compensate
     elseif (($this->event->getStartDate()->format('Y-m-d H:i') == $this->event->getEndDate()->format('Y-m-d H:i')) && $this->granularity == EventItemizer::BAT_DAILY) {
       $adjusted_end_day = new \DateTime($this->event->getEndDate()->add(new \DateInterval('PT1M'))->format('Y-m-d H:i'));
-    }
-    else {
+    } else {
       $adjusted_end_day = new \DateTime($this->event->getEndDate()->format('Y-m-d H:i'));
     }
 
@@ -221,16 +220,14 @@ 
         $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')) {
         $itemized_start = $this->createHourlyGranular($start_date, new \DateTime($start_date->format("Y-n-j 23:59:59")), $interval);
         $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1;
         $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd];
         $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd];
-      }
-      else {
+      } else {
         // Just set an empty hour and minute
         $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = array();
         $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = array();
@@ -240,8 +237,7 @@ 
       if ($this->event->getEndDate()->format('H:i') == '23:59') {
         $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = array();
         $itemized[EventItemizer::BAT_MINUTE][$ey][$em]['d' . $ed] = array();
-      }
-      else {
+      } else {
         $itemized_end = $this->createHourlyGranular(new \DateTime($end_date->format("Y-n-j 00:00:00")), $end_date->add(new \DateInterval('PT1M')), $interval);
         $itemized[EventItemizer::BAT_DAY][$ey][$em]['d' . $ed] = -1;
         $itemized[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed] = $itemized_end[EventItemizer::BAT_HOUR][$ey][$em]['d' . $ed];
@@ -297,8 +293,7 @@ 
         $min = 0;
         $hour++;
         $start_minute = 0;
-      }
-      elseif ($min == 60 && $start_minute == 0) {
+      } elseif ($min == 60 && $start_minute == 0) {
         // Did a real whole hour so initialize the hour
         $itemized[EventItemizer::BAT_HOUR][$year][$month]['d' . $day]['h' . $hour] = $event_value;
 

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, array()), -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/MinMaxDaysConstraint.php

Spacing +4 added lines, -4 removed lines

@@ -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();
 
@@ -107,8 +107,8 @@ 
     $text = '';
 
     // Min/max stay length constraint variables.
-    $minimum_stay = empty($this->min_days) ? '' : (($this->min_days == 1) ? $this->min_days . ' day' : $this->min_days . ' days');
-    $maximum_stay = empty($this->max_days) ? '' : (($this->max_days == 1) ? $this->max_days . ' day' : $this->max_days . ' days');
+    $minimum_stay = empty($this->min_days) ? '' : (($this->min_days == 1) ? $this->min_days.' day' : $this->min_days.' days');
+    $maximum_stay = empty($this->max_days) ? '' : (($this->max_days == 1) ? $this->max_days.' day' : $this->max_days.' days');
 
     // Day of the week constraint variable.
     $day_of_the_week = $this->getWeekDay($this->checkin_day);

src/Constraint/CheckInDayConstraint.php

Spacing +2 added lines, -2 removed lines

@@ -45,11 +45,11 @@
       $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->getStartDate()->getTimestamp() <= $this->start_date->getTimestamp() &&
            $calendar_response->getEndDate()->getTimestamp() >= $this->end_date->getTimestamp())) &&
-         $this->checkin_day != $calendar_response->getStartDate()->format('N') ) {
+         $this->checkin_day != $calendar_response->getStartDate()->format('N')) {
 
       $units = $this->getUnits();