Roomify / bat

src/Event/AbstractEvent.php

Braces +5 added lines, -10 removed lines

@@ -342,8 +342,7 @@ 
     if ($this->dateIsEarlier($start) &&
       ($this->dateIsInRange($end) || $this->dateIsLater($end))) {
       $overlaps = TRUE;
-    }
-    elseif ($this->dateIsInRange($start) &&
+    } elseif ($this->dateIsInRange($start) &&
       ($this->dateIsInRange($end) || $this->dateIsLater($end))) {
       $overlaps = TRUE;
     }
@@ -478,8 +477,7 @@ 
         $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd];
         $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[AbstractEvent::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->start_date->format('H:i') == '00:00')) {
         $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59")));
@@ -487,8 +485,7 @@ 
         $itemized[AbstractEvent::BAT_DAY][$sy][$sm]['d' . $sd] = -1;
         $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd];
         $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd];
-      }
-      else {
+      } else {
         // Just set an empty hour and minute
         $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = array();
         $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = array();
@@ -533,8 +530,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[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue();
         // We have a whole hour so get rid of the minute info
@@ -582,8 +578,7 @@ 
           // If we are in the same month the end date is the end date of the event
           if ($this->isSameMonth()) {
             $dayrange = new \DatePeriod($this->start_date, $dayinterval, new \DateTime($this->end_date->format("Y-n-j 23:59:59")));
-          }
-          else { // alternatively it is the last day of the start month
+          } else { // alternatively it is the last day of the start month
             $dayrange = new \DatePeriod($this->start_date, $dayinterval, $this->endMonthDate($this->start_date));
           }
           foreach ($dayrange as $day) {