CorWatts / fasterscale

site/tests/_support/MockUserBehavior.php

Indentation +1 added lines, -1 removed lines

@@ -36,4 +36,4 @@
   public function getBehaviorsByCategory(array $decorated_behaviors) {}
   public static function decorate(array $uo) {}
   public function getBehaviorsWithCounts($limit) {}
- }
\ No newline at end of file
+  }
\ No newline at end of file

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/QuestionForm.php

Indentation +6 added lines, -6 removed lines

@@ -148,12 +148,12 @@
       foreach($this->behaviorToAnswers($behavior_id) as $answer_letter => $answer) {
         $question_id = \common\models\Question::$TYPES[$answer_letter];
         array_push($answers, [
-                               'behavior_id'    => $user_bhvr->behavior_id,
-                               'category_id'    => $user_bhvr->category_id,
-                               'user_bhvr_id' => $user_bhvr->id,
-                               'question_id'  => $question_id,
-                               'answer'       => $answer,
-                             ]);
+                                'behavior_id'    => $user_bhvr->behavior_id,
+                                'category_id'    => $user_bhvr->category_id,
+                                'user_bhvr_id' => $user_bhvr->id,
+                                'question_id'  => $question_id,
+                                'answer'       => $answer,
+                              ]);
       }
     }
     return $answers;

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

site/controllers/ProfileController.php

Spacing +9 added lines, -9 removed lines

@@ -27,7 +27,7 @@ 
             'allow'   => true,
             'roles'   => ['@'],
           ], [
-            'actions' => [ 'change-email', ],
+            'actions' => ['change-email', ],
             'allow'   => true,
           ],
         ],
