CorWatts / fasterscale

site/tests/_support/UnitTester.php

Indentation +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@
 {
     use _generated\UnitTesterActions;
 
-   /**
-    * Define custom actions here
-    */
+    /**
+     * Define custom actions here
+     */
 }

site/views/site/contact.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         <?= $form->field($model, 'subject') ?>
         <?= $form->field($model, 'body')->textArea(['rows' => 6]) ?>
 
-        <?php if(Yii::$app->user->isGuest) {
+        <?php if (Yii::$app->user->isGuest) {
           // only show captcha if user is not logged in
           print $form->field($model, 'verifyCode')->widget(Captcha::class, [
             'template' => '<div class="row"><div class="col-md-3">{image}</div><div class="col-md-6">{input}</div></div>',

common/models/Category.php

Spacing +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@
 
   // a weight of 0 means selections in that category do not increase the score
   public static $categories = [
-    [ "id" => 1, "weight" => 0,  "name" => "Restoration"],
-    [ "id" => 2, "weight" => 1,  "name" => "Forgetting Priorities"],
-    [ "id" => 3, "weight" => 2,  "name" => "Anxiety"],
-    [ "id" => 4, "weight" => 4,  "name" => "Speeding Up"],
-    [ "id" => 5, "weight" => 6,  "name" => "Ticked Off"],
-    [ "id" => 6, "weight" => 8,  "name" => "Exhausted"],
-    [ "id" => 7, "weight" => 10, "name" => "Relapse/Moral Failure"],
+    ["id" => 1, "weight" => 0, "name" => "Restoration"],
+    ["id" => 2, "weight" => 1, "name" => "Forgetting Priorities"],
+    ["id" => 3, "weight" => 2, "name" => "Anxiety"],
+    ["id" => 4, "weight" => 4, "name" => "Speeding Up"],
+    ["id" => 5, "weight" => 6, "name" => "Ticked Off"],
+    ["id" => 6, "weight" => 8, "name" => "Exhausted"],
+    ["id" => 7, "weight" => 10, "name" => "Relapse/Moral Failure"],
   ];
 
   public static $colors = [

site/views/checkin/report.php

Spacing +5 added lines, -5 removed lines

@@ -35,12 +35,12 @@
                 <th>Behavior</th>
                 <th>Category</th>
             </tr>
-<?php foreach($top_behaviors as $key => $row) {
+<?php foreach ($top_behaviors as $key => $row) {
 $num = $key + 1;
-print "<tr>".
-  "<td>{$row['count']}</td>".
-  "<td>{$row['behavior']['name']}</td>".
-  "<td>{$row['behavior']['category']['name']}</td>".
+print "<tr>" .
+  "<td>{$row['count']}</td>" .
+  "<td>{$row['behavior']['name']}</td>" .
+  "<td>{$row['behavior']['category']['name']}</td>" .
   "</tr>";
 }
 ?>

common/tests/unit/components/TimeTest.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
       $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
       $this->container->set('common\interfaces\QuestionInterface', '\site\tests\_support\MockQuestion');
 
-      $this->container->set('common\interfaces\TimeInterface', function () {
+      $this->container->set('common\interfaces\TimeInterface', function() {
         return new \common\components\Time('America/Los_Angeles');
       });
 
@@ -40,7 +40,7 @@ 
 
     public function testGetLocalTime()
     {
-      $this->specify('getLocalTime should function correctly', function () {
+      $this->specify('getLocalTime should function correctly', function() {
         expect("getLocalTime should work with user's set time", $this->assertEquals($this->time->getLocalTime(), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s")));
         expect('getLocalTime should work with a custom timezone', $this->assertEquals($this->time->getLocalTime("UTC"), (new DateTime("now"))->format("Y-m-d H:i:s")));
       });
@@ -48,13 +48,13 @@ 
 
     public function testConvertLocalToUTC()
     {
-      $this->specify('convertLocalToUTC should function correctly', function () {
+      $this->specify('convertLocalToUTC should function correctly', function() {
         $la_tz = (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s");
 
         expect('convertLocalToUTC should convert a Los Angeles tz to UTC with the included time', $this->assertEquals($this->time->convertLocalToUTC($la_tz), (new DateTime("now"))->format("Y-m-d H:i:s")));
         expect('convertLocalToUTC should convert a Los Angeles tz to UTC without the included time', $this->assertEquals($this->time->convertLocalToUTC($la_tz, false), (new DateTime("now"))->format("Y-m-d")));
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');
@@ -67,14 +67,14 @@ 
 
     public function testConvertUTCToLocal()
     {
-      $this->specify('convertUTCToLocal should function correctly', function () {
+      $this->specify('convertUTCToLocal should function correctly', function() {
         $utc_tz = (new DateTime("now"))->format("Y-m-d H:i:s");
 
         expect('convertUTCToLocal should convert a UTC tz to Los Angeles with the included timezone', $this->assertEquals((new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format(DateTime::ATOM), $this->time->convertUTCToLocal($utc_tz)));
         expect('convertUTCToLocal should convert a UTC tz to Los Angeles without the included timezone', $this->assertEquals($this->time->convertUTCToLocal($utc_tz, false), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d H:i:s")));
 
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');
@@ -87,7 +87,7 @@ 
 
     public function testGetLocalDate()
     {
-      $this->specify('getLocalDate should function correctly', function () {
+      $this->specify('getLocalDate should function correctly', function() {
         expect("getLocalDate should correctly get the user's local date", $this->assertEquals($this->time->getLocalDate(), (new DateTime("now", new DateTimeZone("America/Los_Angeles")))->format("Y-m-d")));
         expect("getLocalDate should correctly get the local date of a specified timezone", $this->assertEquals($this->time->getLocalDate("UTC"), (new DateTime("now", new DateTimeZone("UTC")))->format("Y-m-d")));
       });
@@ -109,7 +109,7 @@ 
         expect('getUTCBookends should return false if there is a space at the end of the time string', $this->assertFalse($this->time->getUTCBookends('2016-05-30 00:00:00 ')));
         expect('getUTCBookends should return UTC bookend times from the Los_Angeles tz', $this->assertEquals($this->time->getUTCBookends('2016-05-30'), ['2016-05-30 07:00:00', '2016-05-31 06:59:59']));
         // with UTC
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
           return new \common\components\Time('UTC');
         });
         $time = $this->container->get('common\interfaces\TimeInterface');

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

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,7 @@ 
     if ($form->load(Yii::$app->request->post()) && $form->validate()) {
       $form->compiled_behaviors = $form->compileBehaviors();
 
-      if(sizeof($form->compiled_behaviors) === 0) {
+      if (sizeof($form->compiled_behaviors) === 0) {
         return $this->redirect(['view']);
       }
 
@@ -49,14 +49,14 @@ 
 
       // delete cached scores
       $time = Yii::$container->get(\common\interfaces\TimeInterface::class);
-      $key = "scores_of_last_month_".Yii::$app->user->id."_".$time->getLocalDate();
+      $key = "scores_of_last_month_" . Yii::$app->user->id . "_" . $time->getLocalDate();
       Yii::$app->cache->delete($key);
 
       // if the user has publicised their score graph, create the image
-      if(Yii::$app->user->identity->expose_graph) {
+      if (Yii::$app->user->identity->expose_graph) {
         $user_behavior = Yii::$container->get(\common\interfaces\UserBehaviorInterface::class);
         $scores_last_month = $user_behavior->calculateScoresOfLastMonth();
-        if($scores_last_month) {
+        if ($scores_last_month) {
           Yii::$container
             ->get(\common\components\Graph::class, [Yii::$app->user->identity])
             ->create($scores_last_month, true);
@@ -81,7 +81,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']);
     }
 
@@ -91,10 +91,10 @@ 
       $form->deleteToday();
 
       $behaviors = $user_behavior->findAll($form->getUserBehaviorIds());
-      if($result = $form->saveAnswers($behaviors)) {
+      if ($result = $form->saveAnswers($behaviors)) {
 
         $score = $user_behavior->getDailyScore();
-        if(Yii::$app->user->identity->isOverThreshold($score)) {
+        if (Yii::$app->user->identity->isOverThreshold($score)) {
           Yii::$app->user->identity->sendEmailReport($date);
           Yii::$app->session->setFlash('warning', 'Your check-in is complete. A notification has been sent to your report partners because of your high score. Reach out to them!');
         } else {
@@ -114,9 +114,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/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>