Roomify / bat

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

Spacing +19 added lines, -19 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();
           }
         }
       }
@@ -218,9 +218,9 @@ 
       if (!($this->event->getStartDate()->format('H:i') == '00:00' && $this->event->getEndDate()->format('H:i') == '23:59')) {
         $period = new \DatePeriod($start_date, $interval, $end_date->add(new \DateInterval('PT1M')));
         $itemized_same_day = $this->createHourlyGranular($period, $start_date);
-        $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 {
@@ -228,27 +228,27 @@ 
       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")));
         $itemized_start = $this->createHourlyGranular($start_period, $start_date);
-        $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 {
         $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;
-        $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];
       }
     }
 
@@ -270,9 +270,9 @@ 
     $start_minute = $counter;
     foreach ($period as $minute) {
       // Doing minutes so set the values in the minute array
-      $itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->event->getValue();
+      $itemized[EventItemizer::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'.$minute->format('j')]['h'.$minute->format('G')]['m'.$minute->format('i')] = $this->event->getValue();
       // Let the hours know that it cannot determine availability
-      $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1;
+      $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'.$minute->format('j')]['h'.$minute->format('G')] = -1;
       $counter++;
 
       if ($counter == 60 && $start_minute !== 0) {
@@ -282,7 +282,7 @@ 
       }
       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();
+        $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'.$minute->format('j')]['h'.$minute->format('G')] = $this->event->getValue();
 
         $counter = 0;
         $start_minute = 0;

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

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                     $split_start_date = clone($new_end_date)->add(new \DateInterval('P1D'));
                     $split_end_date = $end_date;
 
-                    $split_constraint = new MinMaxDaysConstraint($constraint->getUnits(), $constraint->getMinDays(), $constraint->getMaxDays(), $split_start_date, $split_end_date , $constraint->getCheckinDay());
+                    $split_constraint = new MinMaxDaysConstraint($constraint->getUnits(), $constraint->getMinDays(), $constraint->getMaxDays(), $split_start_date, $split_end_date, $constraint->getCheckinDay());
                   }
                   else {
                     $split_start_date = $split_constraint->getStartDate();

Braces +3 added lines, -6 removed lines

@@ -34,11 +34,9 @@ 
                   ($constraint->getMaxDays() && $new_constraint->getMaxDays())) {
                 if ($start_date >= $new_start_date && $start_date <= $new_end_date) {
                   $constraint->setStartDate(clone($new_end_date)->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) {
                   $constraint->setEndDate(clone($new_start_date)->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) {
                     $constraint->setEndDate(clone($new_start_date)->sub(new \DateInterval('P1D')));
                   }
@@ -48,8 +46,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();