@@ -57,7 +57,7 @@ 
 
     if ($editProfileForm->load(Yii::$app->request->post())) {
       $saved_user = $editProfileForm->saveProfile();
-      if($saved_user) {
+      if ($saved_user) {
         Yii::$app->session->setFlash('success', 'New profile data saved!');
       }
     }
@@ -76,7 +76,7 @@ 
     $model = Yii::$container->get(\site\models\DeleteAccountForm::class, [Yii::$app->user->identity]);
 
     if ($model->load(Yii::$app->request->post()) && $model->validate()) {
-      if($model->deleteAccount()) {
+      if ($model->deleteAccount()) {
         $this->redirect(['site/index']);
       } else {
         Yii::$app->session->setFlash('error', 'Wrong password!');
@@ -90,7 +90,7 @@ 
     $model = Yii::$container->get(\site\models\ChangePasswordForm::class, [Yii::$app->user->identity]);
 
     if ($model->load(Yii::$app->request->post())) {
-      if($model->validate() && $model->changePassword()) {
+      if ($model->validate() && $model->changePassword()) {
         Yii::$app->session->setFlash('success', 'Password successfully changed');
       } else {
         Yii::$app->session->setFlash('error', 'Wrong password!');
@@ -114,14 +114,14 @@ 
   public function actionChangeEmail(string $token) {
     $user = Yii::$container->get(\common\interfaces\UserInterface::class)->findByChangeEmailToken($token);
 
-    if($user) {
+    if ($user) {
       $validator = new \yii\validators\EmailValidator();
-      if($validator->validate($user->desired_email, $error)) {
+      if ($validator->validate($user->desired_email, $error)) {
         $user->removeChangeEmailToken();
         $user->email = $user->desired_email;
         $user->desired_email = null;
         $user->save();
-        if(!Yii::$app->user->isGuest) {
+        if (!Yii::$app->user->isGuest) {
           Yii::$app->user->logout();
           Yii::$app->session->setFlash('success', 'Your email address was successfully changed. For security, we\'ve logged you out.');
         } else {
@@ -141,7 +141,7 @@ 
 
   public function actionExport() {
     header("Content-Type: text/csv");
-    header("Content-Disposition: attachment; filename=fsa-data-export-".Yii::$app->user->identity->email."-".date('Ymd').".csv");
+    header("Content-Disposition: attachment; filename=fsa-data-export-" . Yii::$app->user->identity->email . "-" . date('Ymd') . ".csv");
 
     $reader = Yii::$app->user->identity->getExportData();
     $fp = fopen('php://output', 'w');
@@ -157,7 +157,7 @@ 
 
     fputcsv($fp, $header);
     $user_behavior = Yii::$container->get(\common\interfaces\UserBehaviorInterface::class);
-    while($row = $reader->read()) {
+    while ($row = $reader->read()) {
       $row = $user_behavior::decorate([$row]);
       $row = Yii::$app->user->identity->cleanExportData($row);
       fputcsv($fp, $row[0]);

common/tests/unit/models/UserTest.php

Indentation +379 added lines, -379 removed lines

@@ -19,387 +19,387 @@
   private $time;
   private $question;
 
-	public $questionData = [
-	[
-		'id' => 641,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'user_behavior_id' => 821,
-		'question' => 1,
-		'answer' => 'alsgn',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-		],
-	],
-	[
-		'id' => 642,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'user_behavior_id' => 821,
-		'question' => 2,
-		'answer' => 'loiun',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-		],
-	],
-	[
-		'id' => 643,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'user_behavior_id' => 821,
-		'question' => 3,
-		'answer' => 'liun',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-		],
-	],
-	[
-		'id' => 644,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'user_behavior_id' => 823,
-		'question' => 1,
-		'answer' => 'ljnb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-		],
-	],
-	[
-		'id' => 645,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'user_behavior_id' => 823,
-		'question' => 2,
-		'answer' => 'liunb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-		],
-	],
-	[
-		'id' => 646,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'user_behavior_id' => 823,
-		'question' => 3,
-		'answer' => 'ilub ',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-		],
-	],
-	[
-		'id' => 647,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'user_behavior_id' => 825,
-		'question' => 1,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-		],
-	],
-	[
-		'id' => 648,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'user_behavior_id' => 825,
-		'question' => 2,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-		],
-	],
-	[
-		'id' => 649,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'user_behavior_id' => 825,
-		'question' => 3,
-		'answer' => 'liub ',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-		],
-	],
-	[
-		'id' => 650,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'user_behavior_id' => 828,
-		'question' => 1,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-		],
-	],
-	[
-		'id' => 651,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'user_behavior_id' => 828,
-		'question' => 2,
-		'answer' => 'liuby',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-		],
-	],
-	[
-		'id' => 652,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'user_behavior_id' => 828,
-		'question' => 3,
-		'answer' => 'uiylb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-		],
-	],
-	[
-		'id' => 653,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'user_behavior_id' => 829,
-		'question' => 1,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-		],
-	],
-	[
-		'id' => 654,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'user_behavior_id' => 829,
-		'question' => 2,
-		'answer' => 'liuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-		],
-	],
-	[
-		'id' => 655,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'user_behavior_id' => 829,
-		'question' => 3,
-		'answer' => 'iuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-		],
-	],
-	[
-		'id' => 656,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'user_behavior_id' => 831,
-		'question' => 1,
-		'answer' => 'iuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-		],
-	],
-	[
-		'id' => 657,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'user_behavior_id' => 831,
-		'question' => 2,
-		'answer' => 'iuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-		],
-	],
-	[
-		'id' => 658,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'user_behavior_id' => 831,
-		'question' => 3,
-		'answer' => 'liuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-		],
-	],
+  public $questionData = [
+  [
+    'id' => 641,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'user_behavior_id' => 821,
+    'question' => 1,
+    'answer' => 'alsgn',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+    ],
+  ],
+  [
+    'id' => 642,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'user_behavior_id' => 821,
+    'question' => 2,
+    'answer' => 'loiun',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+    ],
+  ],
+  [
+    'id' => 643,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'user_behavior_id' => 821,
+    'question' => 3,
+    'answer' => 'liun',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+    ],
+  ],
+  [
+    'id' => 644,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'user_behavior_id' => 823,
+    'question' => 1,
+    'answer' => 'ljnb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+    ],
+  ],
+  [
+    'id' => 645,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'user_behavior_id' => 823,
+    'question' => 2,
+    'answer' => 'liunb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+    ],
+  ],
+  [
+    'id' => 646,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'user_behavior_id' => 823,
+    'question' => 3,
+    'answer' => 'ilub ',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+    ],
+  ],
+  [
+    'id' => 647,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'user_behavior_id' => 825,
+    'question' => 1,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+    ],
+  ],
+  [
+    'id' => 648,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'user_behavior_id' => 825,
+    'question' => 2,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+    ],
+  ],
+  [
+    'id' => 649,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'user_behavior_id' => 825,
+    'question' => 3,
+    'answer' => 'liub ',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+    ],
+  ],
+  [
+    'id' => 650,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'user_behavior_id' => 828,
+    'question' => 1,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+    ],
+  ],
+  [
+    'id' => 651,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'user_behavior_id' => 828,
+    'question' => 2,
+    'answer' => 'liuby',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+    ],
+  ],
+  [
+    'id' => 652,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'user_behavior_id' => 828,
+    'question' => 3,
+    'answer' => 'uiylb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+    ],
+  ],
+  [
+    'id' => 653,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'user_behavior_id' => 829,
+    'question' => 1,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+    ],
+  ],
+  [
+    'id' => 654,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'user_behavior_id' => 829,
+    'question' => 2,
+    'answer' => 'liuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+    ],
+  ],
+  [
+    'id' => 655,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'user_behavior_id' => 829,
+    'question' => 3,
+    'answer' => 'iuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+    ],
+  ],
+  [
+    'id' => 656,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'user_behavior_id' => 831,
+    'question' => 1,
+    'answer' => 'iuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+    ],
+  ],
+  [
+    'id' => 657,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'user_behavior_id' => 831,
+    'question' => 2,
+    'answer' => 'iuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+    ],
+  ],
+  [
+    'id' => 658,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'user_behavior_id' => 831,
+    'question' => 3,
+    'answer' => 'liuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+    ],
+  ],
 ];
 public $userQuestions = [
-	13 => [
-		'question' => [
-			'id' => 13,
-			'title' => 'less time/energy for God, meetings, and church',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'alsgn',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'loiun',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'liun',
-			],
-		],
-	],
-	29 => [
-		'question' => [
-			'id' => 29,
-			'title' => 'using profanity',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'ljnb',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liunb',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'ilub ',
-			],
-		],
-	],
-	48 => [
-		'question' => [
-			'id' => 48,
-			'title' => 'workaholic',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'liub',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liub',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'liub ',
-			],
-		],
-	],
-	89 => [
-		'question' => [
-			'id' => 89,
-			'title' => 'obsessive (stuck) thoughts',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'liub',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liuby',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'uiylb',
-			],
-		],
-	],
-	111 => [
-		'question' => [
-			'id' => 111,
-			'title' => 'seeking out old unhealthy people and places',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'liub',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liuyb',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'iuyb',
-			],
-		],
-	],
-	122 => [
-		'question' => [
-			'id' => 122,
-			'title' => 'returning to the place you swore you would never go again',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'iuyb',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'iuyb',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'liuyb',
-			],
-		],
-	],
+  13 => [
+    'question' => [
+      'id' => 13,
+      'title' => 'less time/energy for God, meetings, and church',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'alsgn',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'loiun',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'liun',
+      ],
+    ],
+  ],
+  29 => [
+    'question' => [
+      'id' => 29,
+      'title' => 'using profanity',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'ljnb',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liunb',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'ilub ',
+      ],
+    ],
+  ],
+  48 => [
+    'question' => [
+      'id' => 48,
+      'title' => 'workaholic',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'liub ',
+      ],
+    ],
+  ],
+  89 => [
+    'question' => [
+      'id' => 89,
+      'title' => 'obsessive (stuck) thoughts',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liuby',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'uiylb',
+      ],
+    ],
+  ],
+  111 => [
+    'question' => [
+      'id' => 111,
+      'title' => 'seeking out old unhealthy people and places',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liuyb',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'iuyb',
+      ],
+    ],
+  ],
+  122 => [
+    'question' => [
+      'id' => 122,
+      'title' => 'returning to the place you swore you would never go again',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'iuyb',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'iuyb',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'liuyb',
+      ],
+    ],
+  ],
 ];
 
 public $exportData = [

Spacing +5 added lines, -5 removed lines

@@ -470,7 +470,7 @@ 
     $this->container = new \yii\di\Container;
     $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\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
       return new \common\components\Time('America/Los_Angeles');
     });
 
