Roomify / bat

src/Event/AbstractEvent.php

Doc Comments +6 added lines, -5 removed lines

@@ -85,7 +85,7 @@ 
   /**
    * Returns the start date.
    *
-   * @return DateTime
+   * @return \DateTime
    */
   public function getStartDate() {
     return clone($this->start_date);
@@ -102,7 +102,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);
@@ -111,7 +111,7 @@ 
   /**
    * Returns the end date.
    *
-   * @return DateTime
+   * @return \DateTime
    */
   public function getEndDate() {
     return clone($this->end_date);
@@ -128,7 +128,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);
@@ -240,6 +240,7 @@ 
 
   /**
    * {@inheritdoc}
+   * @param \DateTime $date
    */
   public function isLastMonth($date) {
     if ($date->format("n") == $this->endMonth() && $date->format("Y") == $this->endYear()) {
@@ -608,7 +609,7 @@ 
   /**
    * Saves an event to whatever Drupal tables are defined in the store array
    *
-   * @param \ROomify\Bat\\Store\Store $store
+   * @param Store $store
    * @param string $granularity
    *
    * @throws \Exception

Spacing +8 added lines, -8 removed lines

@@ -490,7 +490,7 @@ 
       }
 
       // Deal with the end date unless it ends just before midnight at which point we don't need to go further
-      if ($this->end_date->format('H:i') == '23:59' ) {
+      if ($this->end_date->format('H:i') == '23:59') {
         $itemized[AbstractEvent::BAT_HOUR][$ey][$em]['d' . $ed] = array();
         $itemized[AbstractEvent::BAT_MINUTE][$ey][$em]['d' . $ed] = array();
       } else {
@@ -518,14 +518,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[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]['m' .$minute->format('i')] = $this->getValue();
+      $itemized[AbstractEvent::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[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')] = -1;
+      $itemized[AbstractEvent::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;
@@ -534,7 +534,7 @@ 
         // 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
-        unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]);
+        unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]);
         $counter = 0;
         $start_minute = 0;
       }
@@ -555,12 +555,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 +5 added lines, -10 removed lines

@@ -337,8 +337,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;
     }
@@ -473,8 +472,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")));
@@ -482,8 +480,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();
@@ -529,8 +526,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
@@ -571,8 +567,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/Valuator/IntervalValuator.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
   protected $duration_unit;
 
-  public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit, Store $store, \DateInterval $duration_unit){
+  public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit, Store $store, \DateInterval $duration_unit) {
     parent::__construct($start_date, $end_date, $unit, $store);
     $this->duration_unit = $duration_unit;
   }
@@ -53,21 +53,21 @@ 
       //var_dump($period);
       //var_dump($unit);
       //var_dump($unit_events);
-      foreach ($unit_events as $event){
-        if ($unit = $this->unit->getUnitId()){
+      foreach ($unit_events as $event) {
+        if ($unit = $this->unit->getUnitId()) {
           foreach ($period as $dt) {
               // If event in period involved add value of event
               // If event is not completely in period involved then add just the percentage that is
               $last_period = $dt;
             print_r("Event is: ");
-            print_r($event->getStartDate()->format('Y-m-d H:i:s') ." to ");
-            print_r($event->getEndDate()->format('Y-m-d H:i:s') ."\n");
+            print_r($event->getStartDate()->format('Y-m-d H:i:s') . " to ");
+            print_r($event->getEndDate()->format('Y-m-d H:i:s') . "\n");
             print_r("Period is: ");
-            print_r($dt->format('Y-m-d H:i:s') ."\n");
-            if ($event->dateIsInRange($dt)){
+            print_r($dt->format('Y-m-d H:i:s') . "\n");
+            if ($event->dateIsInRange($dt)) {
               print_r("In range adding: " . $event->getValue() . " to event.\n");
               $value = $value + $event->getValue();
-              print_r("Current Value " .$value . "\n");
+              print_r("Current Value " . $value . "\n");
             }
           }
         }