Roomify / bat

src/Calendar/Calendar.php

Indentation +5 added lines, -5 removed lines

@@ -15,11 +15,11 @@
  */
 class Calendar extends AbstractCalendar {
 
-	/**
-	 * @param $units
-	 * @param $store
-	 * @param $default_value
-	 */
+  /**
+   * @param $units
+   * @param $store
+   * @param $default_value
+   */
   public function __construct($units, $store, $default_value = 0) {
     $this->units = $units;
     $this->store = $store;

src/Calendar/CalendarResponse.php

Braces +1 added lines, -2 removed lines

@@ -126,8 +126,7 @@
       unset($this->included_set[$unit->getUnitId()]);
       $this->addMiss($unit, $reason, $constraint);
       return TRUE;
-    }
-    else {
+    } else {
       return FALSE;
     }
   }

src/Store/DrupalDBStore.php

Braces +2 added lines, -4 removed lines

@@ -110,8 +110,7 @@ 
       for ($i = 0; $i<=59; $i++) {
         if ($i <= 9) {
           $index = 'm0'.$i;
-        }
-        else {
+        } else {
           $index = 'm'.$i;
         }
         $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index];
@@ -190,8 +189,7 @@ 
           }
         }
       }
-    }
-    catch (\Exception $e) {
+    } catch (\Exception $e) {
       $saved = FALSE;
       $transaction->rollback();
       watchdog_exception('BAT Event Save Exception', $e);

Spacing +11 added lines, -11 removed lines

@@ -26,7 +26,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
@@ -37,30 +37,30 @@ 
     $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']);
       $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']][$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']][$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;
+          $index = 'm0' . $i;
         }
         else {
-          $index = 'm'.$i;
+          $index = 'm' . $i;
         }
         $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index];
       }

src/Constraint/MinMaxDaysConstraint.php

Braces +6 added lines, -12 removed lines

@@ -70,8 +70,7 @@ 
             $calendar_response->removeFromMatched($included_set[$unit_id]['unit'], CalendarResponse::CONSTRAINT, $this);
 
             $this->affected_units[$unit_id] = $included_set[$unit_id]['unit'];
-          }
-          elseif (is_numeric($this->max_days) && $diff > $this->max_days) {
+          } elseif (is_numeric($this->max_days) && $diff > $this->max_days) {
             $calendar_response->removeFromMatched($included_set[$unit_id]['unit'], CalendarResponse::CONSTRAINT, $this);
 
             $this->affected_units[$unit_id] = $included_set[$unit_id]['unit'];
@@ -122,8 +121,7 @@ 
     if ($day_of_the_week) {
       if ($start_date && $end_date) {
         $text = t('From @start_date to @end_date, if booking starts on @day_of_the_week', $args);
-      }
-      else {
+      } else {
         $text = t('If booking starts on @day_of_the_week', $args);
       }
     }
@@ -132,8 +130,7 @@ 
     if ($minimum_stay || $maximum_stay) {
       if (empty($text)) {
         $text = t('The stay') . ' ';
-      }
-      else {
+      } else {
         $text .=   ' ' . t('the stay') . ' ';
       }
     }
@@ -141,15 +138,12 @@ 
       // Special case when min stay and max stay are the same.
       if ($minimum_stay == $maximum_stay) {
         $text .= t('must be for @minimum_stay', $args);
-      }
-      else {
+      } else {
         $text .= t('must be at least @minimum_stay and at most @maximum_stay', $args);
       }
-    }
-    elseif ($minimum_stay) {
+    } elseif ($minimum_stay) {
       $text .= t('must be for at least @minimum_stay', $args);
-    }
-    elseif ($maximum_stay) {
+    } elseif ($maximum_stay) {
       $text .= t('cannot be more than @maximum_stay', $args);
     }
 

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
   /**
    * {@inheritdoc}
    */
