CorWatts / fasterscale

common/models/User.php

Indentation +19 added lines, -19 removed lines

@@ -561,28 +561,28 @@
   }
 
   public function cleanExportData($data) {
-   $order = array_flip(["date", "behavior", "category", "question1", "question2", "question3"]);
+    $order = array_flip(["date", "behavior", "category", "question1", "question2", "question3"]);
 
-   $ret = array_map(
-     function($row) use ($order) {
-       // change timestamp to local time (for the user)
-       $row['date'] = $this->time->convertUTCToLocal($row['date'], false);
+    $ret = array_map(
+      function($row) use ($order) {
+        // change timestamp to local time (for the user)
+        $row['date'] = $this->time->convertUTCToLocal($row['date'], false);
        
-       // clean up things we don't need
-       $row['category'] = $row['behavior']['category']['name'];
-       $row['behavior'] = $row['behavior']['name'];
-       unset($row['id']);
-       unset($row['behavior_id']);
-
-       // sort the array into a sensible order
-       uksort($row, function($a, $b) use ($order) {
+        // clean up things we don't need
+        $row['category'] = $row['behavior']['category']['name'];
+        $row['behavior'] = $row['behavior']['name'];
+        unset($row['id']);
+        unset($row['behavior_id']);
+
+        // sort the array into a sensible order
+        uksort($row, function($a, $b) use ($order) {
         return $order[$a] <=> $order[$b];
-       });
-       return $row;
-     }, 
-     $data
-   );
-   return $ret;
+        });
+        return $row;
+      }, 
+      $data
+    );
+    return $ret;
   }
 
   /*

Spacing +29 added lines, -29 removed lines

@@ -143,7 +143,7 @@ 
    */
   public function findByPasswordResetToken($token)
   {
-    if(!$this->isTokenCurrent($token)) {
+    if (!$this->isTokenCurrent($token)) {
       return null;
     }
 
@@ -161,15 +161,15 @@ 
    */
   public function findByVerifyEmailToken($token)
   {
-    if($this->isTokenConfirmed($token)) return null;
+    if ($this->isTokenConfirmed($token)) return null;
 
     $user = $this->findOne([
       'verify_email_token' => [$token, $token . self::CONFIRMED_STRING],
       'status' => self::STATUS_ACTIVE,
     ]);
 
-    if($user) {
-      if(!$this->isTokenConfirmed($token) &&
+    if ($user) {
+      if (!$this->isTokenConfirmed($token) &&
          !$this->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
         return null;
       }
@@ -191,8 +191,8 @@ 
       'status' => self::STATUS_ACTIVE,
     ]);
 
-    if($user) {
-      if(!$user->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
+    if ($user) {
+      if (!$user->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
         return null;
       }
     }
@@ -210,7 +210,7 @@ 
   public function isTokenCurrent($token, String $paramPath = 'user.passwordResetTokenExpire') {
     $expire = \Yii::$app->params[$paramPath];
     $parts = explode('_', $token);
-    $timestamp = (int) end($parts);
+    $timestamp = (int)end($parts);
     if ($timestamp + $expire < time()) {
       // token expired
       return false;
@@ -225,7 +225,7 @@ 
    * @param string    $match the needle to search for
    */
   public function isTokenConfirmed($token = null, String $match = self::CONFIRMED_STRING) {
-    if(is_null($token)) $token = $this->verify_email_token;
+    if (is_null($token)) $token = $this->verify_email_token;
     return substr($token, -strlen($match)) === $match;
   }
 
@@ -250,7 +250,7 @@ 
   }
 
   public function isVerified() {
-    if(is_null($this->verify_email_token)) {
+    if (is_null($this->verify_email_token)) {
       // for old users who verified their accounts before the addition of
       // '_confirmed' to the token
       return true;
@@ -369,7 +369,7 @@ 
    * partner email address the user has set.
    */
   public function sendEmailReport($date) {
-    if(!$this->send_email) return false; // no partner emails set
+    if (!$this->send_email) return false; // no partner emails set
     list($start, $end) = $this->time->getUTCBookends($date);
 
     $user_behavior = Yii::$container->get(UserBehaviorInterface::class);
@@ -378,14 +378,14 @@ 
     // we should only proceed with sending the email if the user
     // scored above their set email threshold (User::email_category)
     $this_checkin     = $checkins_last_month[$date]; // gets the check-in
-    if(!$this_checkin)  return false;           // sanity check
-    $highest_cat_data = end($this_checkin);     // gets the data for the highest category from the check-in
-    if(!$highest_cat_data) return false;        // another sanity check
+    if (!$this_checkin)  return false; // sanity check
+    $highest_cat_data = end($this_checkin); // gets the data for the highest category from the check-in
+    if (!$highest_cat_data) return false; // another sanity check
     $highest_cat_idx  = key($this_checkin); // gets the key of the highest category
 
     // if the highest category they reached today was less than
     // the category threshold they have set, don't send the email
-    if($highest_cat_idx < $this->email_category) return false;
+    if ($highest_cat_idx < $this->email_category) return false;
 
     $graph = Yii::$container
       ->get(\common\components\Graph::class)
@@ -395,8 +395,8 @@ 
     $user_questions = $this->getUserQuestions($date);
 
     $messages = [];
-    foreach($this->getPartnerEmails() as $email) {
-      if($email) {
+    foreach ($this->getPartnerEmails() as $email) {
+      if ($email) {
         $messages[] = Yii::$app->mailer->compose('checkinReport', [
           'user'          => $this,
           'email'         => $email,
@@ -408,7 +408,7 @@ 
           'behaviors_list'  => \common\models\Behavior::$behaviors,
         ])->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name])
         ->setReplyTo($this->email)
-        ->setSubject($this->email." has completed a Faster Scale check-in")
+        ->setSubject($this->email . " has completed a Faster Scale check-in")
         ->setTo($email);
       }
     }
@@ -481,7 +481,7 @@ 
     return \Yii::$app->mailer->compose('signupNotification')
       ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name])
       ->setTo(\Yii::$app->params['adminEmail'])
-      ->setSubject('A new user has signed up for '.\Yii::$app->name)
+      ->setSubject('A new user has signed up for ' . \Yii::$app->name)
       ->send();
   }
 
@@ -489,20 +489,20 @@ 
     return \Yii::$app->mailer->compose('verifyEmail', ['user' => $this])
       ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name])
       ->setTo($this->email)
-      ->setSubject('Please verify your '.\Yii::$app->name .' account')
+      ->setSubject('Please verify your ' . \Yii::$app->name . ' account')
       ->send();
   }
 
   public function sendDeleteNotificationEmail() {
     $messages = [];
-    foreach(array_merge([$this->email], $this->getPartnerEmails()) as $email) {
-      if($email) {
+    foreach (array_merge([$this->email], $this->getPartnerEmails()) as $email) {
+      if ($email) {
         $messages[] = Yii::$app->mailer->compose('deleteNotification', [
           'user' => $this,
           'email' => $email
         ])->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name])
         ->setReplyTo($this->email)
-        ->setSubject($this->email." has deleted their The Faster Scale App account")
+        ->setSubject($this->email . " has deleted their The Faster Scale App account")
         ->setTo($email);
       }
     }
@@ -511,13 +511,13 @@ 
   }
 
   public function getUserQuestions($local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if (is_null($local_date)) $local_date = $this->time->getLocalDate();
     $questions = $this->getQuestionData($local_date);
     return $this->parseQuestionData($questions);
   }
 
   public function getUserBehaviors($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($local_date);
     $behaviors = \common\models\UserBehavior::decorateWithCategory($behaviors);
@@ -525,10 +525,10 @@ 
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if (!$questions) return [];
 
     $question_answers = [];
-    foreach($questions as $question) {
+    foreach ($questions as $question) {
       $behavior = $question['behavior'];
 
       $question_answers[$behavior['id']]['question'] = [
@@ -546,10 +546,10 @@ 
   }
  
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if (!$behaviors) return [];
 
     $opts_by_cat = [];
-    foreach($behaviors as $behavior) {
+    foreach ($behaviors as $behavior) {
       $indx = $behavior['behavior']['category_id'];
 
       $opts_by_cat[$indx]['category_name'] = $behavior['behavior']['category']['name'];
@@ -642,7 +642,7 @@ 
     return rtrim(
       strtr(
         base64_encode(
-          hash('sha256', $this->id."::".$this->created_at, true)
+          hash('sha256', $this->id . "::" . $this->created_at, true)
         ),
       '+/', '-_'),
     '=');

Braces +33 added lines, -10 removed lines

@@ -161,7 +161,9 @@ 
    */
   public function findByVerifyEmailToken($token)
   {
-    if($this->isTokenConfirmed($token)) return null;
+    if($this->isTokenConfirmed($token)) {
+      return null;
+    }
 
     $user = $this->findOne([
       'verify_email_token' => [$token, $token . self::CONFIRMED_STRING],
@@ -225,7 +227,9 @@ 
    * @param string    $match the needle to search for
    */
   public function isTokenConfirmed($token = null, String $match = self::CONFIRMED_STRING) {
-    if(is_null($token)) $token = $this->verify_email_token;
+    if(is_null($token)) {
+      $token = $this->verify_email_token;
+    }
     return substr($token, -strlen($match)) === $match;
   }
 
@@ -369,7 +373,10 @@ 
    * partner email address the user has set.
    */
   public function sendEmailReport($date) {
-    if(!$this->send_email) return false; // no partner emails set
+    if(!$this->send_email) {
+      return false;
+    }
+    // no partner emails set
     list($start, $end) = $this->time->getUTCBookends($date);
 
     $user_behavior = Yii::$container->get(UserBehaviorInterface::class);
@@ -378,14 +385,22 @@ 
     // we should only proceed with sending the email if the user
     // scored above their set email threshold (User::email_category)
     $this_checkin     = $checkins_last_month[$date]; // gets the check-in
-    if(!$this_checkin)  return false;           // sanity check
+    if(!$this_checkin) {
+      return false;
+    }
+    // sanity check
     $highest_cat_data = end($this_checkin);     // gets the data for the highest category from the check-in
-    if(!$highest_cat_data) return false;        // another sanity check
+    if(!$highest_cat_data) {
+      return false;
+    }
+    // another sanity check
     $highest_cat_idx  = key($this_checkin); // gets the key of the highest category
 
     // if the highest category they reached today was less than
     // the category threshold they have set, don't send the email
-    if($highest_cat_idx < $this->email_category) return false;
+    if($highest_cat_idx < $this->email_category) {
+      return false;
+    }
 
     $graph = Yii::$container
       ->get(\common\components\Graph::class)
@@ -511,13 +526,17 @@ 
   }
 
   public function getUserQuestions($local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if(is_null($local_date)) {
+      $local_date = $this->time->getLocalDate();
+    }
     $questions = $this->getQuestionData($local_date);
     return $this->parseQuestionData($questions);
   }
 
   public function getUserBehaviors($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($local_date);
     $behaviors = \common\models\UserBehavior::decorateWithCategory($behaviors);
@@ -525,7 +544,9 @@ 
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if(!$questions) {
+      return [];
+    }
 
     $question_answers = [];
     foreach($questions as $question) {
@@ -546,7 +567,9 @@ 
   }
  
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if(!$behaviors) {
+      return [];
+    }
 
     $opts_by_cat = [];
     foreach($behaviors as $behavior) {

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,51 +117,51 @@ 
         $this->fakeModel(13, 281),
         $this->fakeModel(28, 284)
       ]), [ [
-										'behavior_id' => 280,
-										'user_bhvr_id' => 7,
-										'question_id' => 1,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 280,
-										'user_bhvr_id' => 7,
-										'question_id' => 2,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 280,
-										'user_bhvr_id' => 7,
-										'question_id' => 3,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 281,
-										'user_bhvr_id' => 13,
-										'question_id' => 1,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 281,
-										'user_bhvr_id' => 13,
-										'question_id' => 2,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 281,
-										'user_bhvr_id' => 13,
-										'question_id' => 3,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 284,
-										'user_bhvr_id' => 28,
-										'question_id' => 1,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 284,
-										'user_bhvr_id' => 28,
-										'question_id' => 2,
-										'answer' => 'processing emotions',
-									], [
-										'behavior_id' => 284,
-										'user_bhvr_id' => 28,
-										'question_id' => 3,
-										'answer' => 'processing emotions',
-									]]));
+                    'behavior_id' => 280,
+                    'user_bhvr_id' => 7,
+                    'question_id' => 1,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 280,
+                    'user_bhvr_id' => 7,
+                    'question_id' => 2,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 280,
+                    'user_bhvr_id' => 7,
+                    'question_id' => 3,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 281,
+                    'user_bhvr_id' => 13,
+                    'question_id' => 1,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 281,
+                    'user_bhvr_id' => 13,
+                    'question_id' => 2,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 281,
+                    'user_bhvr_id' => 13,
+                    'question_id' => 3,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 284,
+                    'user_bhvr_id' => 28,
+                    'question_id' => 1,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 284,
+                    'user_bhvr_id' => 28,
+                    'question_id' => 2,
+                    'answer' => 'processing emotions',
+                  ], [
+                    'behavior_id' => 284,
+                    '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),
         $this->fakeModel(13, 281),
         $this->fakeModel(28, 284)
-      ]), [ [
+      ]), [[
 										'behavior_id' => 280,
 										'user_bhvr_id' => 7,
 										'question_id' => 1,

site/tests/unit/models/SignupFormTest.php

Spacing +8 added lines, -8 removed lines

@@ -33,13 +33,13 @@ 
     $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');
     });
 
     // instantiate mock objects
     $user_behavior = $this->container->get('common\interfaces\UserBehaviorInterface');
-    $time        = $this->container->get('common\interfaces\TimeInterface');
+    $time = $this->container->get('common\interfaces\TimeInterface');
 
     $question = $this->getMockBuilder('\common\models\Question')
       ->setMethods(['save', 'attributes'])
@@ -128,7 +128,7 @@ 
 
     // set up a side effect to occur when the user's save() function is called
     $saved = false;
-    $this->user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) {
+    $this->user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) {
       $saved = true;
       return $this->user;
     }));
@@ -154,7 +154,7 @@ 
  
   public function testSignupExistingConfirmedUser() {
     $saved = false;
-    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) {
+    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) {
       $saved = true;
       return $this->existing_user;
     }));
@@ -173,7 +173,7 @@ 
 
   public function testSignupExistingUnconfirmedUser() {
     $saved = false;
-    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) {
+    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) {
       $saved = true;
       return $this->existing_user;
     }));
@@ -204,14 +204,14 @@ 
 
     $result = $form->setFields($this->user);
     $this->specify('populate should set the values of the user model from the form', function() use ($result) {
-      foreach($this->whitelist as $attr) {
+      foreach ($this->whitelist as $attr) {
         $this->assertEquals($this->vals[$attr], $result->$attr);
       }
     });
   }
 
   private function setAttrs($form, Array $vals) {
-    foreach($vals as $key => $val) {
+    foreach ($vals as $key => $val) {
       $form->$key = $val;
     }
     return $form;
@@ -232,7 +232,7 @@ 
   }
 
   private function getForm($user = null) {
-    if(is_null($user)) $user = $this->user;
+    if (is_null($user)) $user = $this->user;
     $form = $this->container->get('\site\models\SignupForm', [$user]);
     $form->attributes = $this->vals; // massive assignment
     return $form;

Braces +3 added lines, -1 removed lines

@@ -232,7 +232,9 @@
   }
 
   private function getForm($user = null) {
-    if(is_null($user)) $user = $this->user;
+    if(is_null($user)) {
+      $user = $this->user;
+    }
     $form = $this->container->get('\site\models\SignupForm', [$user]);
     $form->attributes = $this->vals; // massive assignment
     return $form;

Indentation +5 added lines, -5 removed lines

@@ -136,13 +136,13 @@ 
       expect('the form should validate correctly', $this->assertTrue($form->validate()));
       $user = $form->signup();
       expect('signup() should return a newly-saved user when the user does not already exist with the submitted values',
-             $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 1)));
+              $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 1)));
       expect('the "Remember Me" auth_key value should be set to a random string (defaults to a 32 char length)',
-             $this->assertEquals(32, strlen($user->auth_key)));
+              $this->assertEquals(32, strlen($user->auth_key)));
       expect('password_hash to be set to something like a hash',
-             $this->assertStringStartsWith('$2y$13$', $user->password_hash));
+              $this->assertStringStartsWith('$2y$13$', $user->password_hash));
       expect('when the user is created, signup() should call save()',
-             $this->assertTrue($saved));
+              $this->assertTrue($saved));
       expect('This user should be an isNewRecord -- they should NOT already exist', $this->assertTrue($user->getIsNewRecord()));
     });
   }
