CorWatts / fasterscale

common/tests/unit/components/TimeTest.php

Spacing +10 added lines, -10 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');
       });
 
@@ -47,7 +47,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")));
       });
@@ -55,13 +55,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');
@@ -74,14 +74,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');
@@ -94,7 +94,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")));
       });
@@ -116,7 +116,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');
@@ -203,11 +203,11 @@ 
       $tz = 'America/Los_Angeles';
       $this->time->timezone = 'America/Los_Angeles';
 
-      $today =  new \DateTime("now + 1 day", new \DateTimeZone($tz)); // we do an extra day to include today as the last day
+      $today = new \DateTime("now + 1 day", new \DateTimeZone($tz)); // we do an extra day to include today as the last day
       $should_be_today = $this->time->getDateTimesInPeriod()->getEndDate();
       expect('getDateTimesInPeriod should return a list of \DatePeriods, the last being for today', $this->assertEquals($today->format('Y-m-d H'), $should_be_today->format('Y-m-d H')));
 
-      $start =  new \DateTime("30 days ago", new \DateTimeZone($tz));
+      $start = new \DateTime("30 days ago", new \DateTimeZone($tz));
       $should_be_start = $this->time->getDateTimesInPeriod()->getStartDate();
       expect('getDateTimesInPeriod should return a list of \DatePeriods, the first being for 30 days ago (by default)', $this->assertEquals($start->format('Y-m-d H'), $should_be_start->format('Y-m-d H')));
     }

site/views/profile/index.php

Spacing +2 added lines, -2 removed lines

@@ -71,11 +71,11 @@
 ]); ?>
             <?= $form->field($profile, 'timezone')->dropDownList(array_combine($timezones, $timezones)); ?>
             <?= $form->field($profile, 'expose_graph')->checkbox() ?>
-            <?php if($profile->expose_graph): ?>
+            <?php if ($profile->expose_graph): ?>
             <div class='alert alert-success behaviors-graph-info'>Your behaviors graph can be found at:<br /> <a id="behaviors-graph-link" target="_blank" href="<?=$graph_url?>"><?=$graph_url?></a></div>
             <?php endif; ?>
             <?= $form->field($profile, 'send_email')->checkbox() ?>
-            <div id='send_email_fields' <?php if(!$profile->send_email) { ?>style="display: none;"<?php } ?>>
+            <div id='send_email_fields' <?php if (!$profile->send_email) { ?>style="display: none;"<?php } ?>>
               <?= $form->field($profile, 'email_category')->dropdownList(Category::getCategories(), ['data-toggle' => 'tooltip', 'data-placement' => 'left', 'data-trigger' => 'hover', 'data-delay' => '{"show": 500, "hide": 100}', 'title' => 'Want to send an email with every check-in? Try setting this to "Restoration"']) ?>
               <?= $form->field($profile, 'partner_email1')->input('email'); ?>
               <?= $form->field($profile, 'partner_email2')->input('email'); ?>

site/models/EditProfileForm.php

Indentation +3 added lines, -3 removed lines

