CorWatts / fasterscale

common/tests/unit/components/TimeTest.php

Spacing +14 added lines, -14 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');
         });
 
@@ -47,7 +47,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")));
         });
@@ -55,13 +55,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');
@@ -74,14 +74,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');
@@ -94,7 +94,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")));
         });
@@ -102,7 +102,7 @@ 
 
     public function testAlterLocalDate()
     {
-        $this->specify('alterLocalDate should function correctly', function () {
+        $this->specify('alterLocalDate should function correctly', function() {
             expect('alterLocalDate should add one day to the local time', $this->assertEquals($this->time->alterLocalDate('2016-05-01 00:00:00', '+1 day'), (new DateTime("2016-05-01 00:00:00 +1 day"))->format("Y-m-d")));
             expect('alterLocalDate should subtract one week to the local time and change the year correctly', $this->assertEquals($this->time->alterLocalDate('2016-01-01 04:03:00', '-1 week'), (new DateTime("2016-01-01 04:03:00 -1 week"))->format("Y-m-d")));
         });
@@ -110,13 +110,13 @@ 
 
     public function testGetUTCBookends()
     {
-        $this->specify('getUTCBookends should function correctly', function () {
+        $this->specify('getUTCBookends should function correctly', function() {
             expect('getUTCBookends should return false if there is a space in the time string', $this->assertFalse($this->time->getUTCBookends('2016-05-30 00:00:00')));
             expect('getUTCBookends should return false if there is a space at the start of the time string', $this->assertFalse($this->time->getUTCBookends(' 2016-05-30 00:00:00')));
             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');
@@ -153,14 +153,14 @@ 
         expect('parse should return the default value (false) if the date is not in bounds', $this->assertFalse($observer2->parse('2016-05-05')));
         expect('parse should return the default value if the date is not in bounds', $this->assertEquals($observer2->now()->format('Y-m-d'), $observer2->parse('2016-05-05', $observer2->now())->format('Y-m-d')));
 
-        $this->specify('should all return false', function () {
+        $this->specify('should all return false', function() {
             expect('parse should return false if the date itself is empty', $this->assertFalse($this->time->parse('')));
             expect('parse should return false if the date itself is unacceptable or is in an unacceptable format', $this->assertFalse($this->time->parse('aaaa-aa-aa')));
             expect('parse should return false if the date is not in bounds', $this->assertFalse($this->time->parse('aaaa-aa-aa')));
             expect('parse should return false if the date itself is nonsensical', $this->assertFalse($this->time->parse('2018-22-44')));
         });
 
-        $this->specify('should still work fine with other timezones', function () {
+        $this->specify('should still work fine with other timezones', function() {
             $this->time->timezone = 'UTC';
             $good = new DateTime('2016-05-05', new DateTimeZone('UTC'));
             expect('parse should accept a String time and verify it is in YYYY-MM-DD format, then return it as a \DateTime', $this->assertEquals($this->time->parse('2016-05-05'), $good));
@@ -205,11 +205,11 @@ 
         $tz = 'America/Los_Angeles';
         $this->time->timezone = 'America/Los_Angeles';
 
-        $today =  new \DateTime("now + 1 day", new \DateTimeZone($tz)); // we do an extra day to include today as the last day
+        $today = new \DateTime("now + 1 day", new \DateTimeZone($tz)); // we do an extra day to include today as the last day
         $should_be_today = $this->time->getDateTimesInPeriod()->getEndDate();
         expect('getDateTimesInPeriod should return a list of \DatePeriods, the last being for today', $this->assertEquals($today->format('Y-m-d H'), $should_be_today->format('Y-m-d H')));
 
-        $start =  new \DateTime("30 days ago", new \DateTimeZone($tz));
+        $start = new \DateTime("30 days ago", new \DateTimeZone($tz));
         $should_be_start = $this->time->getDateTimesInPeriod()->getStartDate();
         expect('getDateTimesInPeriod should return a list of \DatePeriods, the first being for 30 days ago (by default)', $this->assertEquals($start->format('Y-m-d H'), $should_be_start->format('Y-m-d H')));
     }

common/tests/unit/models/UserBehaviorTest.php

Spacing +4 added lines, -4 removed lines

@@ -281,7 +281,7 @@ 
     public function setUp(): void
     {
         // 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'];
@@ -291,7 +291,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');
         });
 
@@ -461,8 +461,8 @@ 
                             ->setMethods(['getIsNewRecord', 'save', 'getBehaviorsWithCounts'])
                             ->getMock();
 
-        $bhvrs = require(__DIR__.'/../data/behaviorsWithCounts.php');
-        $expected = require(__DIR__.'/../data/expected_getCheckinBreakdown.php');
+        $bhvrs = require(__DIR__ . '/../data/behaviorsWithCounts.php');
+        $expected = require(__DIR__ . '/../data/expected_getCheckinBreakdown.php');
         $this->user_behavior->method('getBehaviorsWithCounts')->willReturn(...$bhvrs);
         expect('asdf', $this->assertEquals($expected, $this->user_behavior->getCheckinBreakdown()));
     }

common/tests/unit/models/LoginFormTest.php

Spacing +5 added lines, -5 removed lines

@@ -111,14 +111,14 @@ 
 
     public function testGetUser()
     {
-        $this->specify('getUser shougd function correctly', function () {
+        $this->specify('getUser shougd function correctly', function() {
             expect('getUser should return the user if the user attr on the form object is already set', $this->assertInstanceOf('\common\models\User', $this->form->getUser()));
         });
     }
 
     public function testValidatePassword()
     {
-        $this->specify('validatePassword should function correctly', function () {
+        $this->specify('validatePassword should function correctly', function() {
             expect('validatePassword should always return null', $this->assertNull($this->form->validatePassword()));
             expect('validatePassword should by default in this test class not set errors', $this->assertEmpty($this->form->getErrors()));
 
@@ -130,13 +130,13 @@ 
     }
     public function testLogin()
     {
-        $this->specify('login should function correctly', function () {
+        $this->specify('login should function correctly', function() {
             $this->form->email = 'hunter2@hunter2.com';
             $this->form->password = 'hunter2';
             expect('login should return true if able to log in user', $this->assertTrue($this->form->login()));
         });
 
-        $this->specify('login should fail if account is not verified', function () {
+        $this->specify('login should fail if account is not verified', function() {
             $this->user = $this->mockUser(['isVerified' => false]);
             $this->form = $this->mockForm($this->user);
             $this->form->email = 'hunter2@hunter2.com';
@@ -146,7 +146,7 @@ 
             expect('login should set a flash message if account is not verified', $this->assertNotEmpty(Yii::$app->session->getFlash('warning', null, true)));
         });
 
-        $this->specify('login should fail if credentials are not valid', function () {
+        $this->specify('login should fail if credentials are not valid', function() {
             $this->user = $this->mockUser(['validatePassword' => false]);
             $this->form = $this->mockForm($this->user);
             $this->form->email = 'hunter2@hunter2.com';

common/tests/unit/models/QuestionTest.php

Indentation +4 added lines, -4 removed lines

@@ -159,16 +159,16 @@
     public function setUp(): void
     {
         $this->question = $this->getMockBuilder('\common\models\Question')
-         ->setMethods(['save', 'attributes'])
-         ->getMock();
+          ->setMethods(['save', 'attributes'])
+          ->getMock();
     }
 
     public function testParseQuestionData()
     {
         $questions = array_map(function ($d) {
             $q = $this->getMockBuilder('\common\models\Question')
-         ->setMethods(['save', 'attributes'])
-         ->getMock();
+          ->setMethods(['save', 'attributes'])
+          ->getMock();
             $q->method('save')->willReturn(true);
             $q->method('attributes')
         ->willReturn([

Spacing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 
     public function testParseQuestionData()
     {
-        $questions = array_map(function ($d) {
+        $questions = array_map(function($d) {
             $q = $this->getMockBuilder('\common\models\Question')
          ->setMethods(['save', 'attributes'])
          ->getMock();

common/tests/unit/models/UserTest.php

Spacing +5 added lines, -5 removed lines

@@ -90,7 +90,7 @@ 
         $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');
         });
 
@@ -138,7 +138,7 @@ 
 
     public function testIsTokenCurrent()
     {
-        $this->specify('isTokenCurrent should function correctly', function () {
+        $this->specify('isTokenCurrent should function correctly', function() {
             $good_token = \Yii::$app
                       ->getSecurity()
                       ->generateRandomString() . '_' . time();
@@ -176,7 +176,7 @@ 
     {
         $this->user->verify_email_token = 'hello_world';
         $this->user->confirmVerifyEmailToken();
-        expect('confirmVerifyEmailToken should append User::CONFIRMED_STRING to the end of the verify_email_token property', $this->assertEquals($this->user->verify_email_token, 'hello_world'.$this->user::CONFIRMED_STRING));
+        expect('confirmVerifyEmailToken should append User::CONFIRMED_STRING to the end of the verify_email_token property', $this->assertEquals($this->user->verify_email_token, 'hello_world' . $this->user::CONFIRMED_STRING));
     }
 
     public function testIsVerified()
@@ -254,7 +254,7 @@ 
         'question2' => 'q2',
         'question3' => 'q3',
       ]
-    ], array_map(function ($row) {
+    ], array_map(function($row) {
         return $this->user->cleanExportRow($row);
     }, $this->exportData)));
     }
@@ -279,7 +279,7 @@ 
       ->disableOriginalConstructor()
       ->setMethods(['save', 'attributes', 'getCheckinBreakdown'])
       ->getMock();
-        $expected = require(__DIR__.'/../data/expected_getCheckinBreakdown.php');
+        $expected = require(__DIR__ . '/../data/expected_getCheckinBreakdown.php');
         $user_behavior->method('getCheckinBreakdown')->willReturn($expected);
 
         $user = $this->getMockBuilder(User::class)

common/config/main.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
       'common\interfaces\BehaviorInterface' => \common\models\Behavior::class,
       'common\interfaces\CategoryInterface' => \common\models\Category::class,
       'common\interfaces\CustomBehaviorInterface' => \common\models\CustomBehavior::class,
-      'common\interfaces\TimeInterface' => function () {
+      'common\interfaces\TimeInterface' => function() {
           if (Yii::$app->user->getIsGuest()) {
               return new \common\components\Time('UTC');
           } else {
@@ -30,7 +30,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' => [