@@ -186,7 +186,7 @@ 
       $user = $form3->signup();
       expect('This user should not be an isNewRecord -- they should already exist', $this->assertFalse($user->getIsNewRecord()));
       expect('signup() should return a newly-saved user when the user does not already exist with the submitted values',
-             $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 1)));
+              $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 1)));
       expect('when the user exists and is NOT confirmed, signup() should call save() to UPDATE their info', $this->assertTrue($saved));
     });
   }

site/tests/unit/models/CheckinFormTest.php

Indentation +140 added lines, -140 removed lines

@@ -8,103 +8,103 @@ 
 {
     use \Codeception\Specify;
 
-		public $behaviors = [
-			1 => [
-				'category_name' => 'Restoration',
-				'behaviors' => [
-					0 => [
-						'id' => 7,
-						'name' => 'making eye contact',
-					],
-				],
-			],
-			2 => [
-				'category_name' => 'Forgetting Priorities',
-				'behaviors' => [
-					0 => [
-						'id' => 12,
-						'name' => 'bored',
-					],
-					1 => [
-						'id' => 13,
-						'name' => 'less time/energy for God, meetings, and church',
-					],
-					2 => [
-						'id' => 17,
-						'name' => 'isolating yourself',
-					],
-					3 => [
-						'id' => 18,
-						'name' => 'changes in goals',
-					],
-				],
-			],
-			3 => [
-				'category_name' => 'Anxiety',
-				'behaviors' => [
-					0 => [
-						'id' => 28,
-						'name' => 'worry',
-					],
-					1 => [
-						'id' => 38,
-						'name' => 'fantasy',
-					],
-					2 => [
-						'id' => 46,
-						'name' => 'using over-the-counter medication for pain, sleep, and weight control',
-					],
-				],
-			],
-			4 => [
-				'category_name' => 'Speeding Up',
-				'behaviors' => [
-					0 => [
-						'id' => 47,
-						'name' => 'super busy',
-					],
-					1 => [
-						'id' => 56,
-						'name' => 'binge eating (usually at night]',
-					],
-					2 => [
-						'id' => 62,
-						'name' => 'dramatic mood swings',
-					],
-				],
-			],
-			5 => [
-				'category_name' => 'Ticked Off',
-				'behaviors' => [
-					0 => [
-						'id' => 78,
-						'name' => 'increased isolation',
-					],
-					1 => [
-						'id' => 79,
-						'name' => 'blaming',
-					],
-				],
-			],
-			6 => [
-				'category_name' => 'Exhausted',
-				'behaviors' => [
-					0 => [
-						'id' => 104,
-						'name' => 'pessimistic',
-					],
-				],
-			],
-			7 => [
-				'category_name' => 'Relapse/Moral Failure',
-				'behaviors' => [
-					0 => [
-						'id' => 128,
-						'name' => 'feeling you just can\'t manage without your coping behavior, at least for now',
-					],
-				],
-			],
-		];
+    public $behaviors = [
+      1 => [
+        'category_name' => 'Restoration',
+        'behaviors' => [
+          0 => [
+            'id' => 7,
+            'name' => 'making eye contact',
+          ],
+        ],
+      ],
+      2 => [
+        'category_name' => 'Forgetting Priorities',
+        'behaviors' => [
+          0 => [
+            'id' => 12,
+            'name' => 'bored',
+          ],
+          1 => [
+            'id' => 13,
+            'name' => 'less time/energy for God, meetings, and church',
+          ],
+          2 => [
+            'id' => 17,
+            'name' => 'isolating yourself',
+          ],
+          3 => [
+            'id' => 18,
+            'name' => 'changes in goals',
+          ],
+        ],
+      ],
+      3 => [
+        'category_name' => 'Anxiety',
+        'behaviors' => [
+          0 => [
+            'id' => 28,
+            'name' => 'worry',
+          ],
+          1 => [
+            'id' => 38,
+            'name' => 'fantasy',
+          ],
+          2 => [
+            'id' => 46,
+            'name' => 'using over-the-counter medication for pain, sleep, and weight control',
+          ],
+        ],
+      ],
+      4 => [
+        'category_name' => 'Speeding Up',
+        'behaviors' => [
+          0 => [
+            'id' => 47,
+            'name' => 'super busy',
+          ],
+          1 => [
+            'id' => 56,
+            'name' => 'binge eating (usually at night]',
+          ],
+          2 => [
+            'id' => 62,
+            'name' => 'dramatic mood swings',
+          ],
+        ],
+      ],
+      5 => [
+        'category_name' => 'Ticked Off',
+        'behaviors' => [
+          0 => [
+            'id' => 78,
+            'name' => 'increased isolation',
+          ],
+          1 => [
+            'id' => 79,
+            'name' => 'blaming',
+          ],
+        ],
+      ],
+      6 => [
+        'category_name' => 'Exhausted',
+        'behaviors' => [
+          0 => [
+            'id' => 104,
+            'name' => 'pessimistic',
+          ],
+        ],
+      ],
+      7 => [
+        'category_name' => 'Relapse/Moral Failure',
+        'behaviors' => [
+          0 => [
+            'id' => 128,
+            'name' => 'feeling you just can\'t manage without your coping behavior, at least for now',
+          ],
+        ],
+      ],
+    ];
 
     protected function setUp() {
       $this->container = new \yii\di\Container;
@@ -115,8 +115,8 @@ 
       parent::setUp();
     }
 
-		public function testAttributeLabels()
-		{
+    public function testAttributeLabels()
+    {
         $this->specify('setBehaviors should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
           expect('attributeLabels should be correct', $this->assertEquals($model->attributeLabels(), [
@@ -135,7 +135,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($model->behaviors1, [ 0 => 7 ]));
           expect('behaviors2 should be correct', $this->assertEquals($model->behaviors2, [ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ]));
@@ -145,7 +145,7 @@ 
           expect('behaviors6 should be correct', $this->assertEquals($model->behaviors6, [ 0 => 104 ]));
           expect('behaviors7 should be correct', $this->assertEquals($model->behaviors7, [ 0 => 128 ]));
 
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors1, [ 0 => 7 ]));
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors2, [ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ]));
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors3, [ 0 => 28, 1 => 38, 2 => 46 ]));
@@ -156,64 +156,64 @@ 
         });
     }
 
