CorWatts / fasterscale

common/models/CustomBehavior.php

Spacing +3 added lines, -3 removed lines

@@ -106,9 +106,9 @@
       ], [
         'class' => 'kartik\grid\ActionColumn',
         'buttons' => [
-          'view' => function ($url, $model) { return ''; },
-          'update' => function ($url, $model) { return ''; },
-          'delete' => function ($url, $model) {
+          'view' => function($url, $model) { return ''; },
+          'update' => function($url, $model) { return ''; },
+          'delete' => function($url, $model) {
             return yii\helpers\Html::a('<span class="glyphicon glyphicon-remove"></span>', "/custom-behavior/delete?id={$model->id}", [
               'title' => 'Delete',
               'data-pjax' => true,

common/config/main.php

Spacing +3 added lines, -3 removed lines

@@ -11,8 +11,8 @@ 
       'common\interfaces\BehaviorInterface' => \common\models\Behavior::class,
       'common\interfaces\CategoryInterface' => \common\models\Category::class,
       'common\interfaces\CustomBehaviorInterface' => \common\models\CustomBehavior::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);
@@ -30,7 +30,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' => [

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/controllers/CustomBehaviorController.php

Spacing +9 added lines, -9 removed lines

@@ -42,16 +42,16 @@ 
 
   public function actions() {
     return array_replace_recursive(parent::actions(), [
-      'update' => [                                   // identifier for your editable column action
+      'update' => [// identifier for your editable column action
         'class' => EditableColumnAction::className(), // action class name
-        'modelClass' => CustoMBehavior::className(),            // the model for the record being edited
-        'scenario' => CustomBehavior::SCENARIO_DEFAULT,        // model scenario assigned before validation & update
-        'showModelErrors' => true,                    // show model validation errors after save
-        'errorOptions' => ['header' => ''],            // error summary HTML options
+        'modelClass' => CustoMBehavior::className(), // the model for the record being edited
+        'scenario' => CustomBehavior::SCENARIO_DEFAULT, // model scenario assigned before validation & update
+        'showModelErrors' => true, // show model validation errors after save
+        'errorOptions' => ['header' => ''], // error summary HTML options
         'postOnly' => true,
         'ajaxOnly' => true,
         'findModel' => function($id, $action) {
-          if(($model = CustomBehavior::findOne(['id' => $id, 'user_id' => Yii::$app->user->identity->id])) !== null) {
+          if (($model = CustomBehavior::findOne(['id' => $id, 'user_id' => Yii::$app->user->identity->id])) !== null) {
             return $model;
           }
           throw new NotFoundHttpException('The specified behavior does not exist.');
@@ -64,13 +64,13 @@ 
   public function actionCreate() {
     $form = Yii::$container->get(\site\models\CustomBehaviorForm::class, [Yii::$app->user->identity]);
 
-    if($form->load(Yii::$app->request->post()) && $form->validate()) {
+    if ($form->load(Yii::$app->request->post()) && $form->validate()) {
       $form->save();
       return $this->redirect(['profile/index']);
     }
 
     \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
-    if($errors = $form->getErrorSummary(true)) {
+    if ($errors = $form->getErrorSummary(true)) {
       return $errors;
     } else {
       return ["success" => false, "message" => "Unknown Error"];
@@ -84,7 +84,7 @@ 
   }
 
   protected function findModel($id) {
-    if(($model = CustomBehavior::findOne(['id' => $id, 'user_id' => Yii::$app->user->identity->id])) !== null) {
+    if (($model = CustomBehavior::findOne(['id' => $id, 'user_id' => Yii::$app->user->identity->id])) !== null) {
       return $model;
     }
 

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

site/views/profile/index.php

Indentation +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
             <p>If you're really <em>really</em> sure about this, enter your password below and click the Delete button. You will be logged out, your account and all your stored data will be immediately deleted, and a notification email will be sent to you and your partners.</p>
         <?php $form = ActiveForm::begin([
           'id' => 'form-delete-account',
-         'action' => ['profile/delete-account'],
+          'action' => ['profile/delete-account'],
           'method' => 'post',
           'enableClientValidation' => true,
           'options' => ['validateOnSubmit' => true]

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/models/User.php

Braces +21 added lines, -6 removed lines

@@ -158,7 +158,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],
@@ -222,7 +224,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;
   }
 
@@ -366,7 +370,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);
@@ -375,14 +382,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);
 

Spacing +25 added lines, -25 removed lines

@@ -149,7 +149,7 @@ 
    */
   public function findByPasswordResetToken($token)
   {
-    if(!$this->isTokenCurrent($token)) {
+    if (!$this->isTokenCurrent($token)) {
       return null;
     }
 
@@ -167,15 +167,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;
       }
@@ -197,8 +197,8 @@ 
       'status' => self::STATUS_ACTIVE,
     ]);
 
-    if($user) {
-      if(!$user->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
+    if ($user) {
+      if (!$user->isTokenCurrent($token, 'user.verifyAccountTokenExpire')) {
         return null;
       }
     }
@@ -216,7 +216,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;
@@ -231,7 +231,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;
   }
 
@@ -256,7 +256,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;
@@ -375,7 +375,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);
@@ -384,14 +384,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);
 
@@ -403,8 +403,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,
@@ -416,7 +416,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);
       }
     }
@@ -493,7 +493,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();
   }
 
@@ -501,20 +501,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);
       }
     }
@@ -528,7 +528,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'];
@@ -564,7 +564,7 @@ 
     return rtrim(
       strtr(
         base64_encode(
-          hash('sha256', $this->id."::".$this->created_at, true)
+          hash('sha256', $this->id . "::" . $this->created_at, true)
         ),
       '+/', '-_'),
     '=');

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;
   }
 
   /*