CorWatts / fasterscale

site/controllers/CheckinController.php

Spacing +10 added lines, -10 removed lines

@@ -39,7 +39,7 @@ 
     if ($form->load(Yii::$app->request->post()) && $form->validate()) {
       $form->compiled_behaviors = $form->compileBehaviors();
 
-      if(sizeof($form->compiled_behaviors) === 0) {
+      if (sizeof($form->compiled_behaviors) === 0) {
         return $this->redirect(['view']);
       }
 
@@ -49,7 +49,7 @@ 
 
       return $this->redirect(['questions']);
     } else {
-      $behaviors  = Yii::$container->get(BehaviorInterface::class)::$behaviors;
+      $behaviors = Yii::$container->get(BehaviorInterface::class)::$behaviors;
       return $this->render('index', [
         'categories'    => Yii::$container->get(CategoryInterface::class)::$categories,
         'model'         => $form,
@@ -63,7 +63,7 @@ 
     $date = Yii::$container->get(TimeInterface::class)->getLocalDate();
 
     $user_behaviors = $user_behavior->getUserBehaviorsWithCategory($date);
-    if(count($user_behaviors) === 0) {
+    if (count($user_behaviors) === 0) {
       return $this->redirect(['view']);
     }
 
@@ -73,10 +73,10 @@ 
       $form->deleteToday();
 
       $behaviors = $user_behavior->findAll($form->getUserBehaviorIds());
-      if($result = $form->saveAnswers($behaviors)) {
+      if ($result = $form->saveAnswers($behaviors)) {
 
-        if(Yii::$app->user->identity->send_email) {
-          if(Yii::$app->user->identity->sendEmailReport($date)) {
+        if (Yii::$app->user->identity->send_email) {
+          if (Yii::$app->user->identity->sendEmailReport($date)) {
             Yii::$app->session->setFlash('success', 'Your check-in is complete. A notification has been sent to your report partners.');
           } else {
             Yii::$app->session->setFlash('success', 'Your check-in is complete.');
@@ -131,7 +131,7 @@ 
     $raw_pie_data  = $user_behavior::decorate($user_behavior->getBehaviorsWithCounts());
     $answer_pie    = $user_behavior->getBehaviorsByCategory($raw_pie_data);
 
-    $pie_data   = [
+    $pie_data = [
       "labels"   => array_column($answer_pie, "name"),
       "datasets" => [[
           "data"                 => array_map('intval', array_column($answer_pie, "count")),
@@ -166,14 +166,14 @@ 
     $checkins = $user_behavior->getCheckInBreakdown($period);
 
     $accum = [];
-    foreach($checkins as $date => $cats) {
-      for($i = 1; $i <= 7; $i ++) {
+    foreach ($checkins as $date => $cats) {
+      for ($i = 1; $i <= 7; $i++) {
         $accum[$i][] = array_key_exists($i, $cats) ? $cats[$i]['count'] : [];
       }
     }
 
     $bar_datasets = [];
-    foreach($accum as $idx => $data) {
+    foreach ($accum as $idx => $data) {
       $bar_datasets[] = [
         'label' => ($category::getCategories())[$idx],
         'backgroundColor' => $category::$colors[$idx]['color'],

site/controllers/ProfileController.php

Spacing +9 added lines, -9 removed lines

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

common/tests/unit/models/UserTest.php

Indentation +379 added lines, -379 removed lines

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

Spacing +5 added lines, -5 removed lines

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

common/tests/unit/models/UserBehaviorTest.php

Indentation +1 added lines, -1 removed lines

@@ -449,6 +449,6 @@
     $bhvrs = require(__DIR__.'/../data/behaviorsWithCounts.php');
     $expected = require(__DIR__.'/../data/expected_getCheckinBreakdown.php');
     $this->user_behavior->method('getBehaviorsWithCounts')->willReturn(...$bhvrs);
-		expect('asdf', $this->assertEquals($expected, $this->user_behavior->getCheckinBreakdown()));
+    expect('asdf', $this->assertEquals($expected, $this->user_behavior->getCheckinBreakdown()));
   }
 }

Spacing +4 added lines, -4 removed lines

@@ -287,7 +287,7 @@ 
 
   public function setUp() {
     // pull in test data
-    $data = require(__DIR__.'/../data/checkinData.php');
+    $data = require(__DIR__ . '/../data/checkinData.php');
     $this->singleBhvr = $data['singleBhvr'];
     $this->manyBhvrs = $data['manyBhvrs'];
     $this->allBhvrs = $data['allBhvrs'];
@@ -297,7 +297,7 @@ 
     $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
     $this->container->set('common\interfaces\QuestionInterface', '\site\tests\_support\MockQuestion');
     $this->container->set('common\interfaces\BehaviorInterface', 'common\models\Behavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
         return new \common\components\Time('America/Los_Angeles');
       });
 
@@ -446,8 +446,8 @@ 
                             ->setMethods(['getIsNewRecord', 'save', 'getBehaviorsWithCounts'])
                             ->getMock();
 
-    $bhvrs = require(__DIR__.'/../data/behaviorsWithCounts.php');
-    $expected = require(__DIR__.'/../data/expected_getCheckinBreakdown.php');
+    $bhvrs = require(__DIR__ . '/../data/behaviorsWithCounts.php');
+    $expected = require(__DIR__ . '/../data/expected_getCheckinBreakdown.php');
     $this->user_behavior->method('getBehaviorsWithCounts')->willReturn(...$bhvrs);
 		expect('asdf', $this->assertEquals($expected, $this->user_behavior->getCheckinBreakdown()));
   }

common/models/User.php

Indentation +20 added lines, -20 removed lines

@@ -560,29 +560,29 @@
 
 
   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['category']['name'];
-       $row['behavior'] = $row['behavior']['name'];
-       unset($row['id']);
-       unset($row['behavior_id']);
-       unset($row['category_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['category']['name'];
+        $row['behavior'] = $row['behavior']['name'];
+        unset($row['id']);
+        unset($row['behavior_id']);
+        unset($row['category_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 +26 added lines, -26 removed lines

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

Braces +27 added lines, -8 removed lines

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

common/models/UserBehavior.php

Spacing +12 added lines, -12 removed lines

@@ -86,7 +86,7 @@ 
       ->groupBy('date, user_id')
       ->having('user_id = :user_id');
     $temp_dates = $query->all();
-    foreach($temp_dates as $temp_date) {
+    foreach ($temp_dates as $temp_date) {
       $past_checkin_dates[] = $this->time->convertUTCToLocal($temp_date['date']);
     }
 
@@ -115,12 +115,12 @@ 
 
   public function getCheckinBreakdown(int $period = 30) {
     $datetimes = $this->time->getDateTimesInPeriod($period);
-    $key = "checkins_".Yii::$app->user->id."_{$period}_".$this->time->getLocalDate();
+    $key = "checkins_" . Yii::$app->user->id . "_{$period}_" . $this->time->getLocalDate();
     $checkins = Yii::$app->cache->get($key);
 
-    if($checkins === false) {
+    if ($checkins === false) {
       $checkins = [];
-      foreach($datetimes as $datetime) {
+      foreach ($datetimes as $datetime) {
         $behaviors = self::decorate($this->getBehaviorsWithCounts($datetime));
         $checkins[$datetime->format('Y-m-d')] = $this->getBehaviorsByCategory($behaviors);
       }
@@ -146,7 +146,7 @@ 
   public function getBehaviorsByCategory(array $decorated_behaviors) {
     $arr = array_reduce($decorated_behaviors, function($acc, $row) {
       $cat_id = $row['category_id'];
-      if(array_key_exists($cat_id, $acc)) {
+      if (array_key_exists($cat_id, $acc)) {
         $acc[$cat_id]['count'] += $row['count'];
       } else {
         $acc[$cat_id] = [
@@ -178,11 +178,11 @@ 
       ->having('user_id = :user_id')
       ->orderBy('count DESC');
 
-    if($limit instanceof \DateTime) {
+    if ($limit instanceof \DateTime) {
       list($start, $end) = $this->time->getUTCBookends($limit->format('Y-m-d'));
       $query->params += [':start_date' => $start, ':end_date' => $end];
       $query->where('user_id=:user_id AND date > :start_date AND date <= :end_date');
-    } else if(is_int($limit)) {
+    } else if (is_int($limit)) {
       $query->limit($limit);
     }
     return $query->all();
@@ -197,7 +197,7 @@ 
    * @return array
    */
   public function getByDate(int $user_id, $local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if (is_null($local_date)) $local_date = $this->time->getLocalDate();
 
     $behaviors = $this->getBehaviorData($user_id, $local_date);
     $behaviors = self::decorate($behaviors);
@@ -210,12 +210,12 @@ 
    * @return an array of decorated UserBehaviors, each with an added Category and Behavior
    */
   public static function decorate(array $uo) {
-    foreach($uo as &$o) {
+    foreach ($uo as &$o) {
       $behavior = \common\models\Behavior::getBehavior('id', $o['behavior_id']);
       $category = \common\models\Category::getCategory('id', $o['category_id']);
       // if this behavior does not have a valid behavior or category, something
       // is weird and we don't want to do this halfway.
-      if($behavior && $category) {
+      if ($behavior && $category) {
         $o['behavior'] = $behavior;
         $o['category'] = $category;
       }
@@ -242,10 +242,10 @@ 
 
   // this should probably be a private method...but unit testing is hard
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if (!$behaviors) return [];
 
     $bhvrs_by_cat = [];
-    foreach($behaviors as $behavior) {
+    foreach ($behaviors as $behavior) {
       $indx = $behavior['category_id'];
 
       $bhvrs_by_cat[$indx][$behavior['behavior']['name']] = [

Braces +6 added lines, -2 removed lines

@@ -197,7 +197,9 @@ 
    * @return array
    */
   public function getByDate(int $user_id, $local_date = null) {
-    if(is_null($local_date)) $local_date = $this->time->getLocalDate();
+    if(is_null($local_date)) {
+      $local_date = $this->time->getLocalDate();
+    }
 
     $behaviors = $this->getBehaviorData($user_id, $local_date);
     $behaviors = self::decorate($behaviors);
@@ -242,7 +244,9 @@ 
 
   // this should probably be a private method...but unit testing is hard
   public function parseBehaviorData($behaviors) {
-    if(!$behaviors) return [];
+    if(!$behaviors) {
+      return [];
+    }
 
     $bhvrs_by_cat = [];
     foreach($behaviors as $behavior) {

console/migrations/m190829_141748_alter_user_behavior_link_add_category_id.php

Spacing +6 added lines, -6 removed lines

@@ -22,20 +22,20 @@
 
       // then populate the columns
       $query = (new Query())->from('user_behavior_link');
-      foreach($query->batch() as $rows) {
-        foreach($rows as $row) {
+      foreach ($query->batch() as $rows) {
+        foreach ($rows as $row) {
           $bhvr = Behavior::getBehavior('id', $row['behavior_id']);
-          if($bhvr) {
+          if ($bhvr) {
             $this->update('{{%user_behavior_link}}', ['category_id' => $bhvr['category_id']], ['id' => $row['id']]);
           }
         }
       }
 
       $query = (new Query())->from('question');
-      foreach($query->batch() as $rows) {
-        foreach($rows as $row) {
+      foreach ($query->batch() as $rows) {
+        foreach ($rows as $row) {
           $bhvr = Behavior::getBehavior('id', $row['behavior_id']);
-          if($bhvr) {
+          if ($bhvr) {
             $this->update('{{%question}}', ['category_id' => $bhvr['category_id']], ['id' => $row['id']]);
           }
         }