-		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()
+    {
         $this->specify('compileBehaviors should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('compiling behaviors should be return a correct array', $this->assertEquals($model->compileBehaviors(), [
-											  	0 => 7,
-											  	1 => 12,
-											  	2 => 13,
-											  	3 => 17,
-											  	4 => 18,
-											  	5 => 28,
-											  	6 => 38,
-											  	7 => 46,
-											  	8 => 47,
-											  	9 => 56,
-											  	10 => 62,
-											  	11 => 78,
-											  	12 => 79,
-											  	13 => 104,
-											  	14 => 128,
-											  ]));
+                          0 => 7,
+                          1 => 12,
+                          2 => 13,
+                          3 => 17,
+                          4 => 18,
+                          5 => 28,
+                          6 => 38,
+                          7 => 46,
+                          8 => 47,
+                          9 => 56,
+                          10 => 62,
+                          11 => 78,
+                          12 => 79,
+                          13 => 104,
+                          14 => 128,
+                        ]));
 
           $model = $this->container->get('\site\models\CheckinForm');
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           $model->behaviors1[0] = null;
           $model->behaviors2[0] = null;
           $model->behaviors3[0] = null;
           expect('compiling behaviors should strip out any falsy values', $this->assertEquals($model->compileBehaviors(), [
-											  	2 => 13,
-											  	3 => 17,
-											  	4 => 18,
-											  	6 => 38,
-											  	7 => 46,
-											  	8 => 47,
-											  	9 => 56,
-											  	10 => 62,
-											  	11 => 78,
-											  	12 => 79,
-											  	13 => 104,
-											  	14 => 128,
-											  ]));
+                          2 => 13,
+                          3 => 17,
+                          4 => 18,
+                          6 => 38,
+                          7 => 46,
+                          8 => 47,
+                          9 => 56,
+                          10 => 62,
+                          11 => 78,
+                          12 => 79,
+                          13 => 104,
+                          14 => 128,
+                        ]));
 
           $model = $this->container->get('\site\models\CheckinForm');
