CorWatts / fasterscale

site/models/QuestionForm.php

Indentation +6 added lines, -6 removed lines

@@ -163,12 +163,12 @@
             foreach ($this->behaviorToAnswers($behavior_id) as $answer_letter => $answer) {
                 $question_id = \common\models\Question::$TYPES[$answer_letter];
                 array_push($answers, [
-                               'behavior_id'    => $user_bhvr->behavior_id,
-                               'category_id'    => $user_bhvr->category_id,
-                               'user_bhvr_id' => $user_bhvr->id,
-                               'question_id'  => $question_id,
-                               'answer'       => $answer,
-                             ]);
+                                'behavior_id'    => $user_bhvr->behavior_id,
+                                'category_id'    => $user_bhvr->category_id,
+                                'user_bhvr_id' => $user_bhvr->id,
+                                'question_id'  => $question_id,
+                                'answer'       => $answer,
+                              ]);
             }
         }
         return $answers;

Spacing +7 added lines, -7 removed lines

@@ -55,7 +55,7 @@ 
         $config = []
     )
     {
-        $this->question    = $question;
+        $this->question = $question;
         parent::__construct($config);
     }
 
@@ -73,7 +73,7 @@ 
         'whenClient' => "function(attribute, value) { return false; }", // lame, but acceptable
         "message" => "You must select a behavior your responses apply to."],
 
-      [['answer_1a','answer_1b','answer_1c','answer_2a','answer_2b','answer_2c','answer_3a','answer_3b','answer_3c','answer_4a','answer_4b','answer_4c','answer_5a', 'answer_5b','answer_5c','answer_6a', 'answer_6b','answer_6c','answer_7a','answer_7b','answer_7c'], 'safe']
+      [['answer_1a', 'answer_1b', 'answer_1c', 'answer_2a', 'answer_2b', 'answer_2c', 'answer_3a', 'answer_3b', 'answer_3c', 'answer_4a', 'answer_4b', 'answer_4c', 'answer_5a', 'answer_5b', 'answer_5c', 'answer_6a', 'answer_6b', 'answer_6c', 'answer_7a', 'answer_7b', 'answer_7c'], 'safe']
     ];
     }
 