@@ -60,8 +60,8 @@ 
   }
 
   /**
-     * @codeCoverageIgnore
-     */
+   * @codeCoverageIgnore
+   */
   public function attributeLabels() {
     return [
       'partner_email1' => "Partner Email #1",
@@ -93,7 +93,7 @@ 
 
         // generate behaviors graph image
         $checkins_last_month = (Yii::$container->get(\common\interfaces\UserBehaviorInterface::class))
-                                               ->getCheckInBreakdown();
+                                                ->getCheckInBreakdown();
 
         // if they haven't done a check-in in the last month this will explode
         // because $checkins_last_month is an empty array

Spacing +4 added lines, -4 removed lines

@@ -85,10 +85,10 @@ 
       $graph = Yii::$container
         ->get(\common\components\Graph::class, [$this->user]);
 
-      if($this->timezone) {
+      if ($this->timezone) {
         $user->timezone = $this->timezone;
       }
-      if($this->expose_graph) {
+      if ($this->expose_graph) {
         $user->expose_graph = true;
 
         // generate behaviors graph image
@@ -97,7 +97,7 @@ 
 
         // if they haven't done a check-in in the last month this will explode
         // because $checkins_last_month is an empty array
-        if($checkins_last_month) {
+        if ($checkins_last_month) {
           $graph->create($checkins_last_month, true);
         }
       } else {
@@ -106,7 +106,7 @@ 
         $graph->destroy();
       }
 
-      if($this->send_email) {
+      if ($this->send_email) {
         $user->send_email = true;
         $user->email_category = $this->email_category;
         $user->partner_email1 = $this->partner_email1;

site/models/SignupForm.php

Spacing +3 added lines, -3 removed lines

@@ -89,7 +89,7 @@ 
    */
   public function signup() {
     $user = $this->user->findByEmail($this->email);
-    if(!$user) {
+    if (!$user) {
       // this is a brand new user
       $this->user = $this->setFields($this->user);
       $this->user->save();
@@ -103,7 +103,7 @@ 
        * this is a user that for whatever reason is trying to sign up again
        * with the same email address.
        */
-      if(!$user->isTokenConfirmed()) {
+      if (!$user->isTokenConfirmed()) {
         /*
          * they've never verified their account. We don't care if their
          * verification token is current or expired. We're resetting their
@@ -131,7 +131,7 @@ 
       $user->generateAuthKey();
       $user->generateVerifyEmailToken();
 
-      if($user->send_email) {
+      if ($user->send_email) {
         $user->send_email = true;
         $user->email_category = $this->email_category;
         $user->partner_email1 = $this->partner_email1;

site/assets/assets.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
  */
 
 // In the console environment, some path aliases may not exist. Please define these:
- Yii::setAlias('@webroot', __DIR__ . '/../web');
- Yii::setAlias('@web', '/');
+  Yii::setAlias('@webroot', __DIR__ . '/../web');
+  Yii::setAlias('@web', '/');
 
 $mainConf = require Yii::getAlias('@site/config/main.php');
 $converter = $mainConf['components']['assetManager']['converter'];

site/tests/unit/models/QuestionFormTest.php

Indentation +49 added lines, -49 removed lines

@@ -85,10 +85,10 @@ 
       $model->answer_2c = 'answering question c';
 
       expect('behaviorToAnswers should return the answer properties related to the behavior number supplied', $this->assertEquals($model->behaviorToAnswers(1), [
-                                                               'a' => 'answering question a',
-                                                               'b' => 'answering question b',
-                                                               'c' => 'answering question c'
-                                                             ]));
+                                                                'a' => 'answering question a',
+                                                                'b' => 'answering question b',
+                                                                'c' => 'answering question c'
+                                                              ]));
 
       expect('behaviorToAnswers should return the the empty set when there are no answers associated with the supplied behavior number', $this->assertEmpty($model->behaviorToAnswers(7)));
     });
@@ -117,60 +117,60 @@ 
         $this->fakeModel(13, 281, 8),
         $this->fakeModel(28, 284, 8)
       ]), [ [
-										'behavior_id' => 280,
+                    'behavior_id' => 280,
                     'category_id' => 8,
-										'user_bhvr_id' => 7,
-										'question_id' => 1,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 280,
+                    'user_bhvr_id' => 7,
+                    'question_id' => 1,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 280,
                     'category_id' => 8,
-										'user_bhvr_id' => 7,
-										'question_id' => 2,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 280,
+                    'user_bhvr_id' => 7,
+                    'question_id' => 2,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 280,
                     'category_id' => 8,
-										'user_bhvr_id' => 7,
-										'question_id' => 3,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 281,
+                    'user_bhvr_id' => 7,
+                    'question_id' => 3,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 281,
                     'category_id' => 8,
-										'user_bhvr_id' => 13,
-										'question_id' => 1,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 281,
+                    'user_bhvr_id' => 13,
+                    'question_id' => 1,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 281,
                     'category_id' => 8,
-										'user_bhvr_id' => 13,
-										'question_id' => 2,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 281,
+                    'user_bhvr_id' => 13,
+                    'question_id' => 2,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 281,
                     'category_id' => 8,
-										'user_bhvr_id' => 13,
-										'question_id' => 3,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 284,
+                    'user_bhvr_id' => 13,
+                    'question_id' => 3,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 284,
                     'category_id' => 8,
-										'user_bhvr_id' => 28,
-										'question_id' => 1,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 284,
+                    'user_bhvr_id' => 28,
+                    'question_id' => 1,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 284,
                     'category_id' => 8,
-										'user_bhvr_id' => 28,
-										'question_id' => 2,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 284,
+                    'user_bhvr_id' => 28,
+                    'question_id' => 2,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 284,
                     'category_id' => 8,
-										'user_bhvr_id' => 28,
-										'question_id' => 3,
-										'answer' => 'processing emotions',
-									]]));
+                    'user_bhvr_id' => 28,
+                    'question_id' => 3,
+                    'answer' => 'processing emotions',
+                  ]]));
     });
   }
 

Spacing +4 added lines, -4 removed lines

