Roomify / bat

src/Store/SqlLiteDBStore.php

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/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, $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 {
       // 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, $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 {
         $itemized_end = $this->createHourlyGranular(new \DateTime($end_date->format("Y-n-j 00:00:00")), $end_date->add(new \DateInterval('PT1M')), $interval, 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];
       }
     }
 
@@ -271,9 +271,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) {
@@ -283,7 +283,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;
@@ -302,9 +302,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, $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];
-      }
-      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, 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];
@@ -280,8 +276,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();