CorWatts / fasterscale

common/config/main.php

Spacing +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
       'common\interfaces\QuestionInterface' => \common\models\Question::class,
       'common\interfaces\BehaviorInterface' => \common\models\Behavior::class,
       'common\interfaces\CategoryInterface' => \common\models\Category::class,
-      'common\interfaces\TimeInterface' => function () {
-        if(Yii::$app->user->getIsGuest()) {
+      'common\interfaces\TimeInterface' => function() {
+        if (Yii::$app->user->getIsGuest()) {
           return new \common\components\Time('UTC');
         } else {
           return new \common\components\Time(Yii::$app->user->identity->timezone);

site/controllers/SiteController.php

Spacing +13 added lines, -13 removed lines

@@ -71,9 +71,9 @@ 
   public function actionIndex()
   {
     $time = Yii::$container->get(\common\interfaces\TimeInterface::class); 
-    $key = "index_blog_".$time->getLocalDate('UTC');
+    $key = "index_blog_" . $time->getLocalDate('UTC');
     $posts = Yii::$app->cache->get($key);
-    if($posts === false) {
+    if ($posts === false) {
       $posts = \Yii::$app->getModule('blog')
                             ->fetch()
                             ->parse()
@@ -106,7 +106,7 @@ 
   {
     $model = new ContactForm();
     if ($model->load(Yii::$app->request->post()) && $model->validate()) {
-      if($model->sendEmail(Yii::$app->params['adminEmail'])) {
+      if ($model->sendEmail(Yii::$app->params['adminEmail'])) {
         Yii::$app->session->setFlash('success', 'Thank you for contacting us. We will respond to you as soon as possible.');
       } else {
         Yii::$app->session->setFlash('error', 'There was an error sending email.');
@@ -138,10 +138,10 @@ 
   public function actionSignup()
   {
     $model = Yii::$container->get(\site\models\SignupForm::class);
-    if($model->load(Yii::$app->request->post()) && $model->validate()) {
+    if ($model->load(Yii::$app->request->post()) && $model->validate()) {
       $model->signup();
       Yii::$app->getSession()->setFlash('success', 'We have sent a verification email to the email address you provided. Please check your inbox and follow the instructions to verify your account.');
-      return $this->redirect('/',302);
+      return $this->redirect('/', 302);
     }
 
     return $this->render('signup', [
@@ -152,10 +152,10 @@ 
   public function actionRequestPasswordReset()
   {
     $model = Yii::$container->get(\site\models\PasswordResetRequestForm::class);
-    if($model->load(Yii::$app->request->post()) && $model->validate()) {
-      if(!$model->sendEmail()) {
+    if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+      if (!$model->sendEmail()) {
         $ip = Yii::$app->getRequest()->getUserIP() ?: "UNKNOWN";
-        Yii::warning("$ip has tried to reset the password for ".$model->email);
+        Yii::warning("$ip has tried to reset the password for " . $model->email);
       }
 
       Yii::$app->getSession()->setFlash('success', 'If there is an account with the submitted email address you will receive further instructions in your email inbox.');
@@ -198,14 +198,14 @@ 
       throw new BadRequestHttpException("Wrong or expired email verification token. If you aren't sure why this error occurs perhaps you've already verified your account. Please try logging in.");
     }
 
-    if($user->isTokenConfirmed($user->verify_email_token)) {
+    if ($user->isTokenConfirmed($user->verify_email_token)) {
       Yii::$app->getSession()->setFlash('success', 'Your account has already been verified. Please log in.');
-      return $this->redirect('/login',302);
+      return $this->redirect('/login', 302);
     } else if (Yii::$app->getUser()->login($user)) {
       $user->confirmVerifyEmailToken();
       $user->save();
       Yii::$app->getSession()->setFlash('success', 'Your account has been verified. Please continue with your check-in.');
-      return $this->redirect('/welcome',302);
+      return $this->redirect('/welcome', 302);
     }
   }
 
@@ -222,7 +222,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');
@@ -238,7 +238,7 @@ 
 
     fputcsv($fp, $header);
     $user_behavior = Yii::$container->get(\common\interfaces\UserBehaviorInterface::class);
-    while($row = $reader->read()) {
+    while ($row = $reader->read()) {
       $row = $user_behavior::decorateWithCategory([$row]);
       $row = Yii::$app->user->identity->cleanExportData($row);
       fputcsv($fp, $row[0]);

site/controllers/ProfileController.php

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
 
     if ($editProfileForm->load(Yii::$app->request->post())) {
       $saved_user = $editProfileForm->saveProfile();
-      if($saved_user) {
+      if ($saved_user) {
         Yii::$app->getSession()->setFlash('success', 'New profile data saved!');
       }
     }
@@ -85,7 +85,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->getSession()->setFlash('error', 'Wrong password!');
@@ -100,7 +100,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->getSession()->setFlash('success', 'Password successfully changed');
       } else {
         Yii::$app->getSession()->setFlash('error', 'Wrong password!');
@@ -113,7 +113,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');
@@ -129,7 +129,7 @@ 
 
     fputcsv($fp, $header);
     $user_behavior = Yii::$container->get(\common\interfaces\UserBehaviorInterface::class);
-    while($row = $reader->read()) {
+    while ($row = $reader->read()) {
       $row = $user_behavior::decorateWithCategory([$row]);
       $row = Yii::$app->user->identity->cleanExportData($row);
       fputcsv($fp, $row[0]);

site/views/checkin/old_view.php

Indentation +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
     print $form
             ->field($model, "behaviors{$category['id']}")
             ->checkboxList($behaviors,
-                           ['item' => "checkboxItemTemplate"]);
+                            ['item' => "checkboxItemTemplate"]);
   }
   ActiveForm::end();
 

Switch Indentation +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@
 
   <?php
               switch(true) {
-                case ($score < 30):
-                  $alert_level = "success";
-                  $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
-                  break;
+              case ($score < 30):
+                $alert_level = "success";
+                $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
+                break;
 
               case ($score < 40):
                 $alert_level = "info";

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,7 @@ 
 $this->title = "The Faster Scale App | Previous Check-ins";
 $time = Yii::$container->get('common\interfaces\TimeInterface');
 $this->registerJsFile('/js/checkin/view.js', ['depends' => [\site\assets\AppAsset::class]]);
-if($answer_pie) {
+if ($answer_pie) {
   $this->registerJsFile('/js/checkin/charts/pie.js', ['depends' => [\site\assets\AppAsset::class]]);
 }
 
@@ -25,7 +25,7 @@ 
 }
 
 $pie_data = [];
-if($answer_pie) {
+if ($answer_pie) {
   $values     = array_map('intval', array_column($answer_pie, "count"));
   $labels     = array_column($answer_pie, "name");
   $colors     = array_column($answer_pie, "color");
@@ -51,7 +51,7 @@ 
   <h1>View Previous Check-ins</h1>
 
   <?php
-              switch(true) {
+              switch (true) {
                 case ($score < 30):
                   $alert_level = "success";
                   $alert_msg = "You're doing well! Keep on doing whatever it is you're doing!";
@@ -112,16 +112,16 @@ 
 </div>
 
 
-  <?php if($questions) {
+  <?php if ($questions) {
   print "<h3>Processing Questions:</h3>";
-  foreach($questions as $behavior_id => $behavior_questions) {
+  foreach ($questions as $behavior_id => $behavior_questions) {
     print "<div class='well well-sm'>";
     print "<button type='button' class='btn btn-primary' disabled='disabled'>{$behavior_questions['question']['title']}</button>";
     print "<div class='row'>";
-    foreach($behavior_questions['answers'] as $question) { 
+    foreach ($behavior_questions['answers'] as $question) { 
       print "<div class='col-md-4'>";
       print "<p><strong>{$question['title']}</strong></p>";
-      print "<p>".Html::encode($question['answer'])."</p>";
+      print "<p>" . Html::encode($question['answer']) . "</p>";
       print "</div>";
     }
     print "</div></div>";
@@ -136,7 +136,7 @@ 
     'options' => ['class' => 'form-horizontal'],
   ]);
 
-  foreach($categories as $category) {
+  foreach ($categories as $category) {
     $behaviors = AH::map($behaviorsList[$category['id']], 'id', 'name');
     print $form
             ->field($model, "behaviors{$category['id']}")
@@ -146,7 +146,7 @@ 
   ActiveForm::end();
 
 $this->registerJson($past_checkin_dates, "past-checkin-dates");
-if($answer_pie) {
+if ($answer_pie) {
   $this->registerJson($pie_data, "pie_data");
 }
 ?>

Braces +5 added lines, -2 removed lines

@@ -102,9 +102,12 @@
         <div class='card-text'>
           <?php if ($pie_data): ?>
           <canvas id='category-pie-chart'></canvas>
-          <?php else: ?>
+          <?php else {
+  : ?>
           <p>no data</p>
-          <?php endif; ?>
+          <?php endif;
+}
+?>
         </div>
       </div>
     </div>

site/controllers/CheckinController.php

Spacing +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
     if ($form->load(Yii::$app->request->post()) && $form->validate()) {
       $form->compiled_behaviors = $form->compileBehaviors();
 
-      if(sizeof($form->compiled_behaviors) === 0) {
+      if (sizeof($form->compiled_behaviors) === 0) {
         return $this->redirect(['view']);
       }
 
@@ -65,7 +65,7 @@ 
     $date = Yii::$container->get(\common\interfaces\TimeInterface::class)->getLocalDate();
 
     $user_behaviors = $user_behavior->getUserBehaviorsWithCategory($date);
-    if(count($user_behaviors) === 0) {
+    if (count($user_behaviors) === 0) {
       return $this->redirect(['view']);
     }
 
@@ -75,9 +75,9 @@ 
       $form->deleteToday();
 
       $behaviors = $user_behavior->findAll($form->getUserBehaviorIds());
-      if($result = $form->saveAnswers($behaviors)) {
+      if ($result = $form->saveAnswers($behaviors)) {
 
-        if(Yii::$app->user->identity->send_email) {
+        if (Yii::$app->user->identity->send_email) {
           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 {
@@ -97,9 +97,9 @@ 
   public function actionView(string $date = null)
   {
     $time = Yii::$container->get(\common\interfaces\TimeInterface::class);
-    if(is_null($date)) {
+    if (is_null($date)) {
       $date = $time->getLocalDate();
-    } else if($dt = $time->parse($date)) {
+    } else if ($dt = $time->parse($date)) {
       $date = $dt->format('Y-m-d');
     } else {
       $date = $time->getLocalDate();

site/views/profile/index.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
           <?= $form->field($profile, 'email', ['inputTemplate' => '<div class="input-group"><span class="input-group-addon">@</span>{input}</div>']); ?>
           <?= $form->field($profile, 'timezone')->dropDownList(array_combine($timezones, $timezones)); ?>
           <?= $form->field($profile, 'send_email')->checkbox() ?>
-          <div id='send_email_fields' <?php if(!$profile->send_email) { ?>style="display: none;"<?php } ?>>
+          <div id='send_email_fields' <?php if (!$profile->send_email) { ?>style="display: none;"<?php } ?>>
             <?= $form->field($profile, 'partner_email1')->input('email'); ?>
             <?= $form->field($profile, 'partner_email2')->input('email'); ?>
             <?= $form->field($profile, 'partner_email3')->input('email'); ?>

site/models/EditProfileForm.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
       ['email', 'filter', 'filter' => 'trim'],
       ['email', 'filter', 'filter' => 'strtolower'],
       ['email', 'email'],
-      ['email', 'unique', 'targetClass' => '\common\models\User', 'message' => 'This email address has already been taken.', 'filter' => "id <> ".Yii::$app->user->id],
+      ['email', 'unique', 'targetClass' => '\common\models\User', 'message' => 'This email address has already been taken.', 'filter' => "id <> " . Yii::$app->user->id],
 
       ['timezone', 'string', 'min' => 2, 'max' => 255],
       ['timezone', 'in', 'range'=>DateTimeZone::listIdentifiers()],
@@ -75,18 +75,18 @@ 
   public function saveProfile()
   {
     if ($this->validate()) {
-      $user  = $this->user;
+      $user = $this->user;
 
-      if($this->email)
+      if ($this->email)
         $user->email = $this->email;
-      if($this->timezone)
+      if ($this->timezone)
         $user->timezone = $this->timezone;
-      if($this->expose_graph) {
+      if ($this->expose_graph) {
         $user->expose_graph = true;
       } else {
         $user->expose_graph = false;
       }
-      if($this->send_email) {
+      if ($this->send_email) {
         $user->partner_email1  = $this->partner_email1;
         $user->partner_email2  = $this->partner_email2;
         $user->partner_email3  = $this->partner_email3;

Braces +6 added lines, -4 removed lines

@@ -77,10 +77,12 @@
     if ($this->validate()) {
       $user  = $this->user;
 
-      if($this->email)
-        $user->email = $this->email;
-      if($this->timezone)
-        $user->timezone = $this->timezone;
+      if($this->email) {
+              $user->email = $this->email;
+      }
+      if($this->timezone) {
+              $user->timezone = $this->timezone;
+      }
       if($this->expose_graph) {
         $user->expose_graph = true;
       } else {

site/models/SignupForm.php

Spacing +3 added lines, -3 removed lines

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

common/tests/unit/models/UserBehaviorTest.php

Indentation +13 added lines, -13 removed lines

@@ -89,19 +89,19 @@
     expect('decorate should add Behavior data and Category data to an array of UserBehaviors',
       $this->assertEquals(
         $this->user_behavior->decorateWithCategory($this->singleSimpleBehaviorNoBehavior),
-         [['id' => 396,
-           'user_id' => 2,
-           'behavior_id' => 107,
-           'date' => '2016-06-17 04:12:43',
-           'behavior' => [
-             'id' => 107,
-             'name' => 'numb',
-             'category_id' => 6,
-             'category' => [
-               'id' => 6,
-               'name' => 'Exhausted',
-             ]
-           ]]]));
+          [['id' => 396,
+            'user_id' => 2,
+            'behavior_id' => 107,
+            'date' => '2016-06-17 04:12:43',
+            'behavior' => [
+              'id' => 107,
+              'name' => 'numb',
+              'category_id' => 6,
+              'category' => [
+                'id' => 6,
+                'name' => 'Exhausted',
+              ]
+            ]]]));
   }
 
   public function testGetTopBehaviors() {

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
   ]; 
   public function setUp() {
     // pull in test data
-    $data = require(__DIR__.'/../data/checkinData.php');
+    $data = require(__DIR__ . '/../data/checkinData.php');
     $this->singleBhvr = $data['singleBhvr'];
     $this->manyBhvrs = $data['manyBhvrs'];
     $this->allBhvrs = $data['allBhvrs'];
@@ -43,7 +43,7 @@ 
     $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
     $this->container->set('common\interfaces\QuestionInterface', '\site\tests\_support\MockQuestion');
     $this->container->set('common\interfaces\BehaviorInterface', 'common\models\Behavior');
-    $this->container->set('common\interfaces\TimeInterface', function () {
+    $this->container->set('common\interfaces\TimeInterface', function() {
         return new \common\components\Time('America/Los_Angeles');
       });