Roomify / bat

src/Constraint/Constraint.php

Unused Use Statements -2 removed lines

@@ -7,8 +7,6 @@
 
 namespace Roomify\Bat\Constraint;
 
-use Roomify\Bat\ConstraintInterface;
-
 
 /**
  * A constraint acts as a filter that can be applied to a Calendar Response to

src/Event/AbstractEvent.php

Doc Comments +3 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
   /**
    * Set the start date.
    *
-   * @param DateTime $start_date
+   * @param \DateTime $start_date
    */
   public function setStartDate(\DateTime $start_date) {
     $this->start_date = clone($start_date);
@@ -127,7 +127,7 @@ 
   /**
    * Set the end date.
    *
-   * @param DateTime $end_date
+   * @param \DateTime $end_date
    */
   public function setEndDate(\DateTime $end_date) {
     $this->end_date = clone($end_date);
@@ -239,6 +239,7 @@ 
 
   /**
    * {@inheritdoc}
+   * @param \DateTime $date
    */
   public function isLastMonth($date) {
     if ($date->format("n") == $this->endMonth() && $date->format("Y") == $this->endYear()) {

Spacing +7 added lines, -7 removed lines

@@ -444,14 +444,14 @@ 
 
     $counter = (int)$period_start->format('i');
     $start_minute = $counter;
-    foreach($period as $minute) {
+    foreach ($period as $minute) {
       // Doing minutes so set the values in the minute array
-      $itemized[BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]['m' .$minute->format('i')] = $this->getValue();
+      $itemized[BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->getValue();
       // Let the hours know that it cannot determine availability
-      $itemized[BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')] = -1;
+      $itemized[BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1;
       $counter++;
 
-      if ($counter == 60 && $start_minute!==0) {
+      if ($counter == 60 && $start_minute !== 0) {
         // Not a real hour - leave as is and move on
         $counter = 0;
         $start_minute = 0;
@@ -460,7 +460,7 @@ 
         // Did a real whole hour so initialize the hour
         $itemized[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
-        unset($itemized[BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]);
+        unset($itemized[BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]);
         $counter = 0;
         $start_minute = 0;
       }
@@ -481,12 +481,12 @@ 
     // Set the end date to the last day of the month so that we are sure to get that last month
     $adjusted_end_day = new \DateTime($this->end_date->format('Y-n-t'));
 
-    $daterange = new \DatePeriod($this->start_date, $interval ,$adjusted_end_day);
+    $daterange = new \DatePeriod($this->start_date, $interval, $adjusted_end_day);
 
     $itemized = array();
 
     // Cycle through each month
-    foreach($daterange as $date) {
+    foreach ($daterange as $date) {
 
       $year = $date->format("Y");
       $dayinterval = new \DateInterval('P1D');

Braces +4 added lines, -8 removed lines

@@ -405,8 +405,7 @@ 
         $itemized[BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[BAT_HOUR][$sy][$sm]['d' . $sd];
         $itemized[BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[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")));
@@ -414,8 +413,7 @@ 
         $itemized[BAT_DAY][$sy][$sm]['d' . $sd] = -1;
         $itemized[BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[BAT_HOUR][$sy][$sm]['d' . $sd];
         $itemized[BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[BAT_MINUTE][$sy][$sm]['d' . $sd];
-      }
-      else {
+      } else {
         // Just set an empty hour and minute
         $itemized[BAT_HOUR][$sy][$sm]['d' . $sd] = array();
         $itemized[BAT_MINUTE][$sy][$sm]['d' . $sd] = array();
@@ -455,8 +453,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[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
@@ -497,8 +494,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) {

src/Calendar/AbstractCalendar.php

Spacing +6 added lines, -6 removed lines

@@ -129,7 +129,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);
@@ -218,7 +218,7 @@ 
         foreach ($months as $month => $days) {
           foreach ($days as $day => $hours) {
             foreach ($hours as $hour => $value) {
-              $events[$unit][BAT_HOUR][$year][$month]['d'.$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
+              $events[$unit][BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
             }
           }
         }
@@ -232,7 +232,7 @@ 
             foreach ($hours as $hour => $minutes) {
               foreach ($minutes as $minute => $value) {
                 if (isset($db_events[$unit][BAT_MINUTE][$year][$month][$day][$hour][$minute])) {
-                  $events[$unit][BAT_MINUTE][$year][$month]['d' .$day]['h'.$hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]);
+                  $events[$unit][BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]);
                 }
                 else {
                   // If nothing from db - then revert to the defaults
@@ -250,7 +250,7 @@ 
           foreach ($days as $day => $hours) {
             foreach ($hours as $hour => $minutes) {
               foreach ($minutes as $minute => $value) {
-                $events[$unit][BAT_MINUTE][$year][$month]['d'.$day]['h'.$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
+                $events[$unit][BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
               }
             }
           }
@@ -325,12 +325,12 @@ 
                       // Value just switched - let us wrap up with current event and start a new one
                       $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $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;

Braces +12 added lines, -24 removed lines

@@ -58,8 +58,7 @@ 
         $added = FALSE;
         watchdog('BAT', t('Event with @id, start date @start_date and end date @end_date was not added.', array('@id' => $event->value, '@start_date' => $event->startDateToString(), '@end_date' => $event->endDateToString())));
         break;
-      }
-      else {
+      } else {
         watchdog('BAT', t('Event with @id, start date @start_date and end date @end_date added.', array('@id' => $event->value, '@start_date' => $event->startDateToString(), '@end_date' => $event->endDateToString())));
       }
     }
@@ -133,8 +132,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);
       }
 
@@ -184,8 +182,7 @@ 
             foreach ($days as $day => $value) {
               $events[$unit][BAT_DAY][$year][$month][$day] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day]);
             }
-          }
-          else {
+          } else {
             foreach ($days as $day => $value) {
               $events[$unit][BAT_DAY][$year][$month][$day] = $keyed_units[$unit]->getDefaultValue();
             }
@@ -202,8 +199,7 @@ 
             foreach ($hours as $hour => $value) {
               if (isset($db_events[$unit][BAT_HOUR][$year][$month][$day][$hour])) {
                 $events[$unit][BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour]);
-              }
-              else {
+              } else {
                 // If nothing from db - then revert to the defaults
                 $events[$unit][BAT_HOUR][$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue();
               }
@@ -233,8 +229,7 @@ 
               foreach ($minutes as $minute => $value) {
                 if (isset($db_events[$unit][BAT_MINUTE][$year][$month][$day][$hour][$minute])) {
                   $events[$unit][BAT_MINUTE][$year][$month]['d' .$day]['h'.$hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]);
-                }
-                else {
+                } else {
                   // If nothing from db - then revert to the defaults
                   $events[$unit][BAT_MINUTE][$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue();
                 }
@@ -320,8 +315,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][] = new Event($start_event, $end_event, $unit, $current_value);
                       $start_event = clone($end_event->add(new \DateInterval('PT1M')));
@@ -335,12 +329,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][] = new Event($start_event, $end_event, $unit, $current_value);
                   // Start event becomes the end event with a minute added
@@ -357,12 +349,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][] = new Event($start_event, $end_event, $unit, $current_value);
               // Start event becomes the end event with a minute added
@@ -397,8 +387,7 @@ 
           if ($event->endsLater($end_date)) {
             $event->setEndDate($end_date);
           }
-        }
-        else {
+        } else {
           // Event completely not in range so unset it
           unset($normalized_events[$unit][$key]);
         }
@@ -432,8 +421,7 @@ 
           $e++;
           $flipped[$e][$value][$datum] = $datum;
           $old_value = $value;
-        }
-        else {
+        } else {
           $flipped[$e][$value][$datum] = $datum;
         }
       }

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/Constraint/MinMaxConstraint.php

Spacing +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
         $text = t('The stay') . ' ';
       }
       else {
-        $text .=   ' ' . t('the stay') . ' ';
+        $text .= ' ' . t('the stay') . ' ';
       }
     }
     if ($minimum_stay && $maximum_stay) {

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

src/Store/DrupalDBStore.php

Spacing +14 added lines, -14 removed lines

@@ -78,7 +78,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
@@ -89,30 +89,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];
       }
@@ -230,16 +230,16 @@ 
 
     $query_parameters = '';
 
-    foreach($itemized[BAT_DAY] as $year => $months) {
+    foreach ($itemized[BAT_DAY] as $year => $months) {
       if ($year_count > 0) {
         // We are dealing with multiple years so add an OR
         $query_parameters .= ' OR ';
       }
       $query_parameters .= 'year IN (' . $year . ') ';
-      $query_parameters .= 'AND month IN (' . implode("," ,array_keys($months)) .') ';
+      $query_parameters .= 'AND month IN (' . implode(",", array_keys($months)) . ') ';
       if (count($unit_ids) > 0) {
         // Unit ids are defined so add this as a filter
-        $query_parameters .= 'AND unit_id in (' . implode("," , $unit_ids) .') ';
+        $query_parameters .= 'AND unit_id in (' . implode(",", $unit_ids) . ') ';
       }
       $year_count++;
     }

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);