CorWatts / fasterscale

common/tests/unit/components/TimeTest.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
       $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
       $this->container->set('common\interfaces\QuestionInterface', '\site\tests\_support\MockQuestion');
 
-      $this->container->set('common\interfaces\TimeInterface', function () {
+      $this->container->set('common\interfaces\TimeInterface', function() {
         return new \common\components\Time('America/Los_Angeles');
       });
 
@@ -40,7 +40,7 @@ 
 
     public function testGetLocalTime()
     {
-      $this->specify('getLocalTime should function correctly', function () {
+      $this->specify('getLocalTime should function correctly', function() {
         expect("getLocalTime should work with user's set time", $this->assertEquals($this->time->getLocalTime(), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s")));
         expect('getLocalTime should work with a custom timezone', $this->assertEquals($this->time->getLocalTime("UTC"), (new DateTime("now"))->format("Y-m-d H:i:s")));
       });
@@ -48,13 +48,13 @@ 
 
     public function testConvertLocalToUTC()
     {
-      $this->specify('convertLocalToUTC should function correctly', function () {
+      $this->specify('convertLocalToUTC should function correctly', function() {
         $la_tz = (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s");
 
         expect('convertLocalToUTC should convert a Los Angeles tz to UTC with the included time', $this->assertEquals($this->time->convertLocalToUTC($la_tz), (new DateTime("now"))->format("Y-m-d H:i:s")));
         expect('convertLocalToUTC should convert a Los Angeles tz to UTC without the included time', $this->assertEquals($this->time->convertLocalToUTC($la_tz, false), (new DateTime("now"))->format("Y-m-d")));
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');
@@ -67,14 +67,14 @@ 
 
     public function testConvertUTCToLocal()
     {
-      $this->specify('convertUTCToLocal should function correctly', function () {
+      $this->specify('convertUTCToLocal should function correctly', function() {
         $utc_tz = (new DateTime("now"))->format("Y-m-d H:i:s");
 
         expect('convertUTCToLocal should convert a UTC tz to Los Angeles with the included timezone', $this->assertEquals((new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format(DateTime::ATOM), $this->time->convertUTCToLocal($utc_tz)));
         expect('convertUTCToLocal should convert a UTC tz to Los Angeles without the included timezone', $this->assertEquals($this->time->convertUTCToLocal($utc_tz, false), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s")));
 
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');
@@ -87,7 +87,7 @@ 
 
     public function testGetLocalDate()
     {
-      $this->specify('getLocalDate should function correctly', function () {
+      $this->specify('getLocalDate should function correctly', function() {
         expect("getLocalDate should correctly get the user's local date", $this->assertEquals($this->time->getLocalDate(), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d")));
         expect("getLocalDate should correctly get the local date of a specified timezone", $this->assertEquals($this->time->getLocalDate("UTC"), (new DateTime("now", new DateTimeZone("UTC")))->format("Y-m-d")));
       });
@@ -109,7 +109,7 @@ 
         expect('getUTCBookends should return false if there is a space at the end of the time string', $this->assertFalse($this->time->getUTCBookends('2016-05-30 00:00:00 ')));
         expect('getUTCBookends should return UTC bookend times from the Los_Angeles tz', $this->assertEquals($this->time->getUTCBookends('2016-05-30'), ['2016-05-30 07:00:00', '2016-05-31 06:59:59']));
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');

common/components/Time.php

Spacing +6 added lines, -6 removed lines

@@ -27,11 +27,11 @@ 
    */
   public function parse(string $time, string $format = 'Y-m-d') {
     $dt = DateTime::createFromFormat($format, $time, new DateTimeZone($this->timezone));
-    if($dt) {
+    if ($dt) {
       // for some reason, using createFromFromat adds in the time. The regular DateTime constructor _does not_ do this. We manually zero out the time here to make the DateTime objects match.
       $dt->setTime(0, 0, 0);
       $formatted = $dt->format($format);
-      if($formatted === $time && $this->inBounds($dt)) {
+      if ($formatted === $time && $this->inBounds($dt)) {
         return $dt;
       }
     }
@@ -50,7 +50,7 @@ 
     $test  = strtotime($dt->format('Y-m-d'));
     $now   = strtotime($this->getLocalDate());
 
-    if($first <= $test && $test <= $now) {
+    if ($first <= $test && $test <= $now) {
       return true;
     } else {
       return false;
@@ -74,7 +74,7 @@ 
   }
 
   public function getLocalTime($timezone = null) {
-    if($timezone === null)
+    if ($timezone === null)
       $timezone = $this->timezone;
 
     $timestamp = new DateTime("now", new DateTimeZone($timezone));
@@ -82,7 +82,7 @@ 
   }
 
   public function getLocalDate($timezone = null) {
-    if($timezone === null)
+    if ($timezone === null)
       $timezone = $this->timezone;
 
     return (new DateTime("now", new DateTimeZone($timezone)))
@@ -96,7 +96,7 @@ 
 
   public function getUTCBookends($local) {
     $local = trim($local);
-    if(strpos($local, " ")) {
+    if (strpos($local, " ")) {
       return false;
     }
 

site/controllers/CheckinController.php

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,7 @@ 
     if ($form->load(Yii::$app->request->post()) && $form->validate()) {
       $form->compiled_behaviors = $form->compileBehaviors();
 
-      if(sizeof($form->compiled_behaviors) === 0) {
+      if (sizeof($form->compiled_behaviors) === 0) {
         return $this->redirect(['view']);
       }
 
@@ -49,14 +49,14 @@ 
 
       // delete cached scores
       $time = Yii::$container->get('common\interfaces\TimeInterface');
-      $key = "scores_of_last_month_".Yii::$app->user->id."_".$time->getLocalDate();
+      $key = "scores_of_last_month_" . Yii::$app->user->id . "_" . $time->getLocalDate();
       Yii::$app->cache->delete($key);
 
       // if the user has publicised their score graph, create the image
-      if(Yii::$app->user->identity->expose_graph) {
+      if (Yii::$app->user->identity->expose_graph) {
         $user_behavior = Yii::$container->get('common\interfaces\UserBehaviorInterface');
         $scores_last_month = $user_behavior->calculateScoresOfLastMonth();
-        if($scores_last_month) {
+        if ($scores_last_month) {
           Yii::$container
             ->get('common\components\Graph')
             ->create($scores_last_month, true);
@@ -81,7 +81,7 @@ 
     $date = Yii::$container->get('common\interfaces\TimeInterface')->getLocalDate();
 
     $user_behaviors = $user_behavior->getUserBehaviorsWithCategory($date);
-    if(count($user_behaviors) === 0) {
+    if (count($user_behaviors) === 0) {
       return $this->redirect(['view']);
     }
 
@@ -91,10 +91,10 @@ 
       $form->deleteToday();
 
       $behaviors = $user_behavior->findAll($form->getUserBehaviorIds());
-      if($result = $form->saveAnswers($behaviors)) {
+      if ($result = $form->saveAnswers($behaviors)) {
 
         $score = $user_behavior->getDailyScore();
-        if(Yii::$app->user->identity->isOverThreshold($score)) {
+        if (Yii::$app->user->identity->isOverThreshold($score)) {
           Yii::$app->user->identity->sendEmailReport($date);
           Yii::$app->session->setFlash('warning', 'Your check-in is complete. A notification has been sent to your report partners because of your high score. Reach out to them!');
         } else {
@@ -114,9 +114,9 @@ 
   public function actionView(string $date = null)
   {
     $time = Yii::$container->get('common\interfaces\TimeInterface');
-    if(is_null($date)) {
+    if (is_null($date)) {
       $date = $time->getLocalDate();
-    } else if($dt = $time->parse($date)) {
+    } else if ($dt = $time->parse($date)) {
       $date = $dt->format('Y-m-d');
     } else {
       $date = $time->getLocalDate();