CorWatts / fasterscale

site/tests/unit/models/SignupFormTest.php

Spacing +8 added lines, -8 removed lines

@@ -32,13 +32,13 @@ 
     $this->container = new \yii\di\Container;
     $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
     $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
       return new \common\components\Time('America/Los_Angeles');
     });
 
     // instantiate mock objects
     $user_behavior = $this->container->get(\common\interfaces\UserBehaviorInterface::class);
-    $time        = $this->container->get(\common\interfaces\TimeInterface::class);
+    $time = $this->container->get(\common\interfaces\TimeInterface::class);
 
     $question = $this->getMockBuilder(\common\models\Question::class)
       ->setMethods(['save', 'attributes'])
@@ -107,7 +107,7 @@ 
 
     // set up a side effect to occur when the user's save() function is called
     $saved = false;
-    $this->user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) {
+    $this->user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) {
       $saved = true;
       return $this->user;
     }));
@@ -133,7 +133,7 @@ 
  
   public function testSignupExistingConfirmedUser() {
     $saved = false;
-    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) {
+    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) {
       $saved = true;
       return $this->existing_user;
     }));
@@ -152,7 +152,7 @@ 
 
   public function testSignupExistingUnconfirmedUser() {
     $saved = false;
-    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation=true, $attributeNames=null) use(&$saved) {
+    $this->existing_user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use(&$saved) {
       $saved = true;
       return $this->existing_user;
     }));
@@ -183,14 +183,14 @@ 
 
     $result = $form->setFields($this->user);
     $this->specify('populate should set the values of the user model from the form', function() use ($result) {
-      foreach($this->whitelist as $attr) {
+      foreach ($this->whitelist as $attr) {
         $this->assertEquals($this->vals[$attr], $result->$attr);
       }
     });
   }
 
   private function setAttrs($form, Array $vals) {
-    foreach($vals as $key => $val) {
+    foreach ($vals as $key => $val) {
       $form->$key = $val;
     }
     return $form;
@@ -211,7 +211,7 @@ 
   }
 
   private function getForm($user = null) {
-    if(is_null($user)) $user = $this->user;
+    if (is_null($user)) $user = $this->user;
     $form = $this->container->get('\site\models\SignupForm', [$user]);
     $form->attributes = $this->vals; // massive assignment
     return $form;

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/UserBehavior.php

Spacing +13 added lines, -13 removed lines

@@ -92,7 +92,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']);
     }
 
@@ -121,12 +121,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);
       }
@@ -152,7 +152,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] = [
@@ -184,11 +184,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();
@@ -202,7 +202,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);
@@ -215,13 +215,13 @@ 
    * @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($behavior) {
+      if ($behavior) {
         $o['behavior'] = $behavior;
       }
-      if($category) {
+      if ($category) {
         $o['category'] = $category;
       }
     }
@@ -247,10 +247,10 @@ 
 
   // TODO: 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'];
 
       $bname = AH::getValue($behavior, 'behavior.name', AH::getValue($behavior, 'custom_behavior'));

site/models/QuestionForm.php

Spacing +10 added lines, -10 removed lines

@@ -52,7 +52,7 @@ 
 
   public function __construct(QuestionInterface $question,
                               $config = []) {
-    $this->question    = $question;
+    $this->question = $question;
     parent::__construct($config);
   }
 
@@ -70,7 +70,7 @@ 
         'whenClient' => "function(attribute, value) { return false; }", // lame, but acceptable
         "message" => "You must select a behavior your responses apply to."],
 