-					$model->setBehaviors([]);
+          $model->setBehaviors([]);
           expect('compiling behaviors should return an empty array when no behaviors are set', $this->assertEmpty($model->compileBehaviors()));
         });
-		}
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -109,7 +109,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();
@@ -117,7 +117,7 @@ 
 
 		public function testAttributeLabels()
 		{
-        $this->specify('setBehaviors should function properly', function () {
+        $this->specify('setBehaviors should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
           expect('attributeLabels should be correct', $this->assertEquals($model->attributeLabels(), [
             'behaviors1' => 'Restoration',
@@ -133,32 +133,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($model->behaviors1, [ 0 => 7 ]));
-          expect('behaviors2 should be correct', $this->assertEquals($model->behaviors2, [ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ]));
-          expect('behaviors3 should be correct', $this->assertEquals($model->behaviors3, [ 0 => 28, 1 => 38, 2 => 46 ]));
-          expect('behaviors4 should be correct', $this->assertEquals($model->behaviors4, [ 0 => 47, 1 => 56, 2 => 62 ]));
-          expect('behaviors5 should be correct', $this->assertEquals($model->behaviors5, [ 0 => 78, 1 => 79 ]));
-          expect('behaviors6 should be correct', $this->assertEquals($model->behaviors6, [ 0 => 104 ]));
-          expect('behaviors7 should be correct', $this->assertEquals($model->behaviors7, [ 0 => 128 ]));
+          expect('behaviors1 should be correct', $this->assertEquals($model->behaviors1, [0 => 7]));
+          expect('behaviors2 should be correct', $this->assertEquals($model->behaviors2, [0 => 12, 1 => 13, 2 => 17, 3 => 18]));
+          expect('behaviors3 should be correct', $this->assertEquals($model->behaviors3, [0 => 28, 1 => 38, 2 => 46]));
+          expect('behaviors4 should be correct', $this->assertEquals($model->behaviors4, [0 => 47, 1 => 56, 2 => 62]));
+          expect('behaviors5 should be correct', $this->assertEquals($model->behaviors5, [0 => 78, 1 => 79]));
+          expect('behaviors6 should be correct', $this->assertEquals($model->behaviors6, [0 => 104]));
+          expect('behaviors7 should be correct', $this->assertEquals($model->behaviors7, [0 => 128]));
 
 					$model->setBehaviors($this->behaviors);
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors1, [ 0 => 7 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors2, [ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors3, [ 0 => 28, 1 => 38, 2 => 46 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors4, [ 0 => 47, 1 => 56, 2 => 62 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors5, [ 0 => 78, 1 => 79 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors6, [ 0 => 104 ]));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors7, [ 0 => 128 ]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors1, [0 => 7]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors2, [0 => 12, 1 => 13, 2 => 17, 3 => 18]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors3, [0 => 28, 1 => 38, 2 => 46]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors4, [0 => 47, 1 => 56, 2 => 62]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors5, [0 => 78, 1 => 79]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors6, [0 => 104]));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals($model->behaviors7, [0 => 128]));
         });
     }
 
 		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()));
@@ -170,7 +170,7 @@ 
 
 		public function testCompileBehaviors()
 		{
-        $this->specify('compileBehaviors should function properly', function () {
+        $this->specify('compileBehaviors should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
 					$model->setBehaviors($this->behaviors);
           expect('compiling behaviors should be return a correct array', $this->assertEquals($model->compileBehaviors(), [

site/tests/_support/AcceptanceTester.php

Indentation +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@
 {
     use _generated\AcceptanceTesterActions;
 
-   /**
-    * Define custom actions here
-    */
+    /**
+     * Define custom actions here
+     */
 }

site/tests/_support/MockUser.php

Indentation +7 added lines, -7 removed lines

@@ -7,13 +7,13 @@
   public $timezone = 'America/Los_Angeles';
   public $password;
 
- public static function findIdentity($id) {}
- public static function findIdentityByAccessToken($token, $type = null) {}
- public function getId() {}
- public function getAuthKey() {}
- public function validateAuthKey($authKey) {}
- public function validatePassword($password) {}
- public function setPassword($password) {}
+  public static function findIdentity($id) {}
+  public static function findIdentityByAccessToken($token, $type = null) {}
+  public function getId() {}
+  public function getAuthKey() {}
+  public function validateAuthKey($authKey) {}
+  public function validatePassword($password) {}
+  public function setPassword($password) {}
 
   public static function primaryKey() {}
   public function attributes() {}

site/tests/_support/FunctionalTester.php

Indentation +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@
 {
     use _generated\FunctionalTesterActions;
 
-   /**
-    * Define custom actions here
-    */
+    /**
+     * Define custom actions here
+     */
 }

site/tests/_support/MockUserBehavior.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
   public static function isPrimaryKey($keys) {}
   public static function find() {}
   public static function findOne($condition) {}
-  public static function findAll($condition) {return [];}
+  public static function findAll($condition) {return []; }
   public static function updateAll($attributes, $condition = null) {}
   public static function deleteAll($condition = null) {}
   public function save($runValidation = true, $attributeNames = null) {}

Indentation +1 added lines, -1 removed lines

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