CorWatts / fasterscale

site/models/CheckinForm.php

Indentation +7 added lines, -7 removed lines

@@ -58,7 +58,7 @@ 
   public function setBehaviors($behaviors) {
     foreach($behaviors as $category_id => $bhvr_set) {
       $attribute = "behaviors$category_id";
-			$this->$attribute = [];
+      $this->$attribute = [];
       foreach($bhvr_set as $behavior) {
         $this->{$attribute}[] = $behavior['id'];
       }
@@ -89,12 +89,12 @@ 
    */
   public function compileBehaviors() {
     $behaviors = array_merge((array)$this->behaviors1,
-                             (array)$this->behaviors2,
-                             (array)$this->behaviors3,
-                             (array)$this->behaviors4,
-                             (array)$this->behaviors5,
-                             (array)$this->behaviors6,
-                             (array)$this->behaviors7);
+                              (array)$this->behaviors2,
+                              (array)$this->behaviors3,
+                              (array)$this->behaviors4,
+                              (array)$this->behaviors5,
+                              (array)$this->behaviors6,
+                              (array)$this->behaviors7);
 
     $clean_behaviors = array_filter($behaviors); // strip out false values
 

Spacing +14 added lines, -14 removed lines

@@ -56,10 +56,10 @@ 
   }
 
   public function setBehaviors($behaviors) {
-    foreach($behaviors as $category_id => $bhvr_set) {
+    foreach ($behaviors as $category_id => $bhvr_set) {
       $attribute = "behaviors$category_id";
 			$this->$attribute = [];
-      foreach($bhvr_set as $behavior) {
+      foreach ($bhvr_set as $behavior) {
         $this->{$attribute}[] = $behavior['id'];
       }
     }   
@@ -67,8 +67,8 @@ 
 
   public function validateBehaviors($attribute, $params) {
     if (!$this->hasErrors()) {
-      foreach($this->$attribute as $behavior) {
-        if(!is_numeric($behavior) && !preg_match('/[0-9]{1,2}-custom/', $behavior)) {
+      foreach ($this->$attribute as $behavior) {
+        if (!is_numeric($behavior) && !preg_match('/[0-9]{1,2}-custom/', $behavior)) {
           $this->addError($attribute, 'One of your behaviors is not an integer!');
         }
       }
@@ -99,11 +99,11 @@ 
     $clean_behaviors = array_filter($behaviors); // strip out false values
 
     // if there are no selected behaviors just return false now
-    if(sizeof($clean_behaviors) === 0) return false;
+    if (sizeof($clean_behaviors) === 0) return false;
 
     $self = $this;
     array_walk($clean_behaviors, function($bhvr) use (&$self) {
-      if(preg_match('/.*-custom/', $bhvr)) {
+      if (preg_match('/.*-custom/', $bhvr)) {
         $self->custom_behaviors[] = $bhvr;
       } else {
         $self->compiled_behaviors[] = $bhvr;
@@ -132,7 +132,7 @@ 
 
     // delete cached behaviors
     array_map(function($period) use ($time) {
-      $key = "checkins_".Yii::$app->user->id."_{$period}_".$time->getLocalDate();
+      $key = "checkins_" . Yii::$app->user->id . "_{$period}_" . $time->getLocalDate();
       Yii::$app->cache->delete($key);
     }, [30, 90, 180]);
   }
@@ -146,7 +146,7 @@ 
   public function mergeWithDefault(array $user_behaviors) {
     $behaviors = AH::index(Yii::$container->get(BehaviorInterface::class)::$behaviors, 'name', "category_id");
     array_walk($behaviors, function(&$bhvrs, $cat_id) use ($user_behaviors) {
-      if(array_key_exists($cat_id, $user_behaviors)) {
+      if (array_key_exists($cat_id, $user_behaviors)) {
         $bhvrs = AH::merge($bhvrs, $user_behaviors[$cat_id]);
       }
     });
@@ -169,10 +169,10 @@ 
   }
 
   public function save() {
-    if(empty($this->compiled_behaviors) && empty($this->custom_behaviors)) {
+    if (empty($this->compiled_behaviors) && empty($this->custom_behaviors)) {
       // maybe we haven't compiled the behaviors yet
       $exit = !!!$this->compileBehaviors();
-      if($exit) return false;
+      if ($exit) return false;
     }
 
     $custom_bhvrs = \common\models\CustomBehavior::find()
@@ -187,7 +187,7 @@ 
 
     $rows = [];
     // this can be condensed....but we are optimizing for readability
-    foreach($this->compiled_behaviors as $behavior_id) {
+    foreach ($this->compiled_behaviors as $behavior_id) {
       $behavior_id = (int)$behavior_id;
       $behavior = \common\models\Behavior::getBehavior('id', $behavior_id);
       $category_id = $behavior['category_id'];
@@ -202,7 +202,7 @@ 
       $rows[] = $temp;
     }
 
-    foreach($custom_bhvrs as $cb) {
+    foreach ($custom_bhvrs as $cb) {
       $temp = [
         Yii::$app->user->id,
         null,
@@ -225,10 +225,10 @@ 
       )->execute();
 
     // if the user has publicised their check-in graph, create the image
-    if(Yii::$app->user->identity->expose_graph) {
+    if (Yii::$app->user->identity->expose_graph) {
       $checkins_last_month = $user_behavior->getCheckInBreakdown();
 
-      if($checkins_last_month) {
+      if ($checkins_last_month) {
         Yii::$container
           ->get(\common\components\Graph::class, [Yii::$app->user->identity])
           ->create($checkins_last_month, true);

Braces +6 added lines, -2 removed lines

@@ -99,7 +99,9 @@ 
     $clean_behaviors = array_filter($behaviors); // strip out false values
 
     // if there are no selected behaviors just return false now
-    if(sizeof($clean_behaviors) === 0) return false;
+    if(sizeof($clean_behaviors) === 0) {
+      return false;
+    }
 
     $self = $this;
     array_walk($clean_behaviors, function($bhvr) use (&$self) {
@@ -172,7 +174,9 @@ 
     if(empty($this->compiled_behaviors) && empty($this->custom_behaviors)) {
       // maybe we haven't compiled the behaviors yet
       $exit = !!!$this->compileBehaviors();
-      if($exit) return false;
+      if($exit) {
+        return false;
+      }
     }
 
     $custom_bhvrs = \common\models\CustomBehavior::find()

site/tests/unit/models/CheckinFormTest.php

Indentation +12 added lines, -12 removed lines

@@ -95,8 +95,8 @@ 
       parent::setUp();
     }
 
-		public function testAttributeLabels()
-		{
+    public function testAttributeLabels()
+    {
         $this->specify('attributeLabels should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
           expect('attributeLabels should be correct', $this->assertEquals([
@@ -116,7 +116,7 @@ 
         $this->specify('setBehaviors should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
 
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('behaviors1 should be correct', $this->assertEquals([ 0 => 7 ], $model->behaviors1));
           expect('behaviors2 should be correct', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2));
           expect('behaviors3 should be correct', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3));
@@ -125,7 +125,7 @@ 
           expect('behaviors6 should be correct', $this->assertEquals([ 0 => 104 ], $model->behaviors6));
           expect('behaviors7 should be correct', $this->assertEquals([ 0 => 128 ], $model->behaviors7));
 
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 7 ], $model->behaviors1));
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2));
           expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3));
@@ -136,19 +136,19 @@ 
         });
     }
 
-		public function testValidateBehaviors()
-		{
+    public function testValidateBehaviors()
+    {
         $this->specify('validateBehaviors should function properly', function () {
           $model = $this->container->get('\site\models\CheckinForm');
-					$model->setBehaviors($this->behaviors);
+          $model->setBehaviors($this->behaviors);
           expect('validation should be good', $this->assertTrue($model->validate()));
 
           $model->behaviors1[0] = 'bad';
           expect('validation should be bad', $this->assertFalse($model->validate()));
         });
-		}
+    }
 
-		public function testCompileBehaviors()
+    public function testCompileBehaviors()
     {
       $model = $this->container->get('\site\models\CheckinForm');
       $model->setBehaviors($this->behaviors);
@@ -164,8 +164,8 @@ 
       $model->behaviors3[0] = null;
       $model->compileBehaviors();
           expect('compiling behaviors should strip out any falsy values', $this->assertEquals([
-											  	13, 17, 18, 38, 46, 47, 56, 62, 78, 79, 104, 128,
-											  ], $model->compiled_behaviors));
+                          13, 17, 18, 38, 46, 47, 56, 62, 78, 79, 104, 128,
+                        ], $model->compiled_behaviors));
 
       $model = $this->container->get('\site\models\CheckinForm');
       $model->setBehaviors([]);
@@ -189,6 +189,6 @@ 
       $expected_behaviors = $base_behaviors;
       $expected_behaviors[7] += $other_behaviors;
 
-       expect('mergeWithDefault should return the given behaviors merged in with the base behaviors', $this->assertEquals($base_behaviors, $model->mergeWithDefault($other_behaviors)));
+        expect('mergeWithDefault should return the given behaviors merged in with the base behaviors', $this->assertEquals($base_behaviors, $model->mergeWithDefault($other_behaviors)));
     }
 }

Spacing +19 added lines, -19 removed lines

@@ -117,7 +117,7 @@ 
     protected function setUp() {
       $this->container = new \yii\di\Container;
       $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
       return new \common\components\Time('America/Los_Angeles');
     });
       parent::setUp();
@@ -125,7 +125,7 @@ 
 
 		public function testAttributeLabels()
 		{
-        $this->specify('attributeLabels should function properly', function () {
+        $this->specify('attributeLabels should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
           expect('attributeLabels should be correct', $this->assertEquals([
             'behaviors1' => 'Restoration',
@@ -141,32 +141,32 @@ 
 
     public function testSetBehaviors()
     {
-        $this->specify('setBehaviors should function properly', function () {
+        $this->specify('setBehaviors should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
 
 					$model->setBehaviors($this->behaviors);
-          expect('behaviors1 should be correct', $this->assertEquals([ 0 => 7 ], $model->behaviors1));
-          expect('behaviors2 should be correct', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2));
-          expect('behaviors3 should be correct', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3));
-          expect('behaviors4 should be correct', $this->assertEquals([ 0 => 47, 1 => 56, 2 => 62 ], $model->behaviors4));
-          expect('behaviors5 should be correct', $this->assertEquals([ 0 => 78, 1 => 79 ], $model->behaviors5));
-          expect('behaviors6 should be correct', $this->assertEquals([ 0 => 104 ], $model->behaviors6));
-          expect('behaviors7 should be correct', $this->assertEquals([ 0 => 128 ], $model->behaviors7));
+          expect('behaviors1 should be correct', $this->assertEquals([0 => 7], $model->behaviors1));
+          expect('behaviors2 should be correct', $this->assertEquals([0 => 12, 1 => 13, 2 => 17, 3 => 18], $model->behaviors2));
+          expect('behaviors3 should be correct', $this->assertEquals([0 => 28, 1 => 38, 2 => 46], $model->behaviors3));
+          expect('behaviors4 should be correct', $this->assertEquals([0 => 47, 1 => 56, 2 => 62], $model->behaviors4));
+          expect('behaviors5 should be correct', $this->assertEquals([0 => 78, 1 => 79], $model->behaviors5));
+          expect('behaviors6 should be correct', $this->assertEquals([0 => 104], $model->behaviors6));
+          expect('behaviors7 should be correct', $this->assertEquals([0 => 128], $model->behaviors7));
 
 					$model->setBehaviors($this->behaviors);
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 7 ], $model->behaviors1));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 47, 1 => 56, 2 => 62 ], $model->behaviors4));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 78, 1 => 79 ], $model->behaviors5));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 104 ], $model->behaviors6));
-          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 128 ], $model->behaviors7));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 7], $model->behaviors1));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 12, 1 => 13, 2 => 17, 3 => 18], $model->behaviors2));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 28, 1 => 38, 2 => 46], $model->behaviors3));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 47, 1 => 56, 2 => 62], $model->behaviors4));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 78, 1 => 79], $model->behaviors5));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 104], $model->behaviors6));
+          expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 128], $model->behaviors7));
         });
     }
 
 		public function testValidateBehaviors()
 		{
-        $this->specify('validateBehaviors should function properly', function () {
+        $this->specify('validateBehaviors should function properly', function() {
           $model = $this->container->get('\site\models\CheckinForm');
 					$model->setBehaviors($this->behaviors);
           expect('validation should be good', $this->assertTrue($model->validate()));
@@ -213,7 +213,7 @@ 
 
       $model = $this->container->get('\site\models\CheckinForm');
       $model->custom_behaviors = [];
-      $model->compiled_behaviors = [ 1, 2, 3];
+      $model->compiled_behaviors = [1, 2, 3];
       expect('to return an empty array if no custom behaviors are set', $this->assertEquals([], $model->getCustomBehaviors()));
     }
 

site/views/checkin/index.php

Spacing +3 added lines, -4 removed lines

@@ -10,8 +10,7 @@ 
 $this->title = "The Faster Scale App | Check-in";
 
 function checkboxItemTemplate($index, $label, $name, $checked, $value) {
-  return Html::checkbox
-    (
+  return Html::checkbox(
       $name,
       $checked,
       [
@@ -35,10 +34,10 @@ 
   'options' => ['class' => 'form-horizontal'],
 ]);
 
-foreach($categories as $category) {
+foreach ($categories as $category) {
   $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name');
   $custom = [];
-  if(array_key_exists($category['id'], $customList)) {
+  if (array_key_exists($category['id'], $customList)) {
     $custom = AH::map($customList[$category['id']], function($cbhvr) {
       return $cbhvr['id'] . '-custom';
     }, 'name');

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
   print $form
           ->field($model, "behaviors{$category['id']}")
           ->checkboxList($behaviors + $custom,
-                         ['data-toggle' => 'buttons', 'item' => "checkboxItemTemplate"]);
+                          ['data-toggle' => 'buttons', 'item' => "checkboxItemTemplate"]);
 }
 print Html::submitButton('Submit', ['class' => 'btn btn-success']); 
 ActiveForm::end();

common/models/Question.php

Spacing +3 added lines, -3 removed lines

@@ -98,7 +98,7 @@ 
 
   public function getByUser(int $user_id, $local_date = null) {
     $time = Yii::$container->get(\common\interfaces\TimeInterface::class);
-    if(is_null($local_date)) $local_date = $time->getLocalDate();
+    if (is_null($local_date)) $local_date = $time->getLocalDate();
     list($start, $end) = $time->getUTCBookends($local_date);
 
     $questions = $this->find()
@@ -117,10 +117,10 @@ 
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if (!$questions) return [];
 
     $question_answers = [];
-    foreach($questions as $question) {
+    foreach ($questions as $question) {
       $user_behavior_id = $question->user_behavior_id;
 
       $behavior_name = $question->behavior_id

Braces +6 added lines, -2 removed lines

@@ -98,7 +98,9 @@ 
 
   public function getByUser(int $user_id, $local_date = null) {
     $time = Yii::$container->get(\common\interfaces\TimeInterface::class);
-    if(is_null($local_date)) $local_date = $time->getLocalDate();
+    if(is_null($local_date)) {
+      $local_date = $time->getLocalDate();
+    }
     list($start, $end) = $time->getUTCBookends($local_date);
 
     $questions = $this->find()
@@ -117,7 +119,9 @@ 
   }
 
   public function parseQuestionData($questions) {
-    if(!$questions) return [];
+    if(!$questions) {
+      return [];
+    }
 
     $question_answers = [];
     foreach($questions as $question) {

common/mail/checkinReport.php

Spacing +6 added lines, -6 removed lines

@@ -125,14 +125,14 @@ 
                                                 <th style="Margin:0;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left">
 
 <?php
-if($questions) {
-  foreach($questions as $behavior_id => $behavior_questions) {
+if ($questions) {
+  foreach ($questions as $behavior_id => $behavior_questions) {
 ?>
 
                                                    <h4 style="Margin:0;Margin-bottom:10px;color:#37b98f;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:24px;font-weight:400;line-height:1.3;margin:0;margin-bottom:5px;padding:0 8px;text-align:left;word-wrap:normal"> <?= Html::encode($behavior_questions['question']['behavior_name']) ?> </h4>
 
 <?php
-    foreach($behavior_questions['answers'] as $key => $question) {  ?>
+    foreach ($behavior_questions['answers'] as $key => $question) {  ?>
       <p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0 8px 4px 8px;text-align:left"><strong><?= Html::encode($question['title']) ?></strong> <?= Html::encode($question['answer']) ?></p>
 <?php
     }
@@ -189,12 +189,12 @@ 
                                                 <th style="Margin:0;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left">
 
 <?php
-if($user_behaviors) {
-  foreach($user_behaviors as $cat_key => $behaviors) { ?>
+if ($user_behaviors) {
+  foreach ($user_behaviors as $cat_key => $behaviors) { ?>
         <p style="Margin:0;Margin-bottom:10px;color:#0a0a0a;font-family:Arial,Verdana,Helvetica,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0 8px 4px 8px;text-align:left">
           <strong style="color:#37b98f"><?= Html::encode($categories[$cat_key]) ?></strong>
 <?php
-    foreach($behaviors as $behavior) { ?>
+    foreach ($behaviors as $behavior) { ?>
         <br><?= Html::encode($behavior['name']) ?>
 <?php
     }

common/tests/unit/models/UserTest.php

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,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');
     });
 
@@ -134,7 +134,7 @@ 
   }
 
   public function testIsTokenCurrent() {
-    $this->specify('isTokenCurrent should function correctly', function () {
+    $this->specify('isTokenCurrent should function correctly', function() {
       $good_token = \Yii::$app
                       ->getSecurity()
                       ->generateRandomString() . '_' . time();
@@ -168,7 +168,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() {
@@ -262,7 +262,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(User::class)

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,
           ],
         ],
@@ -58,7 +58,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!');
       }
     }
@@ -78,7 +78,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!');
@@ -92,7 +92,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!');
@@ -116,14 +116,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 {
@@ -143,7 +143,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');
@@ -159,7 +159,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->cleanExportRow($row[0]);
       fputcsv($fp, $row);

common/tests/unit/models/QuestionTest.php

Indentation +4 added lines, -4 removed lines

@@ -157,15 +157,15 @@
 
   public function setUp() {
     $this->question = $this->getMockBuilder('\common\models\Question')
-         ->setMethods(['save', 'attributes'])
-         ->getMock();
+          ->setMethods(['save', 'attributes'])
+          ->getMock();
   }
 
   public function testParseQuestionData() {
     $questions = array_map(function ($d) {
       $q = $this->getMockBuilder('\common\models\Question')
-         ->setMethods(['save', 'attributes'])
-         ->getMock();
+          ->setMethods(['save', 'attributes'])
+          ->getMock();
       $q->method('save')->willReturn(true);
       $q->method('attributes')
         ->willReturn([

Spacing +3 added lines, -3 removed lines

@@ -162,7 +162,7 @@ 
   }
 
   public function testParseQuestionData() {
-    $questions = array_map(function ($d) {
+    $questions = array_map(function($d) {
       $q = $this->getMockBuilder('\common\models\Question')
          ->setMethods(['save', 'attributes'])
          ->getMock();
@@ -179,8 +179,8 @@ 
           'date',
           'userBehavior',
         ]);
-      foreach($d as $k => $v) {
-        if($k === 'behavior_id' && $v === null) {
+      foreach ($d as $k => $v) {
+        if ($k === 'behavior_id' && $v === null) {
           $ub = new \StdClass();
           $ub->custom_behavior = 'some_custom_behavior';
           $q->userBehavior = $ub;

common/models/User.php

Indentation +20 added lines, -20 removed lines

@@ -523,26 +523,26 @@
   }
 
   public function cleanExportRow($row) {
-   // 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'];
-   if(array_key_exists('behavior', $row)) {
-     $row['behavior'] = $row['behavior']['name'];
-   } else {
-     $row['behavior'] = $row['custom_behavior'];
-   }
-   unset($row['id']);
-   unset($row['behavior_id']);
-   unset($row['category_id']);
-   unset($row['custom_behavior']);
-
-   // sort the array into a sensible order
-   uksort($row, function($a, $b) {
-     return $this->export_order[$a] <=> $this->export_order[$b];
-   });
-   return $row;
+    // 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'];
+    if(array_key_exists('behavior', $row)) {
+      $row['behavior'] = $row['behavior']['name'];
+    } else {
+      $row['behavior'] = $row['custom_behavior'];
+    }
+    unset($row['id']);
+    unset($row['behavior_id']);
+    unset($row['category_id']);
+    unset($row['custom_behavior']);
+
+    // sort the array into a sensible order
+    uksort($row, function($a, $b) {
+      return $this->export_order[$a] <=> $this->export_order[$b];
+    });
+    return $row;
   }
 
   /*

Spacing +25 added lines, -25 removed lines

@@ -152,7 +152,7 @@ 
    */
   public function findByPasswordResetToken($token)
   {
-    if(!$this->isTokenCurrent($token)) {
+    if (!$this->isTokenCurrent($token)) {
       return null;
     }
 
@@ -170,15 +170,15 @@ 
    */
   public function findByVerifyEmailToken($token)
   {
-    if($this->isTokenConfirmed($token)) return null;
+    if ($this->isTokenConfirmed($token)) return null;
 
     $user = $this->find()->where([
       'verify_email_token' => [$token, $token . self::CONFIRMED_STRING],
       'status' => self::STATUS_ACTIVE,
     ])->one();
 
-    if($user) {
-      if(!$this->isTokenConfirmed($token) &&
+    if ($user) {
+      if (!$this->isTokenConfirmed($token) &&
          !$this->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
         return null;
       }
@@ -200,8 +200,8 @@ 
       'status' => self::STATUS_ACTIVE,
     ])->one();
 
-    if($user) {
-      if(!$user->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
+    if ($user) {
+      if (!$user->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
         return null;
       }
     }
@@ -219,7 +219,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;
@@ -234,7 +234,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;
   }
 
@@ -261,7 +261,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;
@@ -380,7 +380,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);
@@ -389,14 +389,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
-    $highest_cat_idx  = key($this_checkin);          // gets the key of the highest category
+    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;
 
     $user_behaviors = $user_behavior->getByDate(Yii::$app->user->id, $date);
 
@@ -408,8 +408,8 @@ 
       ->create($checkins_last_month);
 
     $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,
@@ -421,7 +421,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);
       }
     }
@@ -498,7 +498,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();
   }
 
@@ -506,20 +506,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);
       }
     }
@@ -533,7 +533,7 @@ 
 
    // clean up things we don't need
    $row['category'] = $row['category']['name'];
-   if(array_key_exists('behavior', $row)) {
+   if (array_key_exists('behavior', $row)) {
      $row['behavior'] = $row['behavior']['name'];
    } else {
      $row['behavior'] = $row['custom_behavior'];
@@ -569,7 +569,7 @@ 
     return rtrim(
       strtr(
         base64_encode(
-          hash('sha256', $this->id."::".$this->created_at, true)
+          hash('sha256', $this->id . "::" . $this->created_at, true)
         ),
       '+/', '-_'),
     '=');

Braces +21 added lines, -6 removed lines

@@ -170,7 +170,9 @@ 
    */
   public function findByVerifyEmailToken($token)
   {
-    if($this->isTokenConfirmed($token)) return null;
+    if($this->isTokenConfirmed($token)) {
+      return null;
+    }
 
     $user = $this->find()->where([
       'verify_email_token' => [$token, $token . self::CONFIRMED_STRING],
@@ -234,7 +236,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;
   }
 
@@ -380,7 +384,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);
@@ -389,14 +396,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;
+    }
 
     $user_behaviors = $user_behavior->getByDate(Yii::$app->user->id, $date);