CorWatts / fasterscale

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'];

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
             'baseUrl' => '@web',
             'js' => 'js/chartjs-{hash}.js',
             'css' => 'css/chartjs-{hash}.css',
-            'depends' => [ 'site\assets\ChartjsAsset' ]
+            'depends' => ['site\assets\ChartjsAsset']
         ],
         'pickadate' => [
           'class'      => 'yii\web\AssetBundle',
@@ -64,7 +64,7 @@ 
           'sourcePath' => '@web/assets',
           'baseUrl'    => '@web',
           'js'         => 'js/pickadate-{hash}.js',
-          'depends'    => [ 'site\assets\PickadateAsset' ]
+          'depends'    => ['site\assets\PickadateAsset']
         ]
       ],
     // Asset manager configuration:

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>";
   }
   ?>

common/tests/unit/models/UserBehaviorTest.php

Indentation +1 added lines, -1 removed lines

@@ -449,6 +449,6 @@
     $bhvrs = require(__DIR__.'/../data/behaviorsWithCounts.php');
     $expected = require(__DIR__.'/../data/expected_getCheckinBreakdown.php');
     $this->user_behavior->method('getBehaviorsWithCounts')->willReturn(...$bhvrs);
-		expect('asdf', $this->assertEquals($expected, $this->user_behavior->getCheckinBreakdown()));
+    expect('asdf', $this->assertEquals($expected, $this->user_behavior->getCheckinBreakdown()));
   }
 }

Spacing +4 added lines, -4 removed lines

@@ -287,7 +287,7 @@ 
 
   public function setUp() {
     // pull in test data
-    $data = require(__DIR__.'/../data/checkinData.php');
+    $data = require(__DIR__ . '/../data/checkinData.php');
     $this->singleBhvr = $data['singleBhvr'];
     $this->manyBhvrs = $data['manyBhvrs'];
     $this->allBhvrs = $data['allBhvrs'];
@@ -297,7 +297,7 @@ 
     $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
     $this->container->set('common\interfaces\QuestionInterface', '\site\tests\_support\MockQuestion');
     $this->container->set('common\interfaces\BehaviorInterface', 'common\models\Behavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
         return new \common\components\Time('America/Los_Angeles');
       });
 
@@ -446,8 +446,8 @@ 
                             ->setMethods(['getIsNewRecord', 'save', 'getBehaviorsWithCounts'])
                             ->getMock();
 
-    $bhvrs = require(__DIR__.'/../data/behaviorsWithCounts.php');
-    $expected = require(__DIR__.'/../data/expected_getCheckinBreakdown.php');
+    $bhvrs = require(__DIR__ . '/../data/behaviorsWithCounts.php');
+    $expected = require(__DIR__ . '/../data/expected_getCheckinBreakdown.php');
     $this->user_behavior->method('getBehaviorsWithCounts')->willReturn(...$bhvrs);
 		expect('asdf', $this->assertEquals($expected, $this->user_behavior->getCheckinBreakdown()));
   }

console/migrations/m190829_141748_alter_user_behavior_link_add_category_id.php

Spacing +6 added lines, -6 removed lines

@@ -22,20 +22,20 @@
 
       // then populate the columns
       $query = (new Query())->from('user_behavior_link');
