Merge pull request #6880 from ping-yee/refactor-time

refactor: replace `time()` with Time into `Cache`, `Database` and `Test` class.

Author: kenjis

deptrac.yaml

@@ -165,6 +165,7 @@ parameters:
     Database:
       - Entity
       - Events
+      - I18n
     Email:
       - I18n
       - Events

phpstan-baseline.neon.dist

@@ -41,7 +41,7 @@ parameters:
 			path: system/Cache/CacheFactory.php
 
 		-
-			message: "#^Comparison operation \"\\>\" between int\\<1, max\\> and \\(array\\|float\\|int\\) results in an error\\.$#"
+			message: "#^Comparison operation \"\\>\" between int and \\(array\\|float\\|int\\) results in an error\\.$#"
 			count: 1
 			path: system/Cache/Handlers/FileHandler.php
 

system/Cache/Handlers/FileHandler.php

@@ -242,7 +242,7 @@ protected function getItem(string $filename)
             return false;
         }
 
-        if ($data['ttl'] > 0 && time() > $data['time'] + $data['ttl']) {
+        if ($data['ttl'] > 0 && Time::now()->getTimestamp() > $data['time'] + $data['ttl']) {
             // If the file is still there then try to remove it
             if (is_file($this->path . $filename)) {
                 @unlink($this->path . $filename);

system/Database/MigrationRunner.php

@@ -14,6 +14,7 @@
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\ConfigException;
+use CodeIgniter\I18n\Time;
 use Config\Database;
 use Config\Migrations as MigrationsConfig;
 use Config\Services;
@@ -596,7 +597,7 @@ protected function addHistory($migration, int $batch)
             'class'     => $migration->class,
             'group'     => $this->group,
             'namespace' => $migration->namespace,
-            'time'      => time(),
+            'time'      => Time::now()->getTimestamp(),
             'batch'     => $batch,
         ]);
 

system/Test/Fabricator.php

@@ -12,6 +12,7 @@
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Exceptions\FrameworkException;
+use CodeIgniter\I18n\Time;
 use CodeIgniter\Model;
 use Faker\Factory;
 use Faker\Generator;
@@ -503,7 +504,7 @@ protected function createMock(?int $count = null)
                 break;
 
             default:
-                $datetime = time();
+                $datetime = Time::now()->getTimestamp();
         }
 
         // Determine which fields we will need

system/Test/Mock/MockCache.php

@@ -14,6 +14,7 @@
 use Closure;
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Cache\Handlers\BaseHandler;
+use CodeIgniter\I18n\Time;
 use PHPUnit\Framework\Assert;
 
 class MockCache extends BaseHandler implements CacheInterface
@@ -100,7 +101,7 @@ public function save(string $key, $value, int $ttl = 60, bool $raw = false)
         $key = static::validateKey($key, $this->prefix);
 
         $this->cache[$key]       = $value;
-        $this->expirations[$key] = $ttl > 0 ? time() + $ttl : null;
+        $this->expirations[$key] = $ttl > 0 ? Time::now()->getTimestamp() + $ttl : null;
 
         return true;
     }
@@ -221,7 +222,7 @@ public function getMetaData(string $key)
         }
 
         // Count expired items as a miss
-        if (is_int($this->expirations[$key]) && $this->expirations[$key] > time()) {
+        if (is_int($this->expirations[$key]) && $this->expirations[$key] > Time::now()->getTimestamp()) {
             return null;
         }
 

system/Test/Mock/MockSession.php

@@ -12,6 +12,7 @@
 namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\I18n\Time;
 use CodeIgniter\Session\Session;
 
 /**
@@ -56,7 +57,7 @@ protected function startSession()
      */
     protected function setCookie()
     {
-        $expiration   = $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration;
+        $expiration   = $this->sessionExpiration === 0 ? 0 : Time::now()->getTimestamp() + $this->sessionExpiration;
         $this->cookie = $this->cookie->withValue(session_id())->withExpires($expiration);
 
         $this->cookies[] = $this->cookie;
@@ -65,6 +66,6 @@ protected function setCookie()
     public function regenerate(bool $destroy = false)
     {
         $this->didRegenerate              = true;
-        $_SESSION['__ci_last_regenerate'] = time();
+        $_SESSION['__ci_last_regenerate'] = Time::now()->getTimestamp();
     }
 }

system/Test/TestResponse.php

@@ -14,6 +14,7 @@
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\I18n\Time;
 use Config\Services;
 use Exception;
 use PHPUnit\Framework\Constraint\IsEqual;
@@ -339,7 +340,7 @@ public function assertCookieMissing(string $key)
     public function assertCookieExpired(string $key, string $prefix = '')
     {
         $this->assertTrue($this->response->hasCookie($key, null, $prefix));
-        $this->assertGreaterThan(time(), $this->response->getCookie($key, $prefix)->getExpiresTimestamp());
+        $this->assertGreaterThan(Time::now()->getTimestamp(), $this->response->getCookie($key, $prefix)->getExpiresTimestamp());
     }
 
     // --------------------------------------------------------------------