CorWatts / fasterscale

site/tests/unit/models/SignupFormTest.php

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/views/site/signup.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 				'id' => 'form-signup',
 				'enableClientValidation' => true,
         'enableAjaxValidation' => false,
-        'options' => [ 'validateOnSubmit' => true ]
+        'options' => ['validateOnSubmit' => true]
 			]); ?>
         <?= $form->field($model, 'email', ['inputTemplate' => '<div class="input-group"><span class="input-group-addon">@</span>{input}</div>'])->input('email') ?>
         <?= $form->field($model, 'password', ['inputTemplate' => '<div class="input-group">{input}<span class="input-group-btn"><button id="password-toggle" class="btn btn-default" type="button">Show</button></span></div>'])->passwordInput() ?>
@@ -34,7 +34,7 @@ 
           'template' => '<div class="row"><div class="col-md-5">{image}</div><div class="col-md-6 col-md-offset-1">{input}</div></div>',
         ]) ?>
         <?= $form->field($model, 'send_email')->checkbox(['disabled'=>true]) ?>
-        <div id='send_email_fields' <?php if(!$model->send_email) { ?>style="display: none;"<?php } ?>>
+        <div id='send_email_fields' <?php if (!$model->send_email) { ?>style="display: none;"<?php } ?>>
           <?= $form->field($model, 'partner_email1')->input('email') ?>
           <?= $form->field($model, 'partner_email2')->input('email') ?>
           <?= $form->field($model, 'partner_email3')->input('email') ?>

site/views/checkin/view.php

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
 $plus_week  = $time->alterLocalDate($actual_date, "+1 week");
 
 $pie_data = [];