@@ -516,14 +516,14 @@ 
   }
 
   public function testParseQuestionData() {
-    $this->specify('parseQuestionData should function correctly', function () {
+    $this->specify('parseQuestionData should function correctly', function() {
       expect('parseQuestionData should return the correct structure with expected data', $this->assertEquals($this->user->parseQuestionData($this->questionData), $this->userQuestions));
       expect('parseQuestionData should return empty with the empty set', $this->assertEmpty($this->user->parseQuestionData([])));
     });
   }
 
   public function testIsTokenCurrent() {
-    $this->specify('isTokenCurrent should function correctly', function () {
+    $this->specify('isTokenCurrent should function correctly', function() {
       $good_token = \Yii::$app
                       ->getSecurity()
                       ->generateRandomString() . '_' . time();
@@ -557,7 +557,7 @@ 
   public function testConfirmVerifyEmailToken() {
     $this->user->verify_email_token = 'hello_world';
     $this->user->confirmVerifyEmailToken();
-    expect('confirmVerifyEmailToken should append User::CONFIRMED_STRING to the end of the verify_email_token property', $this->assertEquals($this->user->verify_email_token, 'hello_world'.$this->user::CONFIRMED_STRING));
+    expect('confirmVerifyEmailToken should append User::CONFIRMED_STRING to the end of the verify_email_token property', $this->assertEquals($this->user->verify_email_token, 'hello_world' . $this->user::CONFIRMED_STRING));
   }
 
   public function testIsVerified() {
@@ -651,7 +651,7 @@ 
       ->disableOriginalConstructor()
       ->setMethods(['save', 'attributes', 'getCheckinBreakdown'])
       ->getMock();
-    $expected = require(__DIR__.'/../data/expected_getCheckinBreakdown.php');
+    $expected = require(__DIR__ . '/../data/expected_getCheckinBreakdown.php');
     $user_behavior->method('getCheckinBreakdown')->willReturn($expected);
 
     $user = $this->getMockBuilder('\common\models\User')

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()));
   }