CorWatts / fasterscale

common/tests/_support/UnitTester.php

Indentation +3 added lines, -3 removed lines

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

common/tests/_bootstrap.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 require_once(YII_APP_BASE_PATH . '/vendor/autoload.php');
 require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
 
- Yii::setAlias('@web', '/');
+  Yii::setAlias('@web', '/');
 
 require(YII_APP_BASE_PATH . '/common/config/aliases.php');
 Yii::setAlias('@tests', dirname(__DIR__));

common/mail/checkinReport.php

Spacing +6 added lines, -6 removed lines

@@ -125,14 +125,14 @@ 
                                                 <th style="Margin:0;color:#0a0a0a;font-family:Lato,Helvetica,Arial,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:Lato,Helvetica,Arial,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:Lato,Helvetica,Arial,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:Lato,Helvetica,Arial,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 $user_behavior) { ?>
+if ($user_behaviors) {
+  foreach ($user_behaviors as $user_behavior) { ?>
         <p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Lato,Helvetica,Arial,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"><?= $user_behavior['category_name'] ?></strong>
 <?php
-    foreach($user_behavior['behaviors'] as $behavior) { ?>
+    foreach ($user_behavior['behaviors'] as $behavior) { ?>
         <br><?= $behavior['name'] ?>
 <?php
     }

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 +25 added lines, -25 removed lines

@@ -141,7 +141,7 @@ 
    */
   public function findByPasswordResetToken($token)
   {
-    if(!$this->isTokenCurrent($token)) {
+    if (!$this->isTokenCurrent($token)) {
       return null;
     }
 
@@ -159,15 +159,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;
       }
@@ -186,7 +186,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;
@@ -201,7 +201,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;
   }
 
@@ -226,7 +226,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;
@@ -320,14 +320,14 @@ 
   }
 
   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_behaviors   = $this->getUserBehaviors($date);
+    $user_behaviors = $this->getUserBehaviors($date);
     $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,
@@ -339,7 +339,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);
       }
     }
@@ -412,7 +412,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();
   }
 
@@ -420,22 +420,22 @@ 
     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() {
-    if($this->send_email) return false; // no partner emails set
+    if ($this->send_email) return false; // no partner emails set
 
     $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('partnerDeleteNotification', [
           '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);
       }
     }
@@ -444,13 +444,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 = $this->user_behavior::decorateWithCategory($behaviors);
@@ -458,10 +458,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'] = [
@@ -479,10 +479,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'];
@@ -574,7 +574,7 @@ 
     return rtrim(
       strtr(
         base64_encode(
-          hash('sha256', $this->id."::".$this->created_at, true)
+          hash('sha256', $this->id . "::" . $this->created_at, true)
         ),
       '+/', '-_'),
     '=');

Braces +26 added lines, -8 removed lines

@@ -159,7 +159,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],
@@ -201,7 +203,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;
   }
 
@@ -320,7 +324,10 @@ 
   }
 
   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_behaviors   = $this->getUserBehaviors($date);
     $user_questions = $this->getUserQuestions($date);
@@ -425,7 +432,10 @@ 
   }
 
   public function sendDeleteNotificationEmail() {
-    if($this->send_email) return false; // no partner emails set
+    if($this->send_email) {
+      return false;
+    }
+    // no partner emails set
 
     $messages = [];
     foreach(array_merge([$this->email], $this->getPartnerEmails()) as $email) {
@@ -444,13 +454,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 = $this->user_behavior::decorateWithCategory($behaviors);
@@ -458,7 +472,9 @@ 
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if(!$questions) {
+      return [];
+    }
 
     $question_answers = [];
     foreach($questions as $question) {
@@ -479,7 +495,9 @@ 
   }
  
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if(!$behaviors) {
+      return [];
+    }
 
     $opts_by_cat = [];
     foreach($behaviors as $behavior) {

common/models/LoginForm.php

Spacing +3 added lines, -3 removed lines

@@ -60,10 +60,10 @@
    */
   public function login()
   {
-    if($this->validate()) {
+    if ($this->validate()) {
       $user = $this->getUser();
-      if($user->isVerified()) {
-        return Yii::$app->user->login($user, $this->rememberMe ? 3600 * 24 * 30 : 0);
+      if ($user->isVerified()) {
+        return Yii::$app->user->login($user, $this->rememberMe ? 3600*24*30 : 0);
       } else {
         Yii::$app->getSession()->setFlash('warning', 'You must verify your account before you can proceed. Please check your email inbox for a verification email and follow the instructions.');
       }

common/models/Behavior.php

Indentation +132 added lines, -132 removed lines

@@ -13,138 +13,138 @@
  */
 class Behavior extends \yii\base\BaseObject implements BehaviorInterface
 {
-	public static $behaviors = [
-		['id' => 1,   'name' => 'no current secrets', 'category_id' => 1],
-		['id' => 2,   'name' => 'resolving problems', 'category_id' => 1],
-		['id' => 3,   'name' => 'identifying fears and feelings', 'category_id' => 1],
-		['id' => 4,   'name' => 'keeping commitments to meetings, prayer, family, church, people, goals, and self', 'category_id' => 1],
-		['id' => 5,   'name' => 'being open', 'category_id' => 1],
-		['id' => 6,   'name' => 'being honest', 'category_id' => 1],
-		['id' => 7,   'name' => 'making eye contact', 'category_id' => 1],
-		['id' => 8,   'name' => 'reaching out to others', 'category_id' => 1],
-		['id' => 9,   'name' => 'increasing in relationships with God and others', 'category_id' => 1],
-		['id' => 10,  'name' => 'accountability', 'category_id' => 1],
-		['id' => 11,  'name' => 'secrets', 'category_id' => 2],
-		['id' => 12,  'name' => 'bored', 'category_id' => 2],
-		['id' => 13,  'name' => 'less time/energy for God, meetings, and church', 'category_id' => 2],
-		['id' => 14,  'name' => 'avoiding support and accountability towards people', 'category_id' => 2],
-		['id' => 15,  'name' => 'superficial conversations', 'category_id' => 2],
-		['id' => 16,  'name' => 'sarcasm', 'category_id' => 2],
-		['id' => 17,  'name' => 'isolating yourself', 'category_id' => 2],
-		['id' => 18,  'name' => 'changes in goals', 'category_id' => 2],
-		['id' => 19,  'name' => 'flirting', 'category_id' => 2],
-		['id' => 20,  'name' => 'obsessed with relationships', 'category_id' => 2],
-		['id' => 21,  'name' => 'breaking promises/commitments', 'category_id' => 2],
-		['id' => 22,  'name' => 'neglecting family', 'category_id' => 2],
-		['id' => 23,  'name' => 'preoccupation with material things, television, or entertainment', 'category_id' => 2],
-		['id' => 24,  'name' => 'procrastination', 'category_id' => 2],
-		['id' => 25,  'name' => 'lying', 'category_id' => 2],
-		['id' => 26,  'name' => 'over-confidence', 'category_id' => 2],
-		['id' => 27,  'name' => 'hiding money', 'category_id' => 2],
-		['id' => 28,  'name' => 'worry', 'category_id' => 3],
-		['id' => 29,  'name' => 'using profanity', 'category_id' => 3],
-		['id' => 30,  'name' => 'being fearful', 'category_id' => 3],
-		['id' => 31,  'name' => 'being resentful', 'category_id' => 3],
-		['id' => 32,  'name' => 'replaying old, negative thoughts', 'category_id' => 3],
-		['id' => 33,  'name' => 'perfectionism', 'category_id' => 3],
-		['id' => 34,  'name' => 'judging others\' motives', 'category_id' => 3],
-		['id' => 35,  'name' => 'making goals and lists you can\'t complete', 'category_id' => 3],
-		['id' => 36,  'name' => 'poor planning', 'category_id' => 3],
-		['id' => 37,  'name' => 'mind reading', 'category_id' => 3],
-		['id' => 38,  'name' => 'fantasy', 'category_id' => 3],
-		['id' => 41,  'name' => 'co-dependent rescuing', 'category_id' => 3],
-		['id' => 42,  'name' => 'sleep problems', 'category_id' => 3],
-		['id' => 43,  'name' => 'trouble concentrating', 'category_id' => 3],
-		['id' => 44,  'name' => 'seeking/creating drama', 'category_id' => 3],
-		['id' => 45,  'name' => 'gossip', 'category_id' => 3],
-		['id' => 46,  'name' => 'using over-the-counter medication for pain, sleep, and weight control', 'category_id' => 3],
-		['id' => 47,  'name' => 'super busy', 'category_id' => 4],
-		['id' => 48,  'name' => 'workaholic', 'category_id' => 4],
-		['id' => 49,  'name' => 'can\'t relax', 'category_id' => 4],
-		['id' => 50,  'name' => 'driving too fast', 'category_id' => 4],
-		['id' => 51,  'name' => 'avoiding slowing down', 'category_id' => 4],
-		['id' => 52,  'name' => 'feeling driven', 'category_id' => 4],
-		['id' => 53,  'name' => 'in a hurry', 'category_id' => 4],
-		['id' => 54,  'name' => 'can\'t turn off thoughts', 'category_id' => 4],
-		['id' => 55,  'name' => 'skipping meals', 'category_id' => 4],
-		['id' => 56,  'name' => 'binge eating (usually at night)', 'category_id' => 4],
-		['id' => 57,  'name' => 'overspending', 'category_id' => 4],
-		['id' => 58,  'name' => 'can\'t identify own feelings/needs', 'category_id' => 4],
-		['id' => 59,  'name' => 'repetitive, negative thoughts', 'category_id' => 4],
-		['id' => 60,  'name' => 'irritable', 'category_id' => 4],
-		['id' => 61,  'name' => 'making excuses for "having to do it all"', 'category_id' => 4],
-		['id' => 62,  'name' => 'dramatic mood swings', 'category_id' => 4],
-		['id' => 63,  'name' => 'lust', 'category_id' => 4],
-		['id' => 64,  'name' => 'too much caffeine', 'category_id' => 4],
-		['id' => 65,  'name' => 'over exercising', 'category_id' => 4],
-		['id' => 66,  'name' => 'nervousness', 'category_id' => 4],
-		['id' => 67,  'name' => 'difficulty being alone or with people', 'category_id' => 4],
-		['id' => 68,  'name' => 'difficulty listening to others', 'category_id' => 4],
-		['id' => 69,  'name' => 'avoiding support', 'category_id' => 4],
-		['id' => 70,  'name' => 'procrastination causing crises in money, work, or relationships', 'category_id' => 5],
-		['id' => 71,  'name' => 'sarcasm', 'category_id' => 5],
-		['id' => 72,  'name' => 'black and white, all or nothing thinking', 'category_id' => 5],
-		['id' => 73,  'name' => 'feeling that no one understands', 'category_id' => 5],
-		['id' => 74,  'name' => 'overreacting', 'category_id' => 5],
-		['id' => 75,  'name' => 'road rage', 'category_id' => 5],
-		['id' => 76,  'name' => 'constant resentments', 'category_id' => 5],
-		['id' => 77,  'name' => 'pushing others away', 'category_id' => 5],
-		['id' => 78,  'name' => 'increased isolation', 'category_id' => 5],
-		['id' => 79,  'name' => 'blaming', 'category_id' => 5],
-		['id' => 80,  'name' => 'self pity', 'category_id' => 5],
-		['id' => 81,  'name' => 'arguing', 'category_id' => 5],
-		['id' => 82,  'name' => 'irrationality', 'category_id' => 5],
-		['id' => 83,  'name' => 'can\'t handle criticism', 'category_id' => 5],
-		['id' => 84,  'name' => 'defensive', 'category_id' => 5],
-		['id' => 85,  'name' => 'people are avoiding you', 'category_id' => 5],
-		['id' => 86,  'name' => 'having to be right', 'category_id' => 5],
-		['id' => 87,  'name' => 'digestive problems', 'category_id' => 5],
-		['id' => 88,  'name' => 'headaches', 'category_id' => 5],
-		['id' => 89,  'name' => 'obsessive (stuck) thoughts', 'category_id' => 5],
-		['id' => 90,  'name' => 'can\'t forgive', 'category_id' => 5],
-		['id' => 91,  'name' => 'feeling grandiose (superior)', 'category_id' => 5],
-		['id' => 92,  'name' => 'intimidation', 'category_id' => 5],
-		['id' => 93,  'name' => 'feeling aggressive', 'category_id' => 5],
-		['id' => 94,  'name' => 'depressed', 'category_id' => 6],
-		['id' => 95,  'name' => 'panicked', 'category_id' => 6],
-		['id' => 96,  'name' => 'confused', 'category_id' => 6],
-		['id' => 97,  'name' => 'hopeless', 'category_id' => 6],
-		['id' => 98,  'name' => 'sleeping too much or too little', 'category_id' => 6],
-		['id' => 99,  'name' => 'can\'t cope', 'category_id' => 6],
-		['id' => 100, 'name' => 'overwhelmed', 'category_id' => 6],
-		['id' => 101, 'name' => 'crying for "no reason"', 'category_id' => 6],
-		['id' => 102, 'name' => 'can\'t think', 'category_id' => 6],
-		['id' => 103, 'name' => 'forgetful', 'category_id' => 6],
-		['id' => 104, 'name' => 'pessimistic', 'category_id' => 6],
-		['id' => 105, 'name' => 'helpless', 'category_id' => 6],
-		['id' => 106, 'name' => 'tired', 'category_id' => 6],
-		['id' => 107, 'name' => 'numb', 'category_id' => 6],
-		['id' => 108, 'name' => 'wanting to run', 'category_id' => 6],
-		['id' => 109, 'name' => 'constant cravings for old coping behaviors', 'category_id' => 6],
-		['id' => 110, 'name' => 'thinking of using drugs and alcohol', 'category_id' => 6],
-		['id' => 111, 'name' => 'seeking out old unhealthy people and places', 'category_id' => 6],
-		['id' => 112, 'name' => 'really isolated', 'category_id' => 6],
-		['id' => 113, 'name' => 'people are angry with you', 'category_id' => 6],
-		['id' => 114, 'name' => 'self-abuse', 'category_id' => 6],
-		['id' => 115, 'name' => 'suicidal thoughts', 'category_id' => 6],
-		['id' => 116, 'name' => 'no goals', 'category_id' => 6],
-		['id' => 117, 'name' => 'survival mode', 'category_id' => 6],
-		['id' => 118, 'name' => 'not returning phone calls', 'category_id' => 6],
-		['id' => 119, 'name' => 'missing work', 'category_id' => 6],
-		['id' => 120, 'name' => 'irritability', 'category_id' => 6],
-		['id' => 121, 'name' => 'loss of appetite', 'category_id' => 6],
-		['id' => 122, 'name' => 'returning to the place you swore you would never go again', 'category_id' => 7],
-		['id' => 123, 'name' => 'giving up', 'category_id' => 7],
-		['id' => 124, 'name' => 'giving in', 'category_id' => 7],
-		['id' => 125, 'name' => 'out of control', 'category_id' => 7],
-		['id' => 126, 'name' => 'lost in your addiction', 'category_id' => 7],
-		['id' => 127, 'name' => 'lying to yourself and others', 'category_id' => 7],
-		['id' => 128, 'name' => 'feeling you just can\'t manage without your coping behavior, at least for now', 'category_id' => 7],
-		['id' => 129, 'name' => 'shame', 'category_id' => 7],
-		['id' => 130, 'name' => 'condemnation', 'category_id' => 7],
-		['id' => 131, 'name' => 'guilt', 'category_id' => 7],
-		['id' => 132, 'name' => 'aloneness', 'category_id' => 7],
-	];
+  public static $behaviors = [
+    ['id' => 1,   'name' => 'no current secrets', 'category_id' => 1],
+    ['id' => 2,   'name' => 'resolving problems', 'category_id' => 1],
+    ['id' => 3,   'name' => 'identifying fears and feelings', 'category_id' => 1],
+    ['id' => 4,   'name' => 'keeping commitments to meetings, prayer, family, church, people, goals, and self', 'category_id' => 1],
+    ['id' => 5,   'name' => 'being open', 'category_id' => 1],
+    ['id' => 6,   'name' => 'being honest', 'category_id' => 1],
+    ['id' => 7,   'name' => 'making eye contact', 'category_id' => 1],
+    ['id' => 8,   'name' => 'reaching out to others', 'category_id' => 1],
+    ['id' => 9,   'name' => 'increasing in relationships with God and others', 'category_id' => 1],
+    ['id' => 10,  'name' => 'accountability', 'category_id' => 1],
+    ['id' => 11,  'name' => 'secrets', 'category_id' => 2],
+    ['id' => 12,  'name' => 'bored', 'category_id' => 2],
+    ['id' => 13,  'name' => 'less time/energy for God, meetings, and church', 'category_id' => 2],
+    ['id' => 14,  'name' => 'avoiding support and accountability towards people', 'category_id' => 2],
+    ['id' => 15,  'name' => 'superficial conversations', 'category_id' => 2],
+    ['id' => 16,  'name' => 'sarcasm', 'category_id' => 2],
+    ['id' => 17,  'name' => 'isolating yourself', 'category_id' => 2],
+    ['id' => 18,  'name' => 'changes in goals', 'category_id' => 2],
+    ['id' => 19,  'name' => 'flirting', 'category_id' => 2],
+    ['id' => 20,  'name' => 'obsessed with relationships', 'category_id' => 2],
+    ['id' => 21,  'name' => 'breaking promises/commitments', 'category_id' => 2],
+    ['id' => 22,  'name' => 'neglecting family', 'category_id' => 2],
+    ['id' => 23,  'name' => 'preoccupation with material things, television, or entertainment', 'category_id' => 2],
+    ['id' => 24,  'name' => 'procrastination', 'category_id' => 2],
+    ['id' => 25,  'name' => 'lying', 'category_id' => 2],
+    ['id' => 26,  'name' => 'over-confidence', 'category_id' => 2],
+    ['id' => 27,  'name' => 'hiding money', 'category_id' => 2],
+    ['id' => 28,  'name' => 'worry', 'category_id' => 3],
+    ['id' => 29,  'name' => 'using profanity', 'category_id' => 3],
+    ['id' => 30,  'name' => 'being fearful', 'category_id' => 3],
+    ['id' => 31,  'name' => 'being resentful', 'category_id' => 3],
+    ['id' => 32,  'name' => 'replaying old, negative thoughts', 'category_id' => 3],
+    ['id' => 33,  'name' => 'perfectionism', 'category_id' => 3],
+    ['id' => 34,  'name' => 'judging others\' motives', 'category_id' => 3],
+    ['id' => 35,  'name' => 'making goals and lists you can\'t complete', 'category_id' => 3],
+    ['id' => 36,  'name' => 'poor planning', 'category_id' => 3],
+    ['id' => 37,  'name' => 'mind reading', 'category_id' => 3],
+    ['id' => 38,  'name' => 'fantasy', 'category_id' => 3],
+    ['id' => 41,  'name' => 'co-dependent rescuing', 'category_id' => 3],
+    ['id' => 42,  'name' => 'sleep problems', 'category_id' => 3],
+    ['id' => 43,  'name' => 'trouble concentrating', 'category_id' => 3],
+    ['id' => 44,  'name' => 'seeking/creating drama', 'category_id' => 3],
+    ['id' => 45,  'name' => 'gossip', 'category_id' => 3],
+    ['id' => 46,  'name' => 'using over-the-counter medication for pain, sleep, and weight control', 'category_id' => 3],
+    ['id' => 47,  'name' => 'super busy', 'category_id' => 4],
+    ['id' => 48,  'name' => 'workaholic', 'category_id' => 4],
+    ['id' => 49,  'name' => 'can\'t relax', 'category_id' => 4],
+    ['id' => 50,  'name' => 'driving too fast', 'category_id' => 4],
+    ['id' => 51,  'name' => 'avoiding slowing down', 'category_id' => 4],
+    ['id' => 52,  'name' => 'feeling driven', 'category_id' => 4],
+    ['id' => 53,  'name' => 'in a hurry', 'category_id' => 4],
+    ['id' => 54,  'name' => 'can\'t turn off thoughts', 'category_id' => 4],
+    ['id' => 55,  'name' => 'skipping meals', 'category_id' => 4],
+    ['id' => 56,  'name' => 'binge eating (usually at night)', 'category_id' => 4],
+    ['id' => 57,  'name' => 'overspending', 'category_id' => 4],
+    ['id' => 58,  'name' => 'can\'t identify own feelings/needs', 'category_id' => 4],
+    ['id' => 59,  'name' => 'repetitive, negative thoughts', 'category_id' => 4],
+    ['id' => 60,  'name' => 'irritable', 'category_id' => 4],
+    ['id' => 61,  'name' => 'making excuses for "having to do it all"', 'category_id' => 4],
+    ['id' => 62,  'name' => 'dramatic mood swings', 'category_id' => 4],
+    ['id' => 63,  'name' => 'lust', 'category_id' => 4],
+    ['id' => 64,  'name' => 'too much caffeine', 'category_id' => 4],
+    ['id' => 65,  'name' => 'over exercising', 'category_id' => 4],
+    ['id' => 66,  'name' => 'nervousness', 'category_id' => 4],
+    ['id' => 67,  'name' => 'difficulty being alone or with people', 'category_id' => 4],
+    ['id' => 68,  'name' => 'difficulty listening to others', 'category_id' => 4],
+    ['id' => 69,  'name' => 'avoiding support', 'category_id' => 4],
+    ['id' => 70,  'name' => 'procrastination causing crises in money, work, or relationships', 'category_id' => 5],
+    ['id' => 71,  'name' => 'sarcasm', 'category_id' => 5],
+    ['id' => 72,  'name' => 'black and white, all or nothing thinking', 'category_id' => 5],
+    ['id' => 73,  'name' => 'feeling that no one understands', 'category_id' => 5],
+    ['id' => 74,  'name' => 'overreacting', 'category_id' => 5],
+    ['id' => 75,  'name' => 'road rage', 'category_id' => 5],
+    ['id' => 76,  'name' => 'constant resentments', 'category_id' => 5],
+    ['id' => 77,  'name' => 'pushing others away', 'category_id' => 5],
+    ['id' => 78,  'name' => 'increased isolation', 'category_id' => 5],
+    ['id' => 79,  'name' => 'blaming', 'category_id' => 5],
+    ['id' => 80,  'name' => 'self pity', 'category_id' => 5],
+    ['id' => 81,  'name' => 'arguing', 'category_id' => 5],
+    ['id' => 82,  'name' => 'irrationality', 'category_id' => 5],
+    ['id' => 83,  'name' => 'can\'t handle criticism', 'category_id' => 5],
+    ['id' => 84,  'name' => 'defensive', 'category_id' => 5],
+    ['id' => 85,  'name' => 'people are avoiding you', 'category_id' => 5],
+    ['id' => 86,  'name' => 'having to be right', 'category_id' => 5],
+    ['id' => 87,  'name' => 'digestive problems', 'category_id' => 5],
+    ['id' => 88,  'name' => 'headaches', 'category_id' => 5],
+    ['id' => 89,  'name' => 'obsessive (stuck) thoughts', 'category_id' => 5],
+    ['id' => 90,  'name' => 'can\'t forgive', 'category_id' => 5],
+    ['id' => 91,  'name' => 'feeling grandiose (superior)', 'category_id' => 5],
+    ['id' => 92,  'name' => 'intimidation', 'category_id' => 5],
+    ['id' => 93,  'name' => 'feeling aggressive', 'category_id' => 5],
+    ['id' => 94,  'name' => 'depressed', 'category_id' => 6],
+    ['id' => 95,  'name' => 'panicked', 'category_id' => 6],
+    ['id' => 96,  'name' => 'confused', 'category_id' => 6],
+    ['id' => 97,  'name' => 'hopeless', 'category_id' => 6],
+    ['id' => 98,  'name' => 'sleeping too much or too little', 'category_id' => 6],
+    ['id' => 99,  'name' => 'can\'t cope', 'category_id' => 6],
+    ['id' => 100, 'name' => 'overwhelmed', 'category_id' => 6],
+    ['id' => 101, 'name' => 'crying for "no reason"', 'category_id' => 6],
+    ['id' => 102, 'name' => 'can\'t think', 'category_id' => 6],
+    ['id' => 103, 'name' => 'forgetful', 'category_id' => 6],
+    ['id' => 104, 'name' => 'pessimistic', 'category_id' => 6],
+    ['id' => 105, 'name' => 'helpless', 'category_id' => 6],
+    ['id' => 106, 'name' => 'tired', 'category_id' => 6],
+    ['id' => 107, 'name' => 'numb', 'category_id' => 6],
+    ['id' => 108, 'name' => 'wanting to run', 'category_id' => 6],
+    ['id' => 109, 'name' => 'constant cravings for old coping behaviors', 'category_id' => 6],
+    ['id' => 110, 'name' => 'thinking of using drugs and alcohol', 'category_id' => 6],
+    ['id' => 111, 'name' => 'seeking out old unhealthy people and places', 'category_id' => 6],
+    ['id' => 112, 'name' => 'really isolated', 'category_id' => 6],
+    ['id' => 113, 'name' => 'people are angry with you', 'category_id' => 6],
+    ['id' => 114, 'name' => 'self-abuse', 'category_id' => 6],
+    ['id' => 115, 'name' => 'suicidal thoughts', 'category_id' => 6],
+    ['id' => 116, 'name' => 'no goals', 'category_id' => 6],
+    ['id' => 117, 'name' => 'survival mode', 'category_id' => 6],
+    ['id' => 118, 'name' => 'not returning phone calls', 'category_id' => 6],
+    ['id' => 119, 'name' => 'missing work', 'category_id' => 6],
+    ['id' => 120, 'name' => 'irritability', 'category_id' => 6],
+    ['id' => 121, 'name' => 'loss of appetite', 'category_id' => 6],
+    ['id' => 122, 'name' => 'returning to the place you swore you would never go again', 'category_id' => 7],
+    ['id' => 123, 'name' => 'giving up', 'category_id' => 7],
+    ['id' => 124, 'name' => 'giving in', 'category_id' => 7],
+    ['id' => 125, 'name' => 'out of control', 'category_id' => 7],
+    ['id' => 126, 'name' => 'lost in your addiction', 'category_id' => 7],
+    ['id' => 127, 'name' => 'lying to yourself and others', 'category_id' => 7],
+    ['id' => 128, 'name' => 'feeling you just can\'t manage without your coping behavior, at least for now', 'category_id' => 7],
+    ['id' => 129, 'name' => 'shame', 'category_id' => 7],
+    ['id' => 130, 'name' => 'condemnation', 'category_id' => 7],
+    ['id' => 131, 'name' => 'guilt', 'category_id' => 7],
+    ['id' => 132, 'name' => 'aloneness', 'category_id' => 7],
+  ];
 
   /**
    * @inheritdoc

Spacing +98 added lines, -98 removed lines

@@ -14,103 +14,103 @@ 
 class Behavior extends \yii\base\BaseObject implements BehaviorInterface
 {
 	public static $behaviors = [
-		['id' => 1,   'name' => 'no current secrets', 'category_id' => 1],
-		['id' => 2,   'name' => 'resolving problems', 'category_id' => 1],
-		['id' => 3,   'name' => 'identifying fears and feelings', 'category_id' => 1],
-		['id' => 4,   'name' => 'keeping commitments to meetings, prayer, family, church, people, goals, and self', 'category_id' => 1],
-		['id' => 5,   'name' => 'being open', 'category_id' => 1],
-		['id' => 6,   'name' => 'being honest', 'category_id' => 1],
-		['id' => 7,   'name' => 'making eye contact', 'category_id' => 1],
-		['id' => 8,   'name' => 'reaching out to others', 'category_id' => 1],
-		['id' => 9,   'name' => 'increasing in relationships with God and others', 'category_id' => 1],
-		['id' => 10,  'name' => 'accountability', 'category_id' => 1],
-		['id' => 11,  'name' => 'secrets', 'category_id' => 2],
-		['id' => 12,  'name' => 'bored', 'category_id' => 2],
-		['id' => 13,  'name' => 'less time/energy for God, meetings, and church', 'category_id' => 2],
-		['id' => 14,  'name' => 'avoiding support and accountability towards people', 'category_id' => 2],
-		['id' => 15,  'name' => 'superficial conversations', 'category_id' => 2],
-		['id' => 16,  'name' => 'sarcasm', 'category_id' => 2],
-		['id' => 17,  'name' => 'isolating yourself', 'category_id' => 2],
-		['id' => 18,  'name' => 'changes in goals', 'category_id' => 2],
-		['id' => 19,  'name' => 'flirting', 'category_id' => 2],
-		['id' => 20,  'name' => 'obsessed with relationships', 'category_id' => 2],
-		['id' => 21,  'name' => 'breaking promises/commitments', 'category_id' => 2],
-		['id' => 22,  'name' => 'neglecting family', 'category_id' => 2],
-		['id' => 23,  'name' => 'preoccupation with material things, television, or entertainment', 'category_id' => 2],
-		['id' => 24,  'name' => 'procrastination', 'category_id' => 2],
-		['id' => 25,  'name' => 'lying', 'category_id' => 2],
-		['id' => 26,  'name' => 'over-confidence', 'category_id' => 2],
-		['id' => 27,  'name' => 'hiding money', 'category_id' => 2],
-		['id' => 28,  'name' => 'worry', 'category_id' => 3],
-		['id' => 29,  'name' => 'using profanity', 'category_id' => 3],
-		['id' => 30,  'name' => 'being fearful', 'category_id' => 3],
-		['id' => 31,  'name' => 'being resentful', 'category_id' => 3],
-		['id' => 32,  'name' => 'replaying old, negative thoughts', 'category_id' => 3],
-		['id' => 33,  'name' => 'perfectionism', 'category_id' => 3],
-		['id' => 34,  'name' => 'judging others\' motives', 'category_id' => 3],
-		['id' => 35,  'name' => 'making goals and lists you can\'t complete', 'category_id' => 3],
-		['id' => 36,  'name' => 'poor planning', 'category_id' => 3],
-		['id' => 37,  'name' => 'mind reading', 'category_id' => 3],
-		['id' => 38,  'name' => 'fantasy', 'category_id' => 3],
-		['id' => 41,  'name' => 'co-dependent rescuing', 'category_id' => 3],
-		['id' => 42,  'name' => 'sleep problems', 'category_id' => 3],
-		['id' => 43,  'name' => 'trouble concentrating', 'category_id' => 3],
-		['id' => 44,  'name' => 'seeking/creating drama', 'category_id' => 3],
-		['id' => 45,  'name' => 'gossip', 'category_id' => 3],
-		['id' => 46,  'name' => 'using over-the-counter medication for pain, sleep, and weight control', 'category_id' => 3],
-		['id' => 47,  'name' => 'super busy', 'category_id' => 4],
-		['id' => 48,  'name' => 'workaholic', 'category_id' => 4],
-		['id' => 49,  'name' => 'can\'t relax', 'category_id' => 4],
-		['id' => 50,  'name' => 'driving too fast', 'category_id' => 4],
-		['id' => 51,  'name' => 'avoiding slowing down', 'category_id' => 4],
-		['id' => 52,  'name' => 'feeling driven', 'category_id' => 4],
-		['id' => 53,  'name' => 'in a hurry', 'category_id' => 4],
-		['id' => 54,  'name' => 'can\'t turn off thoughts', 'category_id' => 4],
-		['id' => 55,  'name' => 'skipping meals', 'category_id' => 4],
-		['id' => 56,  'name' => 'binge eating (usually at night)', 'category_id' => 4],
-		['id' => 57,  'name' => 'overspending', 'category_id' => 4],
-		['id' => 58,  'name' => 'can\'t identify own feelings/needs', 'category_id' => 4],
-		['id' => 59,  'name' => 'repetitive, negative thoughts', 'category_id' => 4],
-		['id' => 60,  'name' => 'irritable', 'category_id' => 4],
-		['id' => 61,  'name' => 'making excuses for "having to do it all"', 'category_id' => 4],
-		['id' => 62,  'name' => 'dramatic mood swings', 'category_id' => 4],
-		['id' => 63,  'name' => 'lust', 'category_id' => 4],
-		['id' => 64,  'name' => 'too much caffeine', 'category_id' => 4],
-		['id' => 65,  'name' => 'over exercising', 'category_id' => 4],
-		['id' => 66,  'name' => 'nervousness', 'category_id' => 4],
-		['id' => 67,  'name' => 'difficulty being alone or with people', 'category_id' => 4],
-		['id' => 68,  'name' => 'difficulty listening to others', 'category_id' => 4],
-		['id' => 69,  'name' => 'avoiding support', 'category_id' => 4],
-		['id' => 70,  'name' => 'procrastination causing crises in money, work, or relationships', 'category_id' => 5],
-		['id' => 71,  'name' => 'sarcasm', 'category_id' => 5],
-		['id' => 72,  'name' => 'black and white, all or nothing thinking', 'category_id' => 5],
-		['id' => 73,  'name' => 'feeling that no one understands', 'category_id' => 5],
-		['id' => 74,  'name' => 'overreacting', 'category_id' => 5],
-		['id' => 75,  'name' => 'road rage', 'category_id' => 5],
-		['id' => 76,  'name' => 'constant resentments', 'category_id' => 5],
-		['id' => 77,  'name' => 'pushing others away', 'category_id' => 5],
-		['id' => 78,  'name' => 'increased isolation', 'category_id' => 5],
-		['id' => 79,  'name' => 'blaming', 'category_id' => 5],
-		['id' => 80,  'name' => 'self pity', 'category_id' => 5],
-		['id' => 81,  'name' => 'arguing', 'category_id' => 5],
-		['id' => 82,  'name' => 'irrationality', 'category_id' => 5],
-		['id' => 83,  'name' => 'can\'t handle criticism', 'category_id' => 5],
-		['id' => 84,  'name' => 'defensive', 'category_id' => 5],
-		['id' => 85,  'name' => 'people are avoiding you', 'category_id' => 5],
-		['id' => 86,  'name' => 'having to be right', 'category_id' => 5],
-		['id' => 87,  'name' => 'digestive problems', 'category_id' => 5],
-		['id' => 88,  'name' => 'headaches', 'category_id' => 5],
-		['id' => 89,  'name' => 'obsessive (stuck) thoughts', 'category_id' => 5],
-		['id' => 90,  'name' => 'can\'t forgive', 'category_id' => 5],
-		['id' => 91,  'name' => 'feeling grandiose (superior)', 'category_id' => 5],
-		['id' => 92,  'name' => 'intimidation', 'category_id' => 5],
-		['id' => 93,  'name' => 'feeling aggressive', 'category_id' => 5],
-		['id' => 94,  'name' => 'depressed', 'category_id' => 6],
-		['id' => 95,  'name' => 'panicked', 'category_id' => 6],
-		['id' => 96,  'name' => 'confused', 'category_id' => 6],
-		['id' => 97,  'name' => 'hopeless', 'category_id' => 6],
-		['id' => 98,  'name' => 'sleeping too much or too little', 'category_id' => 6],
-		['id' => 99,  'name' => 'can\'t cope', 'category_id' => 6],
+		['id' => 1, 'name' => 'no current secrets', 'category_id' => 1],
+		['id' => 2, 'name' => 'resolving problems', 'category_id' => 1],
+		['id' => 3, 'name' => 'identifying fears and feelings', 'category_id' => 1],
+		['id' => 4, 'name' => 'keeping commitments to meetings, prayer, family, church, people, goals, and self', 'category_id' => 1],
+		['id' => 5, 'name' => 'being open', 'category_id' => 1],
+		['id' => 6, 'name' => 'being honest', 'category_id' => 1],
+		['id' => 7, 'name' => 'making eye contact', 'category_id' => 1],
+		['id' => 8, 'name' => 'reaching out to others', 'category_id' => 1],
+		['id' => 9, 'name' => 'increasing in relationships with God and others', 'category_id' => 1],
+		['id' => 10, 'name' => 'accountability', 'category_id' => 1],
+		['id' => 11, 'name' => 'secrets', 'category_id' => 2],
+		['id' => 12, 'name' => 'bored', 'category_id' => 2],
+		['id' => 13, 'name' => 'less time/energy for God, meetings, and church', 'category_id' => 2],
+		['id' => 14, 'name' => 'avoiding support and accountability towards people', 'category_id' => 2],
+		['id' => 15, 'name' => 'superficial conversations', 'category_id' => 2],
+		['id' => 16, 'name' => 'sarcasm', 'category_id' => 2],
+		['id' => 17, 'name' => 'isolating yourself', 'category_id' => 2],
+		['id' => 18, 'name' => 'changes in goals', 'category_id' => 2],
+		['id' => 19, 'name' => 'flirting', 'category_id' => 2],
+		['id' => 20, 'name' => 'obsessed with relationships', 'category_id' => 2],
+		['id' => 21, 'name' => 'breaking promises/commitments', 'category_id' => 2],
+		['id' => 22, 'name' => 'neglecting family', 'category_id' => 2],
+		['id' => 23, 'name' => 'preoccupation with material things, television, or entertainment', 'category_id' => 2],
+		['id' => 24, 'name' => 'procrastination', 'category_id' => 2],
+		['id' => 25, 'name' => 'lying', 'category_id' => 2],
+		['id' => 26, 'name' => 'over-confidence', 'category_id' => 2],
+		['id' => 27, 'name' => 'hiding money', 'category_id' => 2],
+		['id' => 28, 'name' => 'worry', 'category_id' => 3],
+		['id' => 29, 'name' => 'using profanity', 'category_id' => 3],
+		['id' => 30, 'name' => 'being fearful', 'category_id' => 3],
+		['id' => 31, 'name' => 'being resentful', 'category_id' => 3],
+		['id' => 32, 'name' => 'replaying old, negative thoughts', 'category_id' => 3],
+		['id' => 33, 'name' => 'perfectionism', 'category_id' => 3],
+		['id' => 34, 'name' => 'judging others\' motives', 'category_id' => 3],
+		['id' => 35, 'name' => 'making goals and lists you can\'t complete', 'category_id' => 3],
+		['id' => 36, 'name' => 'poor planning', 'category_id' => 3],
+		['id' => 37, 'name' => 'mind reading', 'category_id' => 3],
+		['id' => 38, 'name' => 'fantasy', 'category_id' => 3],
+		['id' => 41, 'name' => 'co-dependent rescuing', 'category_id' => 3],
+		['id' => 42, 'name' => 'sleep problems', 'category_id' => 3],
+		['id' => 43, 'name' => 'trouble concentrating', 'category_id' => 3],
+		['id' => 44, 'name' => 'seeking/creating drama', 'category_id' => 3],
+		['id' => 45, 'name' => 'gossip', 'category_id' => 3],
+		['id' => 46, 'name' => 'using over-the-counter medication for pain, sleep, and weight control', 'category_id' => 3],
+		['id' => 47, 'name' => 'super busy', 'category_id' => 4],
+		['id' => 48, 'name' => 'workaholic', 'category_id' => 4],
+		['id' => 49, 'name' => 'can\'t relax', 'category_id' => 4],
+		['id' => 50, 'name' => 'driving too fast', 'category_id' => 4],
+		['id' => 51, 'name' => 'avoiding slowing down', 'category_id' => 4],
+		['id' => 52, 'name' => 'feeling driven', 'category_id' => 4],
+		['id' => 53, 'name' => 'in a hurry', 'category_id' => 4],
+		['id' => 54, 'name' => 'can\'t turn off thoughts', 'category_id' => 4],
+		['id' => 55, 'name' => 'skipping meals', 'category_id' => 4],
+		['id' => 56, 'name' => 'binge eating (usually at night)', 'category_id' => 4],
+		['id' => 57, 'name' => 'overspending', 'category_id' => 4],
+		['id' => 58, 'name' => 'can\'t identify own feelings/needs', 'category_id' => 4],
+		['id' => 59, 'name' => 'repetitive, negative thoughts', 'category_id' => 4],
+		['id' => 60, 'name' => 'irritable', 'category_id' => 4],
+		['id' => 61, 'name' => 'making excuses for "having to do it all"', 'category_id' => 4],
+		['id' => 62, 'name' => 'dramatic mood swings', 'category_id' => 4],
+		['id' => 63, 'name' => 'lust', 'category_id' => 4],
+		['id' => 64, 'name' => 'too much caffeine', 'category_id' => 4],
+		['id' => 65, 'name' => 'over exercising', 'category_id' => 4],
+		['id' => 66, 'name' => 'nervousness', 'category_id' => 4],
+		['id' => 67, 'name' => 'difficulty being alone or with people', 'category_id' => 4],
+		['id' => 68, 'name' => 'difficulty listening to others', 'category_id' => 4],
+		['id' => 69, 'name' => 'avoiding support', 'category_id' => 4],
+		['id' => 70, 'name' => 'procrastination causing crises in money, work, or relationships', 'category_id' => 5],
+		['id' => 71, 'name' => 'sarcasm', 'category_id' => 5],
+		['id' => 72, 'name' => 'black and white, all or nothing thinking', 'category_id' => 5],
+		['id' => 73, 'name' => 'feeling that no one understands', 'category_id' => 5],
+		['id' => 74, 'name' => 'overreacting', 'category_id' => 5],
+		['id' => 75, 'name' => 'road rage', 'category_id' => 5],
+		['id' => 76, 'name' => 'constant resentments', 'category_id' => 5],
+		['id' => 77, 'name' => 'pushing others away', 'category_id' => 5],
+		['id' => 78, 'name' => 'increased isolation', 'category_id' => 5],
+		['id' => 79, 'name' => 'blaming', 'category_id' => 5],
+		['id' => 80, 'name' => 'self pity', 'category_id' => 5],
+		['id' => 81, 'name' => 'arguing', 'category_id' => 5],
+		['id' => 82, 'name' => 'irrationality', 'category_id' => 5],
+		['id' => 83, 'name' => 'can\'t handle criticism', 'category_id' => 5],
+		['id' => 84, 'name' => 'defensive', 'category_id' => 5],
+		['id' => 85, 'name' => 'people are avoiding you', 'category_id' => 5],
+		['id' => 86, 'name' => 'having to be right', 'category_id' => 5],
+		['id' => 87, 'name' => 'digestive problems', 'category_id' => 5],
+		['id' => 88, 'name' => 'headaches', 'category_id' => 5],
+		['id' => 89, 'name' => 'obsessive (stuck) thoughts', 'category_id' => 5],
+		['id' => 90, 'name' => 'can\'t forgive', 'category_id' => 5],
+		['id' => 91, 'name' => 'feeling grandiose (superior)', 'category_id' => 5],
+		['id' => 92, 'name' => 'intimidation', 'category_id' => 5],
+		['id' => 93, 'name' => 'feeling aggressive', 'category_id' => 5],
+		['id' => 94, 'name' => 'depressed', 'category_id' => 6],
+		['id' => 95, 'name' => 'panicked', 'category_id' => 6],
+		['id' => 96, 'name' => 'confused', 'category_id' => 6],
+		['id' => 97, 'name' => 'hopeless', 'category_id' => 6],
+		['id' => 98, 'name' => 'sleeping too much or too little', 'category_id' => 6],
+		['id' => 99, 'name' => 'can\'t cope', 'category_id' => 6],
 		['id' => 100, 'name' => 'overwhelmed', 'category_id' => 6],
 		['id' => 101, 'name' => 'crying for "no reason"', 'category_id' => 6],
 		['id' => 102, 'name' => 'can\'t think', 'category_id' => 6],
@@ -180,7 +180,7 @@ 
   public function getCategories() {
     $bhvrs_by_cat = AH::index(self::$behaviors, null, 'category_id');
     $cats = AH::index(\common\models\Category::$categories, "id");
-    foreach($cats as $id => &$cat) {
+    foreach ($cats as $id => &$cat) {
       $cat['behavior_count'] = count($bhvrs_by_cat[$id]); // add count of behaviors
       $cat['category_id'] = $cat['id']; // rename id to category_id 
       unset($cat['id']);

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