CorWatts / fasterscale

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/tests/unit/models/SignupFormTest.php

Indentation +5 added lines, -5 removed lines

@@ -136,13 +136,13 @@ 
       expect('the form should validate correctly', $this->assertTrue($form->validate()));
       $user = $form->signup();
       expect('signup() should return a newly-saved user when the user does not already exist with the submitted values',
-             $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 1)));
+              $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 1)));
       expect('the "Remember Me" auth_key value should be set to a random string (defaults to a 32 char length)',
-             $this->assertEquals(32, strlen($user->auth_key)));
+              $this->assertEquals(32, strlen($user->auth_key)));
       expect('password_hash to be set to something like a hash',
-             $this->assertStringStartsWith('$2y$13$', $user->password_hash));
+              $this->assertStringStartsWith('$2y$13$', $user->password_hash));
       expect('when the user is created, signup() should call save()',
-             $this->assertTrue($saved));
+              $this->assertTrue($saved));
       expect('This user should be an isNewRecord -- they should NOT already exist', $this->assertTrue($user->getIsNewRecord()));
     });
   }
@@ -186,7 +186,7 @@ 
       $user = $form3->signup();
       expect('This user should not be an isNewRecord -- they should already exist', $this->assertFalse($user->getIsNewRecord()));
       expect('signup() should return a newly-saved user when the user does not already exist with the submitted values',
-             $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 1)));
+              $this->assertEquals($user->getAttributes($this->whitelist), array_splice($this->vals, 1)));
       expect('when the user exists and is NOT confirmed, signup() should call save() to UPDATE their info', $this->assertTrue($saved));
     });
   }

site/views/site/signup.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 				'id' => 'form-signup',
 				'enableClientValidation' => true,
         'enableAjaxValidation' => false,
-        'options' => [ 'validateOnSubmit' => true ]
+        'options' => ['validateOnSubmit' => true]
 			]); ?>
         <?= $form->field($model, 'email', ['inputTemplate' => '<div class="input-group"><span class="input-group-addon">@</span>{input}</div>'])->input('email') ?>
         <?= $form->field($model, 'password', ['inputTemplate' => '<div class="input-group">{input}<span class="input-group-btn"><button id="password-toggle" class="btn btn-default" type="button">Show</button></span></div>'])->passwordInput() ?>
@@ -34,7 +34,7 @@ 
           'template' => '<div class="row"><div class="col-md-5">{image}</div><div class="col-md-6 col-md-offset-1">{input}</div></div>',
         ]) ?>
         <?= $form->field($model, 'send_email')->checkbox(['disabled'=>true]) ?>
-        <div id='send_email_fields' <?php if(!$model->send_email) { ?>style="display: none;"<?php } ?>>
+        <div id='send_email_fields' <?php if (!$model->send_email) { ?>style="display: none;"<?php } ?>>
           <?= $form->field($model, 'partner_email1')->input('email') ?>
           <?= $form->field($model, 'partner_email2')->input('email') ?>
           <?= $form->field($model, 'partner_email3')->input('email') ?>

site/views/checkin/view.php

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
 $plus_week  = $time->alterLocalDate($actual_date, "+1 week");
 
 $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");
@@ -68,15 +68,15 @@ 
     </div>
   </div>
 
-  <?php if($questions) {
-  foreach($questions as $behavior_id => $behavior_questions) {
+  <?php if ($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>";
@@ -88,7 +88,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']}")

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');
       });
 

common/tests/unit/models/BehaviorTest.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     expect('getCategories should return an array of 7 categories', $this->assertEquals(count($behaviors), 7));
 
-    foreach($behaviors as $behavior) {
+    foreach ($behaviors as $behavior) {
       expect('this behavior to have a "name" key', $this->assertArrayHasKey('name', $behavior));
       expect('this behavior to have a "behavior_count" key', $this->assertArrayHasKey('behavior_count', $behavior));
       expect('this behavior to have a "category_id" key', $this->assertArrayHasKey('category_id', $behavior));