Merge pull request #261 from kenjis/refactor-use-Time

refactor: use Time::now()

Author: kenjis

src/Authentication/Authenticators/Session.php

@@ -836,10 +836,9 @@ protected function rememberUser(User $user): void
 
     private function calcExpires(): string
     {
-        return date(
-            'Y-m-d H:i:s',
-            time() + setting('Auth.sessionConfig')['rememberLength']
-        );
+        $timestamp = Time::now()->getTimestamp() + setting('Auth.sessionConfig')['rememberLength'];
+
+        return Time::createFromTimestamp($timestamp)->format('Y-m-d H:i:s');
     }
 
     private function setRememberMeCookie(string $rawToken): void

src/Models/LoginModel.php

@@ -61,7 +61,7 @@ public function recordLoginAttempt(
             'id_type'    => $idType,
             'identifier' => $identifier,
             'user_id'    => $userId,
-            'date'       => date('Y-m-d H:i:s'),
+            'date'       => Time::now()->format('Y-m-d H:i:s'),
             'success'    => (int) $success,
         ]);
 

src/Models/UserIdentityModel.php

@@ -2,6 +2,7 @@
 
 namespace CodeIgniter\Shield\Models;
 
+use CodeIgniter\I18n\Time;
 use CodeIgniter\Model;
 use CodeIgniter\Shield\Authentication\Authenticators\AccessTokens;
 use CodeIgniter\Shield\Authentication\Authenticators\Session;
@@ -247,7 +248,7 @@ public function getIdentitiesByTypes(User $user, array $types): array
      */
     public function touchIdentity(UserIdentity $identity): void
     {
-        $identity->last_used_at = date('Y-m-d H:i:s');
+        $identity->last_used_at = Time::now()->format('Y-m-d H:i:s');
 
         $return = $this->save($identity);
 

tests/Authorization/AuthorizableTest.php

@@ -316,5 +316,6 @@ public function testCreatedAtIfDefaultLocaleSetFaWithAddGroup(): void
         ]);
 
         Locale::setDefault($currentLocale);
+        Time::setTestNow();
     }
 }

tests/Controllers/LoginTest.php

@@ -64,6 +64,8 @@ public function testLoginBadEmail(): void
 
     public function testLoginActionEmailSuccess(): void
     {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+
         $this->user->createEmailIdentity([
             'email'    => 'foo@example.com',
             'password' => 'secret123',
@@ -87,13 +89,15 @@ public function testLoginActionEmailSuccess(): void
         ]);
         // Last Used date should have been set
         $identity = $this->user->getEmailIdentity();
-        $this->assertCloseEnough($identity->last_used_at->getTimestamp(), Time::now()->getTimestamp());
+        $this->assertSame(Time::now()->getTimestamp(), $identity->last_used_at->getTimestamp());
 
         // Session should have `logged_in` value with user's id
         $this->assertSame($this->user->id, session('user')['id']);
+
+        Time::setTestNow();
     }
 
-    public function testAfterLoggedInNotDesplayLoginPage(): void
+    public function testAfterLoggedInNotDisplayLoginPage(): void
     {
         $this->user->createEmailIdentity([
             'email'    => 'foo@example.com',
@@ -111,6 +115,8 @@ public function testAfterLoggedInNotDesplayLoginPage(): void
 
     public function testLoginActionUsernameSuccess(): void
     {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+
         // Change the validation rules
         $config           = new class () extends Validation {
             public $login = [
@@ -143,10 +149,12 @@ public function testLoginActionUsernameSuccess(): void
         ]);
         // Last Used date should have been set
         $identity = $this->user->getEmailIdentity();
-        $this->assertCloseEnough($identity->last_used_at->getTimestamp(), Time::now()->getTimestamp());
+        $this->assertSame(Time::now()->getTimestamp(), $identity->last_used_at->getTimestamp());
 
         // Session should have `logged_in` value with user's id
         $this->assertSame($this->user->id, session('user')['id']);
+
+        Time::setTestNow();
     }
 
     public function testLogoutAction(): void