CorWatts / fasterscale

site/controllers/SiteController.php

Spacing +11 added lines, -11 removed lines

@@ -55,9 +55,9 @@ 
   public function actionBlog()
   {
     $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()
@@ -90,7 +90,7 @@ 
   {
     $model = new \site\models\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.');
@@ -122,10 +122,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->session->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', [
@@ -136,10 +136,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->session->setFlash('success', 'If there is an account with the submitted email address you will receive further instructions in your email inbox.');
@@ -183,14 +183,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->session->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->session->setFlash('success', 'Your account has been verified. Please continue with your check-in.');
-      return $this->redirect('/welcome',302);
+      return $this->redirect('/welcome', 302);
     }
   }
 

common/components/View.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         }
 
         if (!empty($this->json)) {
-          foreach($this->json[self::POS_READY] as $json_name => $json_value) {
+          foreach ($this->json[self::POS_READY] as $json_name => $json_value) {
             $lines[] = Html::script($json_value, ['type' => 'application/json', 'id' => $json_name]);
           }
         }

common/components/Controller.php

Indentation +2 added lines, -2 removed lines

@@ -33,8 +33,8 @@
   {
     return [
       'error' => [
-         'class' => 'yii\web\ErrorAction',
-       ],
+          'class' => 'yii\web\ErrorAction',
+        ],
       'captcha' => [
         'class' => 'yii\captcha\CaptchaAction',
       ],

common/models/LoginForm.php

Spacing +3 added lines, -3 removed lines

@@ -60,10 +60,10 @@
    */
   public function login()
   {
-    if($this->validate()) {
+    if ($this->validate()) {
       $user = $this->getUser();
-      if($user->isVerified()) {
-        return Yii::$app->user->login($user, $this->rememberMe ? 3600 * 24 * 30 : 0);
+      if ($user->isVerified()) {
+        return Yii::$app->user->login($user, $this->rememberMe ? 3600*24*30 : 0);
       } else {
         Yii::$app->session->setFlash('warning', 'You must verify your account before you can proceed. Please check your email inbox for a verification email and follow the instructions.');
       }

common/models/Category.php

Spacing +7 added lines, -7 removed lines

@@ -12,13 +12,13 @@
 class Category extends \yii\base\BaseObject implements \common\interfaces\CategoryInterface {
 
   public static $categories = [
-    [ "id" => 1, "name" => "Restoration"],
-    [ "id" => 2, "name" => "Forgetting Priorities"],
-    [ "id" => 3, "name" => "Anxiety"],
-    [ "id" => 4, "name" => "Speeding Up"],
-    [ "id" => 5, "name" => "Ticked Off"],
-    [ "id" => 6, "name" => "Exhausted"],
-    [ "id" => 7, "name" => "Relapse/Moral Failure"],
+    ["id" => 1, "name" => "Restoration"],
+    ["id" => 2, "name" => "Forgetting Priorities"],
+    ["id" => 3, "name" => "Anxiety"],
+    ["id" => 4, "name" => "Speeding Up"],
+    ["id" => 5, "name" => "Ticked Off"],
+    ["id" => 6, "name" => "Exhausted"],
+    ["id" => 7, "name" => "Relapse/Moral Failure"],
   ];
 
   public static $colors = [

common/config/main.php

Spacing +3 added lines, -3 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);
@@ -28,7 +28,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' => [

common/tests/unit/components/GraphTest.php

Spacing +7 added lines, -7 removed lines

@@ -14,8 +14,8 @@ 
   use \Codeception\Specify;
 
   private $user;
-  private $filepath = __DIR__.'/../../_output/test_graph.png';
-  private $filepath_extra = __DIR__.'/../../_output/charts/test_graph.png';
+  private $filepath = __DIR__ . '/../../_output/test_graph.png';
+  private $filepath_extra = __DIR__ . '/../../_output/charts/test_graph.png';
 
   public function setUp() {
     $this->user = $this->getMockBuilder('\site\tests\_support\MockUser')
@@ -36,7 +36,7 @@ 
       ->willReturn('random1DH4sh');
     $graph = new Graph($this->user);
 
-    expect('the expected graph image filepath will be returned', $this->assertEquals(dirname(dirname(dirname(dirname(__DIR__)))).'/site/web/charts/random1DH4sh.png', $graph->getFilepath()));
+    expect('the expected graph image filepath will be returned', $this->assertEquals(dirname(dirname(dirname(dirname(__DIR__)))) . '/site/web/charts/random1DH4sh.png', $graph->getFilepath()));
   }
 
   public function testGetUrl() {
@@ -57,7 +57,7 @@ 
       ->method('getFilepath')
       ->willReturn($this->filepath);
 
-    if(!file_exists($this->filepath) && preg_match('%/_output/test_graph.png$%', $this->filepath)) {
+    if (!file_exists($this->filepath) && preg_match('%/_output/test_graph.png$%', $this->filepath)) {
       touch($this->filepath);
       expect('just a check to be sure $filepath is sane', $this->assertStringEndsWith('/_output/test_graph.png', $this->filepath));
       expect('the generated file should exist', $this->assertFileExists($this->filepath));
@@ -89,7 +89,7 @@ 
     expect('the generated file should be readable', $this->assertFileExists($this->filepath_extra));
 
     // cleanup
-    if(file_exists($this->filepath_extra) && preg_match('%/_output/charts/test_graph.png%', $this->filepath_extra)) {
+    if (file_exists($this->filepath_extra) && preg_match('%/_output/charts/test_graph.png%', $this->filepath_extra)) {
       // just in case something is weird, we don't want to straight rm this file
       unlink($this->filepath_extra);
       rmdir(dirname($this->filepath_extra));
@@ -97,7 +97,7 @@ 
   }
 }
 
-function checkinBreakdown () {
+function checkinBreakdown() {
   return [
       '2019-01-31' => [],
       '2019-02-01' => [],
@@ -230,7 +230,7 @@ 
       '2019-02-27' => [],
       '2019-02-28' => [],
       '2019-03-01' => [
-        2 => [ 'name' => 'Forgetting Priorities',
+        2 => ['name' => 'Forgetting Priorities',
         'count' => 6,
         'color' => '#4CA100',
         'highlight' => '#61B219',

site/tests/unit/models/EditProfileFormTest.php

Spacing +3 added lines, -3 removed lines

@@ -41,11 +41,11 @@
 
     // Set up dependency injections
     Yii::$container
-      ->set(\common\interfaces\TimeInterface::class, function () { return new \common\components\Time('UTC'); });
+      ->set(\common\interfaces\TimeInterface::class, function() { return new \common\components\Time('UTC'); });
     Yii::$container
-      ->set(\common\components\Graph::class, function () { return $this->graph; });
+      ->set(\common\components\Graph::class, function() { return $this->graph; });
     Yii::$container
-      ->set(\common\interfaces\UserBehaviorInterface::class, function () { return new FakeUserBehavior(); });
+      ->set(\common\interfaces\UserBehaviorInterface::class, function() { return new FakeUserBehavior(); });
 
     // Actually begin testing
     $form->attributes = $this->values;

site/views/profile/index.php

Spacing +2 added lines, -2 removed lines

@@ -70,11 +70,11 @@
 ]); ?>
             <?= $form->field($profile, 'timezone')->dropDownList(array_combine($timezones, $timezones)); ?>
             <?= $form->field($profile, 'expose_graph')->checkbox() ?>
-            <?php if($profile->expose_graph): ?>
+            <?php if ($profile->expose_graph): ?>
             <div class='alert alert-success score-graph-info'>Your score graph can be found at:<br /> <a id="score-graph-link" target="_blank" href="<?=$graph_url?>"><?=$graph_url?></a></div>
             <?php endif; ?>
             <?= $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'); ?>