@@ -92,8 +92,8 @@ 
 
     public function getBhvrValidator()
     {
-        return function ($model, $attr) {
-            $attrNum = $attr[strlen($attr)-1];
+        return function($model, $attr) {
+            $attrNum = $attr[strlen($attr) - 1];
             foreach (['a', 'b', 'c'] as $l) {
                 $attr = "answer_{$attrNum}{$l}";
                 if ($model->$attr) {
@@ -124,10 +124,10 @@ 
     public function behaviorToAnswers($bhvr_number)
     {
         $prop_names   = array_keys($this->getPrefixProps("answer_$bhvr_number"));
-        $prop_letters = array_map(function ($n) {
+        $prop_letters = array_map(function($n) {
             return substr($n, -1, 1);
         }, $prop_names);
-        $answers = array_map(function ($n) {
+        $answers = array_map(function($n) {
             return $this->$n;
         }, $prop_names);
  
@@ -136,7 +136,7 @@ 
 
     public function getPrefixProps($prefix)
     {
-        return array_filter(get_object_vars($this), function ($v, $k) use ($prefix) {
+        return array_filter(get_object_vars($this), function($v, $k) use ($prefix) {
             if (strpos($k, $prefix) === 0 && strlen($v)) {
                 return true;
             }

site/models/ContactForm.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
       ['email', 'filter', 'filter' => 'strtolower'],
       ['email', 'email'],
       // verifyCode needs to be entered correctly
-      ['verifyCode', 'captcha', 'when' => function () {
+      ['verifyCode', 'captcha', 'when' => function() {
           return Yii::$app->user->isGuest;
       }, 'skipOnEmpty' => !!YII_ENV_TEST],
     ];
@@ -57,7 +57,7 @@ 
         return Yii::$app->mailer->compose()
       ->setTo($email)
       ->setFrom([$this->email => $this->name])
-      ->setSubject("[FSA Contact] ".$this->subject)
+      ->setSubject("[FSA Contact] " . $this->subject)
       ->setTextBody($this->body)
       ->send();
     }

site/tests/unit/models/QuestionFormTest.php

Indentation +4 added lines, -4 removed lines

@@ -101,10 +101,10 @@
             $model->answer_2c = 'answering question c';
 
             expect('behaviorToAnswers should return the answer properties related to the behavior number supplied', $this->assertEquals($model->behaviorToAnswers(1), [
-                                                               'a' => 'answering question a',
-                                                               'b' => 'answering question b',
-                                                               'c' => 'answering question c'
-                                                             ]));
+                                                                'a' => 'answering question a',
+                                                                'b' => 'answering question b',
+                                                                'c' => 'answering question c'
+                                                              ]));
 
             expect('behaviorToAnswers should return the the empty set when there are no answers associated with the supplied behavior number', $this->assertEmpty($model->behaviorToAnswers(7)));
         });

Spacing +7 added lines, -7 removed lines

@@ -18,14 +18,14 @@ 
         $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
         $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');
         });
     }
 
     public function testAttributeLabels()
     {
-        $this->specify('setBehaviors should function properly', function () {
+        $this->specify('setBehaviors should function properly', function() {
             $model = $this->container->get('\site\models\QuestionForm');
             expect('attributeLabels should be correct', $this->assertEquals($model->attributeLabels(), [
         'user_behavior_id1' => 'Restoration',
@@ -44,7 +44,7 @@ 
         $model = $this->container->get('\site\models\QuestionForm');
         $validator = $model->getBhvrValidator();
 
-        $this->specify('getBhvrValidator should function properly', function () use ($model, $validator) {
+        $this->specify('getBhvrValidator should function properly', function() use ($model, $validator) {
             expect('getBhvrValidator should return false when nothing is set on the form', $this->assertFalse($validator($model, "user_behavior_id1")));
             expect('getBhvrValidator should return false when nothing is set on the form', $this->assertFalse($validator($model, "user_behavior_id7")));
 
@@ -65,7 +65,7 @@ 
     {
         $model = $this->container->get('\site\models\QuestionForm');
 
-        $this->specify('getPrefixProps should function properly', function () use ($model) {
+        $this->specify('getPrefixProps should function properly', function() use ($model) {
             expect('getPrefixProps should strip out all the falsy propeties it finds', $this->assertEmpty($model->getPrefixProps('answer')));
 
             $model->answer_1a = 'processing emotions';
@@ -90,7 +90,7 @@ 
 
     public function testBehaviorToAnswers()
     {
-        $this->specify('behaviorToAnswers should function properly', function () {
+        $this->specify('behaviorToAnswers should function properly', function() {
             $model = $this->container->get('\site\models\QuestionForm');
             $model->answer_1a = 'answering question a';
             $model->answer_1b = 'answering question b';
@@ -114,7 +114,7 @@ 
     {
         $model = $this->container->get('\site\models\QuestionForm');
 
-        $this->specify('getAnswers should function properly', function () use ($model) {
+        $this->specify('getAnswers should function properly', function() use ($model) {
             $model->user_behavior_id1 = 'dummy';
             $model->user_behavior_id2 = 'dummy';
             $model->user_behavior_id3 = 'dummy';
@@ -132,7 +132,7 @@ 
         $this->fakeModel(7, 280, 8),
         $this->fakeModel(13, 281, 8),
         $this->fakeModel(28, 284, 8)
-      ]), [ [
+      ]), [[
                                         'behavior_id' => 280,
                     'category_id' => 8,
                                         'user_bhvr_id' => 7,

site/tests/unit/models/ChangeEmailFormTest.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 
     public function testChangeEmail()
     {
-        $this->specify('changeEmail() should return true and do nothing when the email is already taken', function () {
+        $this->specify('changeEmail() should return true and do nothing when the email is already taken', function() {
             $user = $this->getUser();
             $user
         ->expects($this->never())
@@ -41,7 +41,7 @@ 
             $this->assertNotEquals($user->desired_email, $desired_email);
         });
 
-        $this->specify('changeEmail() should return true, set values, and send an email when the email is available', function () {
+        $this->specify('changeEmail() should return true, set values, and send an email when the email is available', function() {
             $user = $this->getUser();
             $desired_email = 'new_email@email.com';
             $user

site/tests/unit/models/EditProfileFormTest.php

Spacing +3 added lines, -3 removed lines

@@ -57,15 +57,15 @@
 
         // Set up dependency injections
         Yii::$container
-      ->set(\common\interfaces\TimeInterface::class, function () {
+      ->set(\common\interfaces\TimeInterface::class, function() {
           return new \common\components\Time('UTC');
       });
         Yii::$container
-      ->set(\common\components\Graph::class, function () {
+      ->set(\common\components\Graph::class, function() {
           return $this->graph;
       });
         Yii::$container
-      ->set(\common\interfaces\UserBehaviorInterface::class, function () {
+      ->set(\common\interfaces\UserBehaviorInterface::class, function() {
           return new FakeUserBehavior();
       });
 

site/tests/unit/models/DeleteAccountFormTest.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 
     public function testDeleteAccount()
     {
-        $this->specify('deleteAccount() should return false if the form does not validate', function () {
+        $this->specify('deleteAccount() should return false if the form does not validate', function() {
             $user = $this->getUser();
             $user
         ->expects($this->never())
@@ -37,7 +37,7 @@ 
             $this->assertFalse($form->deleteAccount(), 'deleteAccount should not be successful');
         });
 
-        $this->specify('deleteAccount() should return false if the user\'s password is incorrect', function () {
+        $this->specify('deleteAccount() should return false if the user\'s password is incorrect', function() {
             $user = $this->getUser();
             $user
         ->expects($this->never())
@@ -48,7 +48,7 @@ 
             $this->assertFalse($form->deleteAccount(), 'deleteAccount should not be successful');
         });
 
-        $this->specify('deleteAccount() should return true, send a notification email, and delete the user when the form validates and the user\'s password is correct', function () {
+        $this->specify('deleteAccount() should return true, send a notification email, and delete the user when the form validates and the user\'s password is correct', function() {
             $password = 'password';
             $user = $this->getUser();
             $user->email = 'user@example.com';

site/tests/unit/models/CheckinFormTest.php

Spacing +19 added lines, -19 removed lines

@@ -118,7 +118,7 @@ 
     {
         $this->container = new \yii\di\Container;
         $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
             return new \common\components\Time('America/Los_Angeles');
         });
         parent::setUp();
@@ -126,7 +126,7 @@ 
 
     public function testAttributeLabels()
     {
-        $this->specify('attributeLabels should function properly', function () {
+        $this->specify('attributeLabels should function properly', function() {
             $model = $this->container->get('\site\models\CheckinForm');
             expect('attributeLabels should be correct', $this->assertEquals([
             'behaviors1' => 'Restoration',
@@ -142,32 +142,32 @@ 
 
     public function testSetBehaviors()
     {
-        $this->specify('setBehaviors should function properly', function () {
+        $this->specify('setBehaviors should function properly', function() {
             $model = $this->container->get('\site\models\CheckinForm');
 
             $model->setBehaviors($this->behaviors);
-            expect('behaviors1 should be correct', $this->assertEquals([ 0 => 7 ], $model->behaviors1));
-            expect('behaviors2 should be correct', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2));
-            expect('behaviors3 should be correct', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3));
-            expect('behaviors4 should be correct', $this->assertEquals([ 0 => 47, 1 => 56, 2 => 62 ], $model->behaviors4));
-            expect('behaviors5 should be correct', $this->assertEquals([ 0 => 78, 1 => 79 ], $model->behaviors5));
-            expect('behaviors6 should be correct', $this->assertEquals([ 0 => 104 ], $model->behaviors6));
-            expect('behaviors7 should be correct', $this->assertEquals([ 0 => 128 ], $model->behaviors7));
+            expect('behaviors1 should be correct', $this->assertEquals([0 => 7], $model->behaviors1));
+            expect('behaviors2 should be correct', $this->assertEquals([0 => 12, 1 => 13, 2 => 17, 3 => 18], $model->behaviors2));
+            expect('behaviors3 should be correct', $this->assertEquals([0 => 28, 1 => 38, 2 => 46], $model->behaviors3));
+            expect('behaviors4 should be correct', $this->assertEquals([0 => 47, 1 => 56, 2 => 62], $model->behaviors4));
+            expect('behaviors5 should be correct', $this->assertEquals([0 => 78, 1 => 79], $model->behaviors5));
+            expect('behaviors6 should be correct', $this->assertEquals([0 => 104], $model->behaviors6));
+            expect('behaviors7 should be correct', $this->assertEquals([0 => 128], $model->behaviors7));
 
             $model->setBehaviors($this->behaviors);
-            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 7 ], $model->behaviors1));
-            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 12, 1 => 13, 2 => 17, 3 => 18 ], $model->behaviors2));
-            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 28, 1 => 38, 2 => 46 ], $model->behaviors3));
-            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 47, 1 => 56, 2 => 62 ], $model->behaviors4));
-            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 78, 1 => 79 ], $model->behaviors5));
-            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 104 ], $model->behaviors6));
-            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([ 0 => 128 ], $model->behaviors7));
+            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 7], $model->behaviors1));
+            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 12, 1 => 13, 2 => 17, 3 => 18], $model->behaviors2));
+            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 28, 1 => 38, 2 => 46], $model->behaviors3));
+            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 47, 1 => 56, 2 => 62], $model->behaviors4));
+            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 78, 1 => 79], $model->behaviors5));
+            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 104], $model->behaviors6));
+            expect('setBehaviors should not append behaviors to existing ones', $this->assertEquals([0 => 128], $model->behaviors7));
         });
     }
 
     public function testValidateBehaviors()
     {
-        $this->specify('validateBehaviors should function properly', function () {
+        $this->specify('validateBehaviors should function properly', function() {
             $model = $this->container->get('\site\models\CheckinForm');
             $model->setBehaviors($this->behaviors);
             expect('validation should be good', $this->assertTrue($model->validate()));
@@ -215,7 +215,7 @@ 
 
         $model = $this->container->get('\site\models\CheckinForm');
         $model->custom_behaviors = [];
-        $model->compiled_behaviors = [ 1, 2, 3];
+        $model->compiled_behaviors = [1, 2, 3];
         expect('to return an empty array if no custom behaviors are set', $this->assertEquals([], $model->getCustomBehaviors()));
     }
 

site/tests/unit/models/SignupFormTest.php

Spacing +9 added lines, -9 removed lines

@@ -33,13 +33,13 @@ 
         $this->container = new \yii\di\Container;
         $this->container->set('common\interfaces\UserInterface', '\site\tests\_support\MockUser');
         $this->container->set('common\interfaces\UserBehaviorInterface', '\site\tests\_support\MockUserBehavior');
-        $this->container->set('common\interfaces\TimeInterface', function () {
+        $this->container->set('common\interfaces\TimeInterface', function() {
             return new \common\components\Time('America/Los_Angeles');
         });
 
         // instantiate mock objects
         $user_behavior = $this->container->get(\common\interfaces\UserBehaviorInterface::class);
-        $time        = $this->container->get(\common\interfaces\TimeInterface::class);
+        $time = $this->container->get(\common\interfaces\TimeInterface::class);
 
         $question = $this->getMockBuilder(\common\models\Question::class)
       ->setMethods(['save', 'attributes'])
@@ -111,7 +111,7 @@ 
 
     // set up a side effect to occur when the user's save() function is called
         $saved = false;
-        $this->user->method('save')->will($this->returnCallback(function ($runValidation=true, $attributeNames=null) use (&$saved) {
+        $this->user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use (&$saved) {
             $saved = true;
             return $this->user;
         }));
@@ -120,7 +120,7 @@ 
 
         /////////////////////////////////////////////////////////////////////
 
-        $this->specify('a brand-new user should be able to sign up', function () use ($form, &$saved) {
+        $this->specify('a brand-new user should be able to sign up', function() use ($form, &$saved) {
             expect('the form should validate correctly', $this->assertTrue($form->validate()));
             $user = $form->signup();
             expect(
@@ -146,7 +146,7 @@ 
     public function testSignupExistingConfirmedUser()
     {
         $saved = false;
-        $this->existing_user->method('save')->will($this->returnCallback(function ($runValidation=true, $attributeNames=null) use (&$saved) {
+        $this->existing_user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use (&$saved) {
             $saved = true;
             return $this->existing_user;
         }));
@@ -155,7 +155,7 @@ 
         $this->existing_user->verify_email_token = $this->getValidToken() . "_confirmed";
         $form2 = $this->getForm();
 
-        $this->specify('an existing and confirmed user should not be signed up', function () use ($form2, &$saved) {
+        $this->specify('an existing and confirmed user should not be signed up', function() use ($form2, &$saved) {
             expect('the form should validate correctly', $this->assertTrue($form2->validate()));
             $user = $form2->signup();
             expect('when the user exists and is confirmed, signup() should return null', $this->assertNull($user));
@@ -166,7 +166,7 @@ 
     public function testSignupExistingUnconfirmedUser()
     {
         $saved = false;
-        $this->existing_user->method('save')->will($this->returnCallback(function ($runValidation=true, $attributeNames=null) use (&$saved) {
+        $this->existing_user->method('save')->will($this->returnCallback(function($runValidation = true, $attributeNames = null) use (&$saved) {
             $saved = true;
             return $this->existing_user;
         }));
@@ -179,7 +179,7 @@ 
         $this->user->method('findByEmail')->willReturn($this->existing_user);
         $form3 = $this->getForm();
 
-        $this->specify('an existing and unconfirmed user should be able to sign up again, but their information will be UPDATED', function () use ($form3, &$saved) {
+        $this->specify('an existing and unconfirmed user should be able to sign up again, but their information will be UPDATED', function() use ($form3, &$saved) {
             expect('the form should validate correctly', $this->assertTrue($form3->validate()));
             $user = $form3->signup();
             expect('This user should not be an isNewRecord -- they should already exist', $this->assertFalse($user->getIsNewRecord()));
@@ -199,7 +199,7 @@ 
         $form = $this->setAttrs($form, $this->vals);
 
         $result = $form->setFields($this->user);
-        $this->specify('populate should set the values of the user model from the form', function () use ($result) {
+        $this->specify('populate should set the values of the user model from the form', function() use ($result) {
             foreach ($this->whitelist as $attr) {
                 $this->assertEquals($this->vals[$attr], $result->$attr);
             }

site/views/site/signup.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,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() ?>