CorWatts / fasterscale

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

site/tests/unit/models/CheckinFormTest.php

Indentation +10 added lines, -10 removed lines

@@ -95,8 +95,8 @@ 
       parent::setUp();
     }
 
-		public function testAttributeLabels()
-		{
+    public function testAttributeLabels()
+    {
         $this->specify('attributeLabels should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
           expect('attributeLabels should be correct', $this->assertEquals([
@@ -116,7 +116,7 @@ 
         $this->specify('setBehaviors should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
 
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('behaviors1 should be correct', $this->assertEquals([ 0 => 7 ], $model->behaviors1));
           expect('behaviors2 should be correct', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2));
           expect('behaviors3 should be correct', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3));
@@ -125,7 +125,7 @@ 
           expect('behaviors6 should be correct', $this->assertEquals([ 0 => 104 ], $model->behaviors6));
           expect('behaviors7 should be correct', $this->assertEquals([ 0 => 128 ], $model->behaviors7));
 
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 7 ], $model->behaviors1));
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2));
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3));
@@ -136,19 +136,19 @@ 
         });
     }
 
-		public function testValidateBehaviors()
-		{
+    public function testValidateBehaviors()
+    {
         $this->specify('validateBehaviors should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('validation should be good', $this->assertTrue($model->validate()));
 
           $model->behaviors1[0] = 'bad';
           expect('validation should be bad', $this->assertFalse($model->validate()));
         });
-		}
+    }
 
-		public function testCompileBehaviors()
+    public function testCompileBehaviors()
     {
       $model = $this->container->get('\site\models\CheckinForm');
       $model->setBehaviors($this->behaviors);
@@ -211,6 +211,6 @@ 
       $expected_behaviors = $base_behaviors;
       $expected_behaviors[7] += $other_behaviors;
 
-       expect('mergeWithDefault should return the given behaviors merged in with the base behaviors', $this->assertEquals($base_behaviors, $model->mergeWithDefault($other_behaviors)));
+        expect('mergeWithDefault should return the given behaviors merged in with the base behaviors', $this->assertEquals($base_behaviors, $model->mergeWithDefault($other_behaviors)));
     }
 }

Spacing +18 added lines, -18 removed lines

@@ -89,7 +89,7 @@ 
     protected function setUp() {
       $this->container = new \yii\di\Container;
       $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
       return new \common\components\Time('America/Los_Angeles');
     });
       parent::setUp();
