CorWatts / fasterscale

site/views/site/error.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 
 $exception = Yii::$app->errorHandler->exception;
 
-if($exception instanceof \yii\web\NotFoundHttpException):
+if ($exception instanceof \yii\web\NotFoundHttpException):
   $this->title = "The Faster Scale App | Page Not Found";
 ?>
 
@@ -25,7 +25,7 @@ 
   <p>Otherwise, please ensure your attempted url is correct.</p>
 
 <?php
-elseif($exception instanceof \yii\web\ServerErrorHttpException):
+elseif ($exception instanceof \yii\web\ServerErrorHttpException):
   $this->title = "The Faster Scale App | Oops";
 ?>
 

Braces +5 added lines, -2 removed lines

@@ -33,7 +33,8 @@ 
   <div class="alert alert-danger"><?= nl2br(Html::encode($name)) ?></div>
   <p>Well this is embarrassing...we're having an error on our side. So sorry for the annoyance. If you'd like to help, please send us a message on our <a href='<?=Url::to(['site/contact'])?>'>contact form</a>.</p>
 
-<?php else: ?>
+<?php else {
+  : ?>
 
 <div class="site-error">
   <h1><?= Html::encode($name) ?></h1>
@@ -41,4 +42,6 @@ 
   <p>The above error occurred while the Web server was processing your request.</p>
   <p>Please contact us if you think this is a server error. Thank you.</p>
 </div>
-<?php endif; ?>
+<?php endif;
+}
+?>

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,
           ],
         ],
@@ -57,7 +57,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!');
       }
     }
@@ -75,7 +75,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!');
@@ -89,7 +89,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!');
@@ -113,14 +113,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 {
@@ -140,7 +140,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');
@@ -156,7 +156,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/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/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.');
       }

site/tests/unit/models/EditProfileFormTest.php

Indentation +40 added lines, -40 removed lines

@@ -6,22 +6,22 @@ 
 use \site\models\EditProfileForm;
 
 class EditProfileFormTest extends \Codeception\Test\Unit {
-	public $graph;
-	public $values = [
-			'timezone' => 'America/Los_Angeles',
-			'email_threshold' => 5,
-			'partner_email1' => 'partner1@example.com',
-			'partner_email2' => 'partner2@example.com',
-			'partner_email3' => 'partner3@example.com',
-			'expose_graph' => true,
-		];
-
-	public function setUp() {
-		$this->graph = $this->getMockBuilder(common\components\Graph::class)
-			->setMethods(['create', 'destroy'])
-			->getMock();
-		parent::setUp();
-	}
+  public $graph;
+  public $values = [
+      'timezone' => 'America/Los_Angeles',
+      'email_threshold' => 5,
+      'partner_email1' => 'partner1@example.com',
+      'partner_email2' => 'partner2@example.com',
+      'partner_email3' => 'partner3@example.com',
+      'expose_graph' => true,
+    ];
+
+  public function setUp() {
+    $this->graph = $this->getMockBuilder(common\components\Graph::class)
+      ->setMethods(['create', 'destroy'])
+      ->getMock();
+    parent::setUp();
+  }
 
   public function testLoadUser() {
     $user = $this->getUser();
@@ -58,37 +58,37 @@ 
 
     $form->attributes = $this->values;
     expect('saveProfile should return the user', $this->assertEquals($user, $form->saveProfile()));
-		expect('saveProfile should set the user\'s attributes to be the form values', $this->assertEquals($this->values, $user->attributes));
+    expect('saveProfile should set the user\'s attributes to be the form values', $this->assertEquals($this->values, $user->attributes));
 
     $form->send_email = 'not_a_boolean';
-		$ret = $form->saveProfile();
+    $ret = $form->saveProfile();
     expect('saveProfile should return the user with the partner-related settings equal to null', $this->assertNull($ret));
 
-		$null_vals = [
-			'email_threshold' => null,
-			'partner_email1'  => null,
-			'partner_email2'  => null,
-			'partner_email3'  => null,
-			'timezone'        => 'America/Los_Angeles',
-			'expose_graph'    => true,
-		];
+    $null_vals = [
+      'email_threshold' => null,
+      'partner_email1'  => null,
+      'partner_email2'  => null,
+      'partner_email3'  => null,
+      'timezone'        => 'America/Los_Angeles',
+      'expose_graph'    => true,
+    ];
     $form->send_email = false;
-		$ret = $form->saveProfile();
+    $ret = $form->saveProfile();
     expect('saveProfile should return the user with the partner-related settings equal to null', $this->assertEquals($null_vals, $user->attributes));
 
-		$this->graph
-			->expects($this->once())
-			->method('destroy');
-		$form->expose_graph = false;
-		$ret = $form->saveProfile();
-		expect('if form->expose_graph is set to false, destroy the graph and set user->expose_graph to false', $this->assertFalse($ret->expose_graph));
-
-		$this->graph
-			->expects($this->once())
-			->method('create');
-		$form->expose_graph = true;
-		$ret = $form->saveProfile();
-		expect('if form->expose_graph is set to true, create the graph and set user->expose_graph to true', $this->assertTrue($ret->expose_graph));
+    $this->graph
+      ->expects($this->once())
+      ->method('destroy');
+    $form->expose_graph = false;
+    $ret = $form->saveProfile();
+    expect('if form->expose_graph is set to false, destroy the graph and set user->expose_graph to false', $this->assertFalse($ret->expose_graph));
+
+    $this->graph
+      ->expects($this->once())
+      ->method('create');
+    $form->expose_graph = true;
+    $ret = $form->saveProfile();
+    expect('if form->expose_graph is set to true, create the graph and set user->expose_graph to true', $this->assertTrue($ret->expose_graph));
 		
     $form->send_email = 'not_a_boolean';
     expect('saveProfile should return null if the form validation fails', $this->assertNull($form->saveProfile()));

Spacing +2 added lines, -2 removed lines

@@ -52,9 +52,9 @@
     $form->loadUser();
 
     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(); });
 
     $form->attributes = $this->values;
     expect('saveProfile should return the user', $this->assertEquals($user, $form->saveProfile()));