-      foreach($query->batch() as $rows) {
-        foreach($rows as $row) {
+      foreach ($query->batch() as $rows) {
+        foreach ($rows as $row) {
           $bhvr = Behavior::getBehavior('id', $row['behavior_id']);
-          if($bhvr) {
+          if ($bhvr) {
             $this->update('{{%user_behavior_link}}', ['category_id' => $bhvr['category_id']], ['id' => $row['id']]);
           }
         }
       }
 
       $query = (new Query())->from('question');
-      foreach($query->batch() as $rows) {
-        foreach($rows as $row) {
+      foreach ($query->batch() as $rows) {
+        foreach ($rows as $row) {
           $bhvr = Behavior::getBehavior('id', $row['behavior_id']);
-          if($bhvr) {
+          if ($bhvr) {
             $this->update('{{%question}}', ['category_id' => $bhvr['category_id']], ['id' => $row['id']]);
           }
         }

common/models/UserBehavior.php

Braces +6 added lines, -2 removed lines

@@ -196,7 +196,9 @@ 
    * @return array
    */
   public function getByDate(int $user_id, $local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if(is_null($local_date)) {
+      $local_date = $this->time->getLocalDate();
+    }
 
     $behaviors = $this->getBehaviorData($user_id, $local_date);
     $behaviors = self::decorate($behaviors);
@@ -241,7 +243,9 @@ 
 
   // TODO: this should probably be a private method...but unit testing is hard
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if(!$behaviors) {
+      return [];
+    }
 
     $bhvrs_by_cat = [];
     foreach($behaviors as $behavior) {

Spacing +13 added lines, -13 removed lines

@@ -91,7 +91,7 @@ 
       ->groupBy('date, user_id')
       ->having('user_id = :user_id');
     $temp_dates = $query->all();
-    foreach($temp_dates as $temp_date) {
+    foreach ($temp_dates as $temp_date) {
       $past_checkin_dates[] = $this->time->convertUTCToLocal($temp_date['date']);
     }
 
@@ -126,12 +126,12 @@ 
 
   public function getCheckinBreakdown(int $period = 30) {
     $datetimes = $this->time->getDateTimesInPeriod($period);
-    $key = "checkins_".Yii::$app->user->id."_{$period}_".$this->time->getLocalDate();
+    $key = "checkins_" . Yii::$app->user->id . "_{$period}_" . $this->time->getLocalDate();
     $checkins = Yii::$app->cache->get($key);
 
-    if($checkins === false) {
+    if ($checkins === false) {
       $checkins = [];
-      foreach($datetimes as $datetime) {
+      foreach ($datetimes as $datetime) {
         $behaviors = self::decorate($this->getBehaviorsWithCounts($datetime));
         $checkins[$datetime->format('Y-m-d')] = $this->getBehaviorsByCategory($behaviors);
       }
@@ -157,7 +157,7 @@ 
   public function getBehaviorsByCategory(array $decorated_behaviors) {
     $arr = array_reduce($decorated_behaviors, function($acc, $row) {
       $cat_id = $row['category_id'];
-      if(array_key_exists($cat_id, $acc)) {
+      if (array_key_exists($cat_id, $acc)) {
         $acc[$cat_id]['count'] += $row['count'];
       } else {
         $acc[$cat_id] = [
@@ -189,11 +189,11 @@ 
       ->having('user_id = :user_id')
       ->orderBy('count DESC');
 
-    if($limit instanceof \DateTime) {
+    if ($limit instanceof \DateTime) {
       list($start, $end) = $this->time->getUTCBookends($limit->format('Y-m-d'));
       $query->params += [':start_date' => $start, ':end_date' => $end];
       $query->where('user_id=:user_id AND date > :start_date AND date <= :end_date');
-    } else if(is_int($limit)) {
+    } else if (is_int($limit)) {
       $query->limit($limit);
     }
     return $query->all();
@@ -211,7 +211,7 @@ 
    * @return array
    */
   public function getByDate(int $user_id, $local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if (is_null($local_date)) $local_date = $this->time->getLocalDate();
 
     $behaviors = $this->getBehaviorData($user_id, $local_date);
     $behaviors = self::decorate($behaviors);
@@ -224,10 +224,10 @@ 
    * @return an array of decorated UserBehaviors, each with an added Category and Behavior
    */
   public static function decorate(array $uo) {
-    foreach($uo as &$o) {
+    foreach ($uo as &$o) {
       $behavior = \common\models\Behavior::getBehavior('id', $o['behavior_id']);
       $category = \common\models\Category::getCategory('id', $o['category_id']);
-      if($behavior) {
+      if ($behavior) {
         $o['behavior'] = $behavior;
       } else if (array_key_exists('custom_behavior', $o)) {
         // if a behavior isn't set, this may be a custom_behavior
@@ -236,7 +236,7 @@ 
           'name' => $o['custom_behavior'],
         ];
       } // else -- something is weird
-      if($category) {
+      if ($category) {
         $o['category'] = $category;
       }
     }
@@ -262,10 +262,10 @@ 
 
   // TODO: this should probably be a private method...but unit testing is hard
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if (!$behaviors) return [];
 
     $bhvrs_by_cat = [];
-    foreach($behaviors as $behavior) {
+    foreach ($behaviors as $behavior) {
       $indx = $behavior['category_id'];
 
       $bname = AH::getValue($behavior, 'behavior.name', AH::getValue($behavior, 'custom_behavior'));

common/models/CustomBehavior.php

Spacing +3 added lines, -3 removed lines

@@ -106,9 +106,9 @@
       ], [
         'class' => 'kartik\grid\ActionColumn',
         'buttons' => [
-          'view' => function ($url, $model) { return ''; },
-          'update' => function ($url, $model) { return ''; },
-          'delete' => function ($url, $model) {
+          'view' => function($url, $model) { return ''; },
+          'update' => function($url, $model) { return ''; },
+          'delete' => function($url, $model) {
             return yii\helpers\Html::a('<span class="glyphicon glyphicon-remove"></span>', "/custom-behavior/delete?id={$model->id}", [
               'title' => 'Delete',
               'data-pjax' => true,

common/config/main.php

Spacing +3 added lines, -3 removed lines

@@ -11,8 +11,8 @@ 
       'common\interfaces\BehaviorInterface' => \common\models\Behavior::class,
       'common\interfaces\CategoryInterface' => \common\models\Category::class,
       'common\interfaces\CustomBehaviorInterface' => \common\models\CustomBehavior::class,
-      'common\interfaces\TimeInterface' => function () {
-        if(Yii::$app->user->getIsGuest()) {
+      'common\interfaces\TimeInterface' => function() {
+        if (Yii::$app->user->getIsGuest()) {
           return new \common\components\Time('UTC');
         } else {
           return new \common\components\Time(Yii::$app->user->identity->timezone);
@@ -30,7 +30,7 @@ 
   ],
   'components' => [
     // by default, sessions are stored in a local file
-    'cache' => [ // DummyCache never actually caches anything
+    'cache' => [// DummyCache never actually caches anything
       'class'=> yii\caching\DummyCache::class,
     ],
     'mailer' => [