Roomify / bat

src/Event/AbstractEvent.php

Doc Comments +4 added lines, -3 removed lines

@@ -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);
@@ -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()) {
@@ -535,7 +536,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

src/Calendar/AbstractCalendar.php

Spacing +6 added lines, -6 removed lines

@@ -123,7 +123,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);
@@ -212,7 +212,7 @@ 
         foreach ($months as $month => $days) {
           foreach ($days as $day => $hours) {
             foreach ($hours as $hour => $value) {
-              $events[$unit][Event::BAT_HOUR][$year][$month]['d'.$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
+              $events[$unit][Event::BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
             }
           }
         }
@@ -226,7 +226,7 @@ 
             foreach ($hours as $hour => $minutes) {
               foreach ($minutes as $minute => $value) {
                 if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) {
-                  $events[$unit][Event::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][Event::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
@@ -244,7 +244,7 @@ 
           foreach ($days as $day => $hours) {
             foreach ($hours as $hour => $minutes) {
               foreach ($minutes as $minute => $value) {
-                $events[$unit][Event::BAT_MINUTE][$year][$month]['d'.$day]['h'.$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
+                $events[$unit][Event::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value);
               }
             }
           }
@@ -316,12 +316,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 +11 added lines, -22 removed lines

@@ -127,8 +127,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);
       }
 
@@ -178,8 +177,7 @@ 
             foreach ($days as $day => $value) {
               $events[$unit][Event::BAT_DAY][$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) {
               $events[$unit][Event::BAT_DAY][$year][$month][$day] = $keyed_units[$unit]->getDefaultValue();
             }
@@ -196,8 +194,7 @@ 
             foreach ($hours as $hour => $value) {
               if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) {
                 $events[$unit][Event::BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int)$db_events[$unit][Event::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][Event::BAT_HOUR][$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue();
               }
@@ -227,8 +224,7 @@ 
               foreach ($minutes as $minute => $value) {
                 if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) {
                   $events[$unit][Event::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][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue();
                 }
@@ -311,8 +307,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')));
@@ -326,12 +321,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
@@ -348,12 +341,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
@@ -388,8 +379,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]);
         }
@@ -420,8 +410,7 @@ 
           $e++;
           $flipped[$e][$value][$datum] = $datum;
           $old_value = $value;
-        }
-        else {
+        } else {
           $flipped[$e][$value][$datum] = $datum;
         }
       }

src/Store/JsonStore.php

Braces +1 added lines, -2 removed lines

@@ -166,8 +166,7 @@
         fwrite($minutefile, json_encode($minutefile_content));
         fclose($minutefile);
       }
-    }
-    catch (\Exception $e) {
+    } catch (\Exception $e) {
       $saved = FALSE;
     }