@@ -97,7 +97,7 @@ 
 
 		public function testAttributeLabels()
 		{
-        $this->specify('attributeLabels should function properly', function () {
+        $this->specify('attributeLabels should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
           expect('attributeLabels should be correct', $this->assertEquals([
             'behaviors1' => 'Restoration',
@@ -113,32 +113,32 @@ 
 
     public function testSetBehaviors()
     {
-        $this->specify('setBehaviors should function properly', function () {
+        $this->specify('setBehaviors should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
 
 					$model->setBehaviors($this->behaviors);
-          expect('behaviors1 should be correct', $this->assertEquals([ 0 => 7 ], $model->behaviors1));
-          expect('behaviors2 should be correct', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2));
-          expect('behaviors3 should be correct', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3));
-          expect('behaviors4 should be correct', $this->assertEquals([ 0 => 47, 1 => 56, 2 => 62 ], $model->behaviors4));
-          expect('behaviors5 should be correct', $this->assertEquals([ 0 => 78, 1 => 79 ], $model->behaviors5));
-          expect('behaviors6 should be correct', $this->assertEquals([ 0 => 104 ], $model->behaviors6));
-          expect('behaviors7 should be correct', $this->assertEquals([ 0 => 128 ], $model->behaviors7));
+          expect('behaviors1 should be correct', $this->assertEquals([0 => 7], $model->behaviors1));
+          expect('behaviors2 should be correct', $this->assertEquals([0 => 12, 1 => 13, 2 => 17, 3 => 18], $model->behaviors2));
+          expect('behaviors3 should be correct', $this->assertEquals([0 => 28, 1 => 38, 2 => 46], $model->behaviors3));
+          expect('behaviors4 should be correct', $this->assertEquals([0 => 47, 1 => 56, 2 => 62], $model->behaviors4));
+          expect('behaviors5 should be correct', $this->assertEquals([0 => 78, 1 => 79], $model->behaviors5));
+          expect('behaviors6 should be correct', $this->assertEquals([0 => 104], $model->behaviors6));
+          expect('behaviors7 should be correct', $this->assertEquals([0 => 128], $model->behaviors7));
 
 					$model->setBehaviors($this->behaviors);
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 7 ], $model->behaviors1));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 47, 1 => 56, 2 => 62 ], $model->behaviors4));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 78, 1 => 79 ], $model->behaviors5));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 104 ], $model->behaviors6));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 128 ], $model->behaviors7));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 7], $model->behaviors1));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 12, 1 => 13, 2 => 17, 3 => 18], $model->behaviors2));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 28, 1 => 38, 2 => 46], $model->behaviors3));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 47, 1 => 56, 2 => 62], $model->behaviors4));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 78, 1 => 79], $model->behaviors5));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 104], $model->behaviors6));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 128], $model->behaviors7));
         });
     }
 
 		public function testValidateBehaviors()
 		{
-        $this->specify('validateBehaviors should function properly', function () {
+        $this->specify('validateBehaviors should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
 					$model->setBehaviors($this->behaviors);
           expect('validation should be good', $this->assertTrue($model->validate()));

common/mail/checkinReport.php

Spacing +6 added lines, -6 removed lines

@@ -125,14 +125,14 @@ 
                                                 <th style="Margin:0;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left">
 
 <?php
-if($questions) {
-  foreach($questions as $behavior_id => $behavior_questions) {
+if ($questions) {
+  foreach ($questions as $behavior_id => $behavior_questions) {
 ?>
 
                                                    <h4 style="Margin:0;Margin-bottom:10px;color:#37b98f;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:24px;font-weight:400;line-height:1.3;margin:0;margin-bottom:5px;padding:0 8px;text-align:left;word-wrap:normal"> <?= $behavior_questions['question']['title'] ?> </h4>
 
 <?php
-    foreach($behavior_questions['answers'] as $key => $question) {  ?>
+    foreach ($behavior_questions['answers'] as $key => $question) {  ?>
       <p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0 8px 4px 8px;text-align:left"><strong><?=$question['title']?></strong> <?=$question['answer']?></p>
 <?php
     }
@@ -189,12 +189,12 @@ 
                                                 <th style="Margin:0;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left">
 
 <?php
-if($user_behaviors) {
-  foreach($user_behaviors as $cat_key => $behaviors) { ?>
+if ($user_behaviors) {
+  foreach ($user_behaviors as $cat_key => $behaviors) { ?>
         <p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0 8px 4px 8px;text-align:left">
           <strong style="color:#37b98f"><?=  $categories[$cat_key] ?></strong>
 <?php
-    foreach($behaviors as $behavior) { ?>
+    foreach ($behaviors as $behavior) { ?>
         <br><?= $behavior['name'] ?>
 <?php
     }

common/models/UserBehavior.php

Spacing +12 added lines, -12 removed lines

@@ -86,7 +86,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']);
     }
 
@@ -115,12 +115,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);
       }
@@ -146,7 +146,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] = [
@@ -178,11 +178,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();
@@ -196,7 +196,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);
@@ -209,12 +209,12 @@ 
    * @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 this behavior does not have a valid behavior or category, something
       // is weird and we don't want to do this halfway.
-      if($behavior && $category) {
+      if ($behavior && $category) {
         $o['behavior'] = $behavior;
         $o['category'] = $category;
       }
@@ -241,10 +241,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'];
 
       $bhvrs_by_cat[$indx][$behavior['behavior']['name']] = [

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) {