-      [['answer_1a','answer_1b','answer_1c','answer_2a','answer_2b','answer_2c','answer_3a','answer_3b','answer_3c','answer_4a','answer_4b','answer_4c','answer_5a', 'answer_5b','answer_5c','answer_6a', 'answer_6b','answer_6c','answer_7a','answer_7b','answer_7c'], 'safe']
+      [['answer_1a', 'answer_1b', 'answer_1c', 'answer_2a', 'answer_2b', 'answer_2c', 'answer_3a', 'answer_3b', 'answer_3c', 'answer_4a', 'answer_4b', 'answer_4c', 'answer_5a', 'answer_5b', 'answer_5c', 'answer_6a', 'answer_6b', 'answer_6c', 'answer_7a', 'answer_7b', 'answer_7c'], 'safe']
     ];
   }
 
@@ -88,10 +88,10 @@ 
 
   public function getBhvrValidator() {
     return function($model, $attr) {
-      $attrNum = $attr[strlen($attr)-1];
-      foreach(['a', 'b', 'c'] as $l) {
+      $attrNum = $attr[strlen($attr) - 1];
+      foreach (['a', 'b', 'c'] as $l) {
         $attr = "answer_{$attrNum}{$l}";
-        if($model->$attr) return true;
+        if ($model->$attr) return true;
       }
       return false;
     };
@@ -122,7 +122,7 @@ 
 
   public function getPrefixProps($prefix) {
     return array_filter(get_object_vars($this), function($v, $k) use($prefix) {
-      if(strpos($k, $prefix) === 0 && strlen($v)) {
+      if (strpos($k, $prefix) === 0 && strlen($v)) {
         return true;
       }
     }, ARRAY_FILTER_USE_BOTH);
@@ -140,9 +140,9 @@ 
   public function getAnswers($bhvrs) {
     $answers = [];
     $user_bhvrs = array_combine($this->getUserBehaviorProps(), $bhvrs);
-    foreach($user_bhvrs as $property => $user_bhvr) {
+    foreach ($user_bhvrs as $property => $user_bhvr) {
       $behavior_id = intval(substr($property, -1, 1));
-      foreach($this->behaviorToAnswers($behavior_id) as $answer_letter => $answer) {
+      foreach ($this->behaviorToAnswers($behavior_id) as $answer_letter => $answer) {
         $question_id = \common\models\Question::$TYPES[$answer_letter];
         array_push($answers, [
                                'behavior_id'    => $user_bhvr->behavior_id,
@@ -159,7 +159,7 @@ 
   public function saveAnswers(int $user_id, array $bhvrs) {
     $result = true;
 
-    foreach($this->getAnswers($bhvrs) as $answer) {
+    foreach ($this->getAnswers($bhvrs) as $answer) {
       $model = Yii::$container->get(\common\interfaces\QuestionInterface::class);
       $model->user_id = $user_id;
       $model->behavior_id = $answer['behavior_id'];
@@ -168,7 +168,7 @@ 
       $model->date = new Expression("now()::timestamp");
       $model->question = $answer['question_id'];
       $model->answer = $answer['answer'];
-      if(!$model->save()) {
+      if (!$model->save()) {
         $result = false;
       }
     }

site/controllers/CheckinController.php

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
   public function actionIndex() {
     $form = Yii::$container->get(\site\models\CheckinForm::class);
     if ($form->load(Yii::$app->request->post()) && $form->validate()) {
-      if(!$form->compileBehaviors()) {
+      if (!$form->compileBehaviors()) {
         return $this->redirect(['view']);
       }
 
@@ -48,7 +48,7 @@ 
       return $this->redirect(['questions']);
     }
 
-    $behaviors  = Yii::$container->get(BehaviorInterface::class)::$behaviors;
+    $behaviors = Yii::$container->get(BehaviorInterface::class)::$behaviors;
     $custom = \common\models\CustomBehavior::find(['user_id' => Yii::$app->user->identity->id])->asArray()->all();
     return $this->render('index', [
       'categories'    => Yii::$container->get(CategoryInterface::class)::$categories,
@@ -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(Yii::$app->user->identity->id, $behaviors)) {
+      if ($result = $form->saveAnswers(Yii::$app->user->identity->id, $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.');
@@ -132,7 +132,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")),
@@ -167,14 +167,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'],