-  public function applyConstraint(CalendarResponse &$calendar_response) {
+  public function applyConstraint(CalendarResponse & $calendar_response) {
     $this->calendar_response = $calendar_response;
   }
 

src/Constraint/ConstraintInterface.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
    *
    * @param $calendar_response
    */
-  public function applyConstraint(CalendarResponse &$calendar_response);
+  public function applyConstraint(CalendarResponse & $calendar_response);
 
   /**
    * @param $start_date

src/Store/SqlLiteDBStore.php

Braces +2 added lines, -4 removed lines

@@ -110,8 +110,7 @@ 
       for ($i = 0; $i<=59; $i++) {
         if ($i <= 9) {
           $index = 'm0'.$i;
-        }
-        else {
+        } else {
           $index = 'm'.$i;
         }
         $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index];
@@ -190,8 +189,7 @@ 
           }
         }
       }
-    }
-    catch (\Exception $e) {
+    } catch (\Exception $e) {
       $saved = FALSE;
       $transaction->rollback();
       watchdog_exception('BAT Event Save Exception', $e);

Spacing +7 added lines, -7 removed lines

@@ -49,14 +49,14 @@ 
       // Figure out how many days the current month has
       $temp_date = new \DateTime($data['year'] . "-" . $data['month']);
       $days_in_month = (int)$temp_date->format('t');
-      for ($i = 1; $i<=$days_in_month; $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
     foreach ($results[Event::BAT_HOUR]->fetchAll() as $data) {
-      for ($i = 0; $i<=23; $i++) {
+      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];
       }
     }
@@ -102,7 +102,7 @@ 
           // Because SQLite does not have a nice merge first we have to check if a row exists to determine whether to do an insert or an update
           if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month])) {
             $command = "UPDATE $this->day_table SET ";
-            foreach ($days as $day => $value){
+            foreach ($days as $day => $value) {
               $command .= "$day = $value,";
             }
             $command = rtrim($command, ',');
@@ -125,11 +125,11 @@ 
                 $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) . ")");
@@ -148,11 +148,11 @@ 
                 $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) . ")");

src/Constraint/CheckInDayConstraint.php

Braces +1 added lines, -2 removed lines

@@ -102,8 +102,7 @@
     if ($day_of_the_week) {
       if ($start_date && $end_date) {
         $text = 'From @start_date to @end_date, if booking starts on @day_of_the_week';
-      }
-      else {
+      } else {
         $text = 'If booking starts on @day_of_the_week';
       }
 

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
   /**
    * {@inheritdoc}
    */
-  public function applyConstraint(CalendarResponse &$calendar_response) {
+  public function applyConstraint(CalendarResponse & $calendar_response) {
     $this->calendar_response = $calendar_response;
   }
 

src/Constraint/AbstractConstraint.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
   /**
    * {@inheritdoc}
    */
-  public function applyConstraint(CalendarResponse &$calendar_response) {
+  public function applyConstraint(CalendarResponse & $calendar_response) {
     $this->calendar_response = $calendar_response;
   }
 

src/Calendar/AbstractCalendar.php

Spacing +11 added lines, -11 removed lines

@@ -124,7 +124,7 @@ 
       $current_states = array_keys($unit_states);
       // Compare the current states with the set of valid states
       $remaining_states = array_diff($current_states, $valid_states);
-      if (count($remaining_states) == 0 ) {
+      if (count($remaining_states) == 0) {
         // 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);
@@ -163,7 +163,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,null), $this->default_value);
+    $mock_event = new Event($start_date, $end_date, new Unit(0, 0, null), $this->default_value);
     $itemized = $mock_event->itemizeEvent();
 
     // Cycle through each unit retrieved and provide it with a fully configured itemized mock event
@@ -253,11 +253,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();
             }
           }
         }
@@ -270,7 +270,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);
           }
@@ -300,11 +300,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();
               }
             }
           }
@@ -319,7 +319,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);
             }
@@ -382,12 +382,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;
@@ -530,7 +530,7 @@ 
    * @return mixed
    */
   protected function getUnit($unit_id) {
-    $keyed =  $this->keyUnitsById();
+    $keyed = $this->keyUnitsById();
     return $keyed[$unit_id];
   }
 

Braces +11 added lines, -22 removed lines

@@ -128,8 +128,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);
       }
 
@@ -223,8 +222,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();
           }
@@ -254,8 +252,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();
             }
@@ -301,8 +298,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();
               }
@@ -377,8 +373,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')));
@@ -392,12 +387,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
@@ -414,12 +407,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
@@ -454,8 +445,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]);
         }
@@ -486,8 +476,7 @@ 
           $e++;
           $flipped[$e][$value][$datum] = $datum;
           $old_value = $value;
-        }
-        else {
+        } else {
           $flipped[$e][$value][$datum] = $datum;
         }
       }