@@ -17,14 +17,14 @@ 
     $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
     $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');
     });
   }
 
   public function testAttributeLabels()
   {
-    $this->specify('setBehaviors should function properly', function () {
+    $this->specify('setBehaviors should function properly', function() {
       $model = $this->container->get('\site\models\QuestionForm');
       expect('attributeLabels should be correct', $this->assertEquals($model->attributeLabels(), [
         'user_behavior_id1' => 'Restoration',
@@ -43,7 +43,7 @@ 
     $model = $this->container->get('\site\models\QuestionForm');
     $validator = $model->getBhvrValidator();
 
-    $this->specify('getBhvrValidator should function properly', function () use($model, $validator) {
+    $this->specify('getBhvrValidator should function properly', function() use($model, $validator) {
       expect('getBhvrValidator should return false when nothing is set on the form', $this->assertFalse($validator($model, "user_behavior_id1")));
       expect('getBhvrValidator should return false when nothing is set on the form', $this->assertFalse($validator($model, "user_behavior_id7")));
 
@@ -116,7 +116,7 @@ 
         $this->fakeModel(7, 280, 8),
         $this->fakeModel(13, 281, 8),
         $this->fakeModel(28, 284, 8)
-      ]), [ [
+      ]), [[
 										'behavior_id' => 280,
                     'category_id' => 8,
 										'user_bhvr_id' => 7,

site/views/checkin/report.php

Spacing +5 added lines, -5 removed lines

@@ -25,12 +25,12 @@
                   <th>Behavior</th>
                   <th>Category</th>
               </tr>
-  <?php foreach($top_behaviors as $key => $row) {
+  <?php foreach ($top_behaviors as $key => $row) {
   $num = $key + 1;
-  print "<tr>".
-    "<td>{$row['count']}</td>".
-    "<td>{$row['behavior']['name']}</td>".
-    "<td>{$row['category']['name']}</td>".
+  print "<tr>" .
+    "<td>{$row['count']}</td>" .
+    "<td>{$row['behavior']['name']}</td>" .
+    "<td>{$row['category']['name']}</td>" .
     "</tr>";
   }
   ?>

site/models/CheckinForm.php

Indentation +7 added lines, -7 removed lines

@@ -57,7 +57,7 @@ 
   public function setBehaviors($behaviors) {
     foreach($behaviors as $category_id => $bhvr_set) {
       $attribute = "behaviors$category_id";
-			$this->$attribute = [];
+      $this->$attribute = [];
       foreach($bhvr_set as $behavior) {
         $this->{$attribute}[] = $behavior['id'];
       }
@@ -76,12 +76,12 @@ 
 
   public function compileBehaviors() {
     $behaviors = array_merge((array)$this->behaviors1,
-                           (array)$this->behaviors2,
-                           (array)$this->behaviors3,
-                           (array)$this->behaviors4,
-                           (array)$this->behaviors5,
-                           (array)$this->behaviors6,
-                           (array)$this->behaviors7);
+                            (array)$this->behaviors2,
+                            (array)$this->behaviors3,
+                            (array)$this->behaviors4,
+                            (array)$this->behaviors5,
+                            (array)$this->behaviors6,
+                            (array)$this->behaviors7);
 
     return array_filter($behaviors); // strip out false values
   }

Spacing +10 added lines, -10 removed lines

@@ -55,10 +55,10 @@ 
   }
 
   public function setBehaviors($behaviors) {
-    foreach($behaviors as $category_id => $bhvr_set) {
+    foreach ($behaviors as $category_id => $bhvr_set) {
       $attribute = "behaviors$category_id";
 			$this->$attribute = [];
-      foreach($bhvr_set as $behavior) {
+      foreach ($bhvr_set as $behavior) {
         $this->{$attribute}[] = $behavior['id'];
       }
     }   
@@ -66,8 +66,8 @@ 
 
   public function validateBehaviors($attribute, $params) {
     if (!$this->hasErrors()) {
-      foreach($this->$attribute as $behavior) {
-        if(!is_numeric($behavior)) {
+      foreach ($this->$attribute as $behavior) {
+        if (!is_numeric($behavior)) {
           $this->addError($attribute, 'One of your behaviors is not an integer!');
         }
       }
@@ -105,7 +105,7 @@ 
 
     // delete cached behaviors
     array_map(function($period) use ($time) {
-      $key = "checkins_".Yii::$app->user->id."_{$period}_".$time->getLocalDate();
+      $key = "checkins_" . Yii::$app->user->id . "_{$period}_" . $time->getLocalDate();
       Yii::$app->cache->delete($key);
     }, [30, 90, 180]);
   }
@@ -120,7 +120,7 @@ 
   public function mergeWithDefault(array $user_behaviors) {
     $behaviors = AH::index(Yii::$container->get(BehaviorInterface::class)::$behaviors, 'name', "category_id");
     array_walk($behaviors, function(&$bhvrs, $cat_id) use ($user_behaviors) {
-      if(array_key_exists($cat_id, $user_behaviors)) {
+      if (array_key_exists($cat_id, $user_behaviors)) {
         $bhvrs = AH::merge($bhvrs, $user_behaviors[$cat_id]);
       }
     });
@@ -128,14 +128,14 @@ 
   }
 
   public function save() {
-    if(empty($this->compiled_behaviors)) {
+    if (empty($this->compiled_behaviors)) {
       $this->commpiled_behaviors = $this->compileBehaviors();
     }
 
     $user_behavior = Yii::$container->get(\common\interfaces\UserBehaviorInterface::class);
 
     $rows = [];
-    foreach($this->compiled_behaviors as $behavior_id) {
+    foreach ($this->compiled_behaviors as $behavior_id) {
       $behavior_id = (int)$behavior_id;
       $behavior = \common\models\Behavior::getBehavior('id', $behavior_id);
       $category_id = $behavior['category_id'];
@@ -158,10 +158,10 @@ 
       )->execute();
 
     // if the user has publicised their check-in graph, create the image
-    if(Yii::$app->user->identity->expose_graph) {
+    if (Yii::$app->user->identity->expose_graph) {
       $checkins_last_month = $user_behavior->getCheckInBreakdown();
 
-      if($checkins_last_month) {
+      if ($checkins_last_month) {
         Yii::$container
           ->get(\common\components\Graph::class, [Yii::$app->user->identity])
           ->create($checkins_last_month, true);

site/controllers/CheckinController.php

Spacing +10 added lines, -10 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,7 +49,7 @@ 
 
       return $this->redirect(['questions']);
     } else {
-      $behaviors  = Yii::$container->get(BehaviorInterface::class)::$behaviors;
+      $behaviors = Yii::$container->get(BehaviorInterface::class)::$behaviors;
       return $this->render('index', [
         'categories'    => Yii::$container->get(CategoryInterface::class)::$categories,
         'model'         => $form,
@@ -63,7 +63,7 @@ 
     $date = Yii::$container->get(TimeInterface::class)->getLocalDate();
 
     $user_behaviors = $user_behavior->getUserBehaviorsWithCategory($date);
-    if(count($user_behaviors) === 0) {
+    if (count($user_behaviors) === 0) {
       return $this->redirect(['view']);
     }
 
@@ -73,10 +73,10 @@ 
       $form->deleteToday();
 
       $behaviors = $user_behavior->findAll($form->getUserBehaviorIds());
-      if($result = $form->saveAnswers($behaviors)) {
+      if ($result = $form->saveAnswers($behaviors)) {
 
-        if(Yii::$app->user->identity->send_email) {
-          if(Yii::$app->user->identity->sendEmailReport($date)) {
+        if (Yii::$app->user->identity->send_email) {
+          if (Yii::$app->user->identity->sendEmailReport($date)) {
             Yii::$app->session->setFlash('success', 'Your check-in is complete. A notification has been sent to your report partners.');
           } else {
             Yii::$app->session->setFlash('success', 'Your check-in is complete.');
@@ -131,7 +131,7 @@ 
     $raw_pie_data  = $user_behavior::decorate($user_behavior->getBehaviorsWithCounts());
     $answer_pie    = $user_behavior->getBehaviorsByCategory($raw_pie_data);
 
-    $pie_data   = [
+    $pie_data = [
       "labels"   => array_column($answer_pie, "name"),
       "datasets" => [[
           "data"                 => array_map('intval', array_column($answer_pie, "count")),
@@ -166,14 +166,14 @@ 
     $checkins = $user_behavior->getCheckInBreakdown($period);
 
     $accum = [];
-    foreach($checkins as $date => $cats) {
-      for($i = 1; $i <= 7; $i ++) {
+    foreach ($checkins as $date => $cats) {
+      for ($i = 1; $i <= 7; $i++) {
         $accum[$i][] = array_key_exists($i, $cats) ? $cats[$i]['count'] : [];
       }
     }
 
     $bar_datasets = [];
-    foreach($accum as $idx => $data) {
+    foreach ($accum as $idx => $data) {
       $bar_datasets[] = [
         'label' => ($category::getCategories())[$idx],
         'backgroundColor' => $category::$colors[$idx]['color'],