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

src/Calendar/AbstractCalendar.php

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/EventItemizer.php

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'));
     }
 
@@ -222,8 +221,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")));
@@ -231,8 +229,7 @@ 
         $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();
@@ -242,8 +239,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 {
         $end_period = new \DatePeriod(new \DateTime($end_date->format("Y-n-j 00:00:00")), $interval, $end_date->add(new \DateInterval('PT1M')));
         $itemized_end = $this->createHourlyGranular($end_period, new \DateTime($end_date->format("Y-n-j 00:00:00")));
         $itemized[EventItemizer::BAT_DAY][$ey][$em]['d' . $ed] = -1;
@@ -279,8 +275,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();
 

src/Constraint/ConstraintManager.php

Braces +10 added lines, -20 removed lines

@@ -27,8 +27,7 @@ 
   public function getConstraints($constraint_class = NULL) {
     if ($constraint_class == NULL) {
       return $this->constraint;
-    }
-    else {
+    } else {
       return $this->constraint[$constraint_class];
     }
   }
@@ -58,12 +57,10 @@ 
   public function normalizeConstraints($constraint_class = NULL) {
     if ($constraint_class == NULL) {
       $classes = array_keys($this->constraints);
-    }
-    else {
+    } else {
       if (isset($this->constraints[$constraint_class])) {
         $classes = array($constraint_class);
-      }
-      else {
+      } else {
         return array();
       }
     }
@@ -89,8 +86,7 @@ 
 
     if ($constraint_class == NULL) {
       return $new_constraints;
-    }
-    else {
+    } else {
       return $new_constraints[$constraint_class];
     }
   }
@@ -119,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')));
@@ -136,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();
 
@@ -194,12 +187,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')));
@@ -211,8 +202,7 @@ 
                 $split_end_date = $end_date;
 
                 $split_constraint = new CheckInDayConstraint($constraint->getUnits(), $constraint->getCheckinDay(), $split_start_date, $split_end_date);
-              }
-              else {
+              } else {
                 $split_start_date = $split_constraint->getStartDate();
                 $split_end_date = $split_constraint->getEndDate();