-if($answer_pie) {
+if ($answer_pie) {
   $values     = array_map('intval', array_column($answer_pie, "count"));
   $labels     = array_column($answer_pie, "name");
   $colors     = array_column($answer_pie, "color");
@@ -68,15 +68,15 @@ 
     </div>
   </div>
 
-  <?php if($questions) {
-  foreach($questions as $behavior_id => $behavior_questions) {
+  <?php if ($questions) {
+  foreach ($questions as $behavior_id => $behavior_questions) {
     print "<div class='well well-sm'>";
     print "<button type='button' class='btn btn-primary' disabled='disabled'>{$behavior_questions['question']['title']}</button>";
     print "<div class='row'>";
-    foreach($behavior_questions['answers'] as $question) { 
+    foreach ($behavior_questions['answers'] as $question) { 
       print "<div class='col-md-4'>";
       print "<p><strong>{$question['title']}</strong></p>";
-      print "<p>".Html::encode($question['answer'])."</p>";
+      print "<p>" . Html::encode($question['answer']) . "</p>";
       print "</div>";
     }
     print "</div></div>";
@@ -88,7 +88,7 @@ 
     'options' => ['class' => 'form-horizontal'],
   ]);
 
-  foreach($categories as $category) {
+  foreach ($categories as $category) {
     $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name');
     print $form
             ->field($model, "behaviors{$category['id']}")

site/models/SignupForm.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
    */
   public function signup() {
     $user = $this->user->findByEmail($this->email);
-    if(!$user) {
+    if (!$user) {
       // this is a brand new user
       $this->user = $this->setFields($this->user);
       $this->user->save();
@@ -96,7 +96,7 @@ 
        * this is a user that for whatever reason is trying to sign up again
        * with the same email address.
        */
-      if(!$user->isTokenConfirmed()) {
+      if (!$user->isTokenConfirmed()) {
         /*
          * they've never verified their account. We don't care if their
          * verification token is current or expired. We're resetting their
@@ -124,7 +124,7 @@ 
       $user->generateAuthKey();
       $user->generateVerifyEmailToken();
 
-      if($user->send_email) {
+      if ($user->send_email) {
         $user->partner_email1  = $this->partner_email1;
         $user->partner_email2  = $this->partner_email2;
         $user->partner_email3  = $this->partner_email3;

common/tests/unit/models/BehaviorTest.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     expect('getCategories should return an array of 7 categories', $this->assertEquals(count($behaviors), 7));
 
-    foreach($behaviors as $behavior) {
+    foreach ($behaviors as $behavior) {
       expect('this behavior to have a "name" key', $this->assertArrayHasKey('name', $behavior));
       expect('this behavior to have a "behavior_count" key', $this->assertArrayHasKey('behavior_count', $behavior));
       expect('this behavior to have a "category_id" key', $this->assertArrayHasKey('category_id', $behavior));

common/tests/unit/models/UserTest.php

Indentation +624 added lines, -624 removed lines

@@ -17,640 +17,640 @@
 
   private $user;
 
-	public $questionData = [
-	[
-		'id' => 641,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'user_behavior_id' => 821,
-		'question' => 1,
-		'answer' => 'alsgn',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-		],
-	],
-	[
-		'id' => 642,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'user_behavior_id' => 821,
-		'question' => 2,
-		'answer' => 'loiun',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-		],
-	],
-	[
-		'id' => 643,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'user_behavior_id' => 821,
-		'question' => 3,
-		'answer' => 'liun',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-		],
-	],
-	[
-		'id' => 644,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'user_behavior_id' => 823,
-		'question' => 1,
-		'answer' => 'ljnb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-		],
-	],
-	[
-		'id' => 645,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'user_behavior_id' => 823,
-		'question' => 2,
-		'answer' => 'liunb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-		],
-	],
-	[
-		'id' => 646,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'user_behavior_id' => 823,
-		'question' => 3,
-		'answer' => 'ilub ',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-		],
-	],
-	[
-		'id' => 647,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'user_behavior_id' => 825,
-		'question' => 1,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-		],
-	],
-	[
-		'id' => 648,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'user_behavior_id' => 825,
-		'question' => 2,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-		],
-	],
-	[
-		'id' => 649,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'user_behavior_id' => 825,
-		'question' => 3,
-		'answer' => 'liub ',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-		],
-	],
-	[
-		'id' => 650,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'user_behavior_id' => 828,
-		'question' => 1,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-		],
-	],
-	[
-		'id' => 651,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'user_behavior_id' => 828,
-		'question' => 2,
-		'answer' => 'liuby',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-		],
-	],
-	[
-		'id' => 652,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'user_behavior_id' => 828,
-		'question' => 3,
-		'answer' => 'uiylb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-		],
-	],
-	[
-		'id' => 653,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'user_behavior_id' => 829,
-		'question' => 1,
-		'answer' => 'liub',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-		],
-	],
-	[
-		'id' => 654,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'user_behavior_id' => 829,
-		'question' => 2,
-		'answer' => 'liuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-		],
-	],
-	[
-		'id' => 655,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'user_behavior_id' => 829,
-		'question' => 3,
-		'answer' => 'iuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-		],
-	],
-	[
-		'id' => 656,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'user_behavior_id' => 831,
-		'question' => 1,
-		'answer' => 'iuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-		],
-	],
-	[
-		'id' => 657,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'user_behavior_id' => 831,
-		'question' => 2,
-		'answer' => 'iuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-		],
-	],
-	[
-		'id' => 658,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'user_behavior_id' => 831,
-		'question' => 3,
-		'answer' => 'liuyb',
-		'date' => '2016-09-10 19:27:43',
-		'behavior' => 
-		[
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-		],
-	],
+  public $questionData = [
+  [
+    'id' => 641,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'user_behavior_id' => 821,
+    'question' => 1,
+    'answer' => 'alsgn',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+    ],
+  ],
+  [
+    'id' => 642,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'user_behavior_id' => 821,
+    'question' => 2,
+    'answer' => 'loiun',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+    ],
+  ],
+  [
+    'id' => 643,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'user_behavior_id' => 821,
+    'question' => 3,
+    'answer' => 'liun',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+    ],
+  ],
+  [
+    'id' => 644,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'user_behavior_id' => 823,
+    'question' => 1,
+    'answer' => 'ljnb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+    ],
+  ],
+  [
+    'id' => 645,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'user_behavior_id' => 823,
+    'question' => 2,
+    'answer' => 'liunb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+    ],
+  ],
+  [
+    'id' => 646,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'user_behavior_id' => 823,
+    'question' => 3,
+    'answer' => 'ilub ',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+    ],
+  ],
+  [
+    'id' => 647,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'user_behavior_id' => 825,
+    'question' => 1,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+    ],
+  ],
+  [
+    'id' => 648,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'user_behavior_id' => 825,
+    'question' => 2,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+    ],
+  ],
+  [
+    'id' => 649,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'user_behavior_id' => 825,
+    'question' => 3,
+    'answer' => 'liub ',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+    ],
+  ],
+  [
+    'id' => 650,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'user_behavior_id' => 828,
+    'question' => 1,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+    ],
+  ],
+  [
+    'id' => 651,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'user_behavior_id' => 828,
+    'question' => 2,
+    'answer' => 'liuby',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+    ],
+  ],
+  [
+    'id' => 652,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'user_behavior_id' => 828,
+    'question' => 3,
+    'answer' => 'uiylb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+    ],
+  ],
+  [
+    'id' => 653,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'user_behavior_id' => 829,
+    'question' => 1,
+    'answer' => 'liub',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+    ],
+  ],
+  [
+    'id' => 654,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'user_behavior_id' => 829,
+    'question' => 2,
+    'answer' => 'liuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+    ],
+  ],
+  [
+    'id' => 655,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'user_behavior_id' => 829,
+    'question' => 3,
+    'answer' => 'iuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+    ],
+  ],
+  [
+    'id' => 656,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'user_behavior_id' => 831,
+    'question' => 1,
+    'answer' => 'iuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+    ],
+  ],
+  [
+    'id' => 657,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'user_behavior_id' => 831,
+    'question' => 2,
+    'answer' => 'iuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+    ],
+  ],
+  [
+    'id' => 658,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'user_behavior_id' => 831,
+    'question' => 3,
+    'answer' => 'liuyb',
+    'date' => '2016-09-10 19:27:43',
+    'behavior' => 
+    [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+    ],
+  ],
 ];
 public $userQuestions = [
-	13 => [
-		'question' => [
-			'id' => 13,
-			'title' => 'less time/energy for God, meetings, and church',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'alsgn',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'loiun',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'liun',
-			],
-		],
-	],
-	29 => [
-		'question' => [
-			'id' => 29,
-			'title' => 'using profanity',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'ljnb',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liunb',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'ilub ',
-			],
-		],
-	],
-	48 => [
-		'question' => [
-			'id' => 48,
-			'title' => 'workaholic',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'liub',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liub',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'liub ',
-			],
-		],
-	],
-	89 => [
-		'question' => [
-			'id' => 89,
-			'title' => 'obsessive (stuck) thoughts',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'liub',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liuby',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'uiylb',
-			],
-		],
-	],
-	111 => [
-		'question' => [
-			'id' => 111,
-			'title' => 'seeking out old unhealthy people and places',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'liub',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'liuyb',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'iuyb',
-			],
-		],
-	],
-	122 => [
-		'question' => [
-			'id' => 122,
-			'title' => 'returning to the place you swore you would never go again',
-		],
-		'answers' => [
-			[
-				'title' => 'How does it affect me? How do I act and feel?',
-				'answer' => 'iuyb',
-			], [
-				'title' => 'How does it affect the important people in my life?',
-				'answer' => 'iuyb',
-			], [
-				'title' => 'Why do I do this? What is the benefit for me?',
-				'answer' => 'liuyb',
-			],
-		],
-	],
+  13 => [
+    'question' => [
+      'id' => 13,
+      'title' => 'less time/energy for God, meetings, and church',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'alsgn',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'loiun',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'liun',
+      ],
+    ],
+  ],
+  29 => [
+    'question' => [
+      'id' => 29,
+      'title' => 'using profanity',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'ljnb',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liunb',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'ilub ',
+      ],
+    ],
+  ],
+  48 => [
+    'question' => [
+      'id' => 48,
+      'title' => 'workaholic',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'liub ',
+      ],
+    ],
+  ],
+  89 => [
+    'question' => [
+      'id' => 89,
+      'title' => 'obsessive (stuck) thoughts',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liuby',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'uiylb',
+      ],
+    ],
+  ],
+  111 => [
+    'question' => [
+      'id' => 111,
+      'title' => 'seeking out old unhealthy people and places',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'liub',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'liuyb',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'iuyb',
+      ],
+    ],
+  ],
+  122 => [
+    'question' => [
+      'id' => 122,
+      'title' => 'returning to the place you swore you would never go again',
+    ],
+    'answers' => [
+      [
+        'title' => 'How does it affect me? How do I act and feel?',
+        'answer' => 'iuyb',
+      ], [
+        'title' => 'How does it affect the important people in my life?',
+        'answer' => 'iuyb',
+      ], [
+        'title' => 'Why do I do this? What is the benefit for me?',
+        'answer' => 'liuyb',
+      ],
+    ],
+  ],
 ];
 
 public $behaviorData = [
-	[
-		'id' => 820,
-		'user_id' => 2,
-		'behavior_id' => 7,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 7,
-			'name' => 'making eye contact',
-			'category_id' => 1,
-			'category' => [
-				'id' => 1,
-				'name' => 'Restoration',
-			],
-		],
-	], [
-		'id' => 821,
-		'user_id' => 2,
-		'behavior_id' => 13,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 13,
-			'name' => 'less time/energy for God, meetings, and church',
-			'category_id' => 2,
-			'category' => [
-				'id' => 2,
-				'name' => 'Forgetting Priorities',
-			],
-		],
-	], [
-		'id' => 822,
-		'user_id' => 2,
-		'behavior_id' => 18,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 18,
-			'name' => 'changes in goals',
-			'category_id' => 2,
-			'category' => [
-				'id' => 2,
-				'name' => 'Forgetting Priorities',
-			],
-		],
-	], [
-		'id' => 823,
-		'user_id' => 2,
-		'behavior_id' => 29,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 29,
-			'name' => 'using profanity',
-			'category_id' => 3,
-			'category' => [
-				'id' => 3,
-				'name' => 'Anxiety',
-			],
-		],
-	], [
-		'id' => 824,
-		'user_id' => 2,
-		'behavior_id' => 41,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 41,
-			'name' => 'co-dependent rescuing',
-			'category_id' => 3,
-			'category' => [
-				'id' => 3,
-				'name' => 'Anxiety',
-			],
-		],
-	], [
-		'id' => 825,
-		'user_id' => 2,
-		'behavior_id' => 48,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 48,
-			'name' => 'workaholic',
-			'category_id' => 4,
-			'category' => [
-				'id' => 4,
-				'name' => 'Speeding Up',
-			],
-		],
-	], [
-		'id' => 826,
-		'user_id' => 2,
-		'behavior_id' => 72,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 72,
-			'name' => 'black and white, all or nothing thinking',
-			'category_id' => 5,
-			'category' => [
-				'id' => 5,
-				'name' => 'Ticked Off',
-			],
-		],
-	], [
-		'id' => 827,
-		'user_id' => 2,
-		'behavior_id' => 79,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 79,
-			'name' => 'blaming',
-			'category_id' => 5,
-			'category' => [
-				'id' => 5,
-				'name' => 'Ticked Off',
-			],
-		],
-	], [
-		'id' => 828,
-		'user_id' => 2,
-		'behavior_id' => 89,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 89,
-			'name' => 'obsessive (stuck) thoughts',
-			'category_id' => 5,
-			'category' => [
-				'id' => 5,
-				'name' => 'Ticked Off',
-			],
-		],
-	], [
-		'id' => 829,
-		'user_id' => 2,
-		'behavior_id' => 111,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 111,
-			'name' => 'seeking out old unhealthy people and places',
-			'category_id' => 6,
-			'category' => [
-				'id' => 6,
-				'name' => 'Exhausted',
-			],
-		],
-	], [
-		'id' => 830,
-		'user_id' => 2,
-		'behavior_id' => 118,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 118,
-			'name' => 'not returning phone calls',
-			'category_id' => 6,
-			'category' => [
-				'id' => 6,
-				'name' => 'Exhausted',
-			],
-		],
-	], [
-		'id' => 831,
-		'user_id' => 2,
-		'behavior_id' => 122,
-		'date' => '2016-09-10 19:26:04',
-		'behavior' => [
-			'id' => 122,
-			'name' => 'returning to the place you swore you would never go again',
-			'category_id' => 7,
-			'category' => [
-				'id' => 7,
-				'name' => 'Relapse/Moral Failure',
-			],
-		],
-	],
+  [
+    'id' => 820,
+    'user_id' => 2,
+    'behavior_id' => 7,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 7,
+      'name' => 'making eye contact',
+      'category_id' => 1,
+      'category' => [
+        'id' => 1,
+        'name' => 'Restoration',
+      ],
+    ],
+  ], [
+    'id' => 821,
+    'user_id' => 2,
+    'behavior_id' => 13,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 13,
+      'name' => 'less time/energy for God, meetings, and church',
+      'category_id' => 2,
+      'category' => [
+        'id' => 2,
+        'name' => 'Forgetting Priorities',
+      ],
+    ],
+  ], [
+    'id' => 822,
+    'user_id' => 2,
+    'behavior_id' => 18,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 18,
+      'name' => 'changes in goals',
+      'category_id' => 2,
+      'category' => [
+        'id' => 2,
+        'name' => 'Forgetting Priorities',
+      ],
+    ],
+  ], [
+    'id' => 823,
+    'user_id' => 2,
+    'behavior_id' => 29,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 29,
+      'name' => 'using profanity',
+      'category_id' => 3,
+      'category' => [
+        'id' => 3,
+        'name' => 'Anxiety',
+      ],
+    ],
+  ], [
+    'id' => 824,
+    'user_id' => 2,
+    'behavior_id' => 41,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 41,
+      'name' => 'co-dependent rescuing',
+      'category_id' => 3,
+      'category' => [
+        'id' => 3,
+        'name' => 'Anxiety',
+      ],
+    ],
+  ], [
+    'id' => 825,
+    'user_id' => 2,
+    'behavior_id' => 48,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 48,
+      'name' => 'workaholic',
+      'category_id' => 4,
+      'category' => [
+        'id' => 4,
+        'name' => 'Speeding Up',
+      ],
+    ],
+  ], [
+    'id' => 826,
+    'user_id' => 2,
+    'behavior_id' => 72,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 72,
+      'name' => 'black and white, all or nothing thinking',
+      'category_id' => 5,
+      'category' => [
+        'id' => 5,
+        'name' => 'Ticked Off',
+      ],
+    ],
+  ], [
+    'id' => 827,
+    'user_id' => 2,
+    'behavior_id' => 79,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 79,
+      'name' => 'blaming',
+      'category_id' => 5,
+      'category' => [
+        'id' => 5,
+        'name' => 'Ticked Off',
+      ],
+    ],
+  ], [
+    'id' => 828,
+    'user_id' => 2,
+    'behavior_id' => 89,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 89,
+      'name' => 'obsessive (stuck) thoughts',
+      'category_id' => 5,
+      'category' => [
+        'id' => 5,
+        'name' => 'Ticked Off',
+      ],
+    ],
+  ], [
+    'id' => 829,
+    'user_id' => 2,
+    'behavior_id' => 111,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 111,
+      'name' => 'seeking out old unhealthy people and places',
+      'category_id' => 6,
+      'category' => [
+        'id' => 6,
+        'name' => 'Exhausted',
+      ],
+    ],
+  ], [
+    'id' => 830,
+    'user_id' => 2,
+    'behavior_id' => 118,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 118,
+      'name' => 'not returning phone calls',
+      'category_id' => 6,
+      'category' => [
+        'id' => 6,
+        'name' => 'Exhausted',
+      ],
+    ],
+  ], [
+    'id' => 831,
+    'user_id' => 2,
+    'behavior_id' => 122,
+    'date' => '2016-09-10 19:26:04',
+    'behavior' => [
+      'id' => 122,
+      'name' => 'returning to the place you swore you would never go again',
+      'category_id' => 7,
+      'category' => [
+        'id' => 7,
+        'name' => 'Relapse/Moral Failure',
+      ],
+    ],
+  ],
 ];
 
 public $userBehaviors = [
-	1 => [
-		'category_name' => 'Restoration',
-		'behaviors' => [
-			[
-				'id' => 7,
-				'name' => 'making eye contact',
-			],
-		],
-	],
-	2 => [
-		'category_name' => 'Forgetting Priorities',
-		'behaviors' => [
-			[
-				'id' => 13,
-				'name' => 'less time/energy for God, meetings, and church',
-			], [
-				'id' => 18,
-				'name' => 'changes in goals',
-			],
-		],
+  1 => [
+    'category_name' => 'Restoration',
+    'behaviors' => [
+      [
+        'id' => 7,
+        'name' => 'making eye contact',
+      ],
+    ],
+  ],
+  2 => [
+    'category_name' => 'Forgetting Priorities',
+    'behaviors' => [
+      [
+        'id' => 13,
+        'name' => 'less time/energy for God, meetings, and church',
+      ], [
+        'id' => 18,
+        'name' => 'changes in goals',
+      ],
+    ],
   ],
   3 => [
-		'category_name' => 'Anxiety',
-		'behaviors' => [
-			[
-				'id' => 29,
-				'name' => 'using profanity',
-			], [
-				'id' => 41,
-				'name' => 'co-dependent rescuing',
-			],
-		],
-	],
-	4 => [
-		'category_name' => 'Speeding Up',
-		'behaviors' => [
-			[
-				'id' => 48,
-				'name' => 'workaholic',
-			],
-		],
-	],
-	5 => [
-		'category_name' => 'Ticked Off',
-		'behaviors' => [
-			[
-				'id' => 72,
-				'name' => 'black and white, all or nothing thinking',
-			], [
-				'id' => 79,
-				'name' => 'blaming',
-			], [
-				'id' => 89,
-				'name' => 'obsessive (stuck) thoughts',
-			],
-		],
-	],
-	6 => [
-		'category_name' => 'Exhausted',
-		'behaviors' => [
-			[
-				'id' => 111,
-				'name' => 'seeking out old unhealthy people and places',
-			], [
-				'id' => 118,
-				'name' => 'not returning phone calls',
-			],
-		],
-	],
-	7 => [
-		'category_name' => 'Relapse/Moral Failure',
-		'behaviors' => [
-			[
-				'id' => 122,
-				'name' => 'returning to the place you swore you would never go again',
-			],
-		],
-	],
+    'category_name' => 'Anxiety',
+    'behaviors' => [
+      [
+        'id' => 29,
+        'name' => 'using profanity',
+      ], [
+        'id' => 41,
+        'name' => 'co-dependent rescuing',
+      ],
+    ],
+  ],
+  4 => [
+    'category_name' => 'Speeding Up',
+    'behaviors' => [
+      [
+        'id' => 48,
+        'name' => 'workaholic',
+      ],
+    ],
+  ],
+  5 => [
+    'category_name' => 'Ticked Off',
+    'behaviors' => [
+      [
+        'id' => 72,
+        'name' => 'black and white, all or nothing thinking',
+      ], [
+        'id' => 79,
+        'name' => 'blaming',
+      ], [
+        'id' => 89,
+        'name' => 'obsessive (stuck) thoughts',
+      ],
+    ],
+  ],
+  6 => [
+    'category_name' => 'Exhausted',
+    'behaviors' => [
+      [
+        'id' => 111,
+        'name' => 'seeking out old unhealthy people and places',
+      ], [
+        'id' => 118,
+        'name' => 'not returning phone calls',
+      ],
+    ],
+  ],
+  7 => [
+    'category_name' => 'Relapse/Moral Failure',
+    'behaviors' => [
+      [
+        'id' => 122,
+        'name' => 'returning to the place you swore you would never go again',
+      ],
+    ],
+  ],
 ];
 
 public $exportData = [

Spacing +5 added lines, -5 removed lines

@@ -725,7 +725,7 @@ 
     $this->container = new \yii\di\Container;
     $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
     $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
       return new \common\components\Time('America/Los_Angeles');
     });
 
@@ -769,21 +769,21 @@ 
   }
 
   public function testParseQuestionData() {
-    $this->specify('parseQuestionData should function correctly', function () {
+    $this->specify('parseQuestionData should function correctly', function() {
       expect('parseQuestionData should return the correct structure with expected data', $this->assertEquals($this->user->parseQuestionData($this->questionData), $this->userQuestions));
       expect('parseQuestionData should return empty with the empty set', $this->assertEmpty($this->user->parseQuestionData([])));
     });
   }
 
   public function testParseBehaviorData() {
-    $this->specify('parseBehaviorData should function correctly', function () {
+    $this->specify('parseBehaviorData should function correctly', function() {
       expect('parseBehaviorData should return the correct structure with expected data', $this->assertEquals($this->user->parseBehaviorData($this->behaviorData), $this->userBehaviors));
       expect('parseBehaviorData should return empty with the empty set', $this->assertEmpty($this->user->parseBehaviorData([])));
     });
   }
 
   public function testIsTokenCurrent() {
-    $this->specify('isTokenCurrent should function correctly', function () {
+    $this->specify('isTokenCurrent should function correctly', function() {
       $good_token = \Yii::$app
                       ->getSecurity()
                       ->generateRandomString() . '_' . time();
@@ -805,7 +805,7 @@ 
   public function testConfirmVerifyEmailToken() {
     $this->user->verify_email_token = 'hello_world';
     $this->user->confirmVerifyEmailToken();
-    expect('confirmVerifyEmailToken should append User::CONFIRMED_STRING to the end of the verify_email_token property', $this->assertEquals($this->user->verify_email_token, 'hello_world'.$this->user::CONFIRMED_STRING));
+    expect('confirmVerifyEmailToken should append User::CONFIRMED_STRING to the end of the verify_email_token property', $this->assertEquals($this->user->verify_email_token, 'hello_world' . $this->user::CONFIRMED_STRING));
   }
 
   public function testIsVerified() {

common/models/Behavior.php

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

common/models/Category.php

Spacing +7 added lines, -7 removed lines

@@ -12,13 +12,13 @@
 class Category extends \yii\base\BaseObject implements \common\interfaces\CategoryInterface {
 
   public static $categories = [
-    [ "id" => 1, "name" => "Restoration"],
-    [ "id" => 2, "name" => "Forgetting Priorities"],
-    [ "id" => 3, "name" => "Anxiety"],
-    [ "id" => 4, "name" => "Speeding Up"],
-    [ "id" => 5, "name" => "Ticked Off"],
-    [ "id" => 6, "name" => "Exhausted"],
-    [ "id" => 7, "name" => "Relapse/Moral Failure"],
+    ["id" => 1, "name" => "Restoration"],
+    ["id" => 2, "name" => "Forgetting Priorities"],
+    ["id" => 3, "name" => "Anxiety"],
+    ["id" => 4, "name" => "Speeding Up"],
+    ["id" => 5, "name" => "Ticked Off"],
+    ["id" => 6, "name" => "Exhausted"],
+    ["id" => 7, "name" => "Relapse/Moral Failure"],
   ];
 
   public static $colors = [

common/config/main.php

Spacing +3 added lines, -3 removed lines

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