Merge pull request #6850 from ddevsr/cache-time-class

codeigniter4 · Nov 14, 2022 · 49aeab2 · 49aeab2
2 parents c8d53af + 4c3dfc2
commit 49aeab2
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 14 deletions.
diff --git a/deptrac.yaml b/deptrac.yaml
@@ -155,6 +155,8 @@ parameters:
     API:
       - Format
       - HTTP
+    Cache:
+      - I18n
     Controller:
       - HTTP
       - Validation

diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\Cache\Exceptions\CacheException;
+use CodeIgniter\I18n\Time;
 use Config\Cache;
 use Throwable;
 
@@ -91,7 +92,7 @@ public function save(string $key, $value, int $ttl = 60)
         $key = static::validateKey($key, $this->prefix);
 
         $contents = [
-            'time' => time(),
+            'time' => Time::now()->getTimestamp(),
             'ttl'  => $ttl,
             'data' => $value,
         ];

diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\Exceptions\CriticalError;
+use CodeIgniter\I18n\Time;
 use Config\Cache;
 use Exception;
 use Memcache;
@@ -155,7 +156,7 @@ public function save(string $key, $value, int $ttl = 60)
         if (! $this->config['raw']) {
             $value = [
                 $value,
-                time(),
+                Time::now()->getTimestamp(),
                 $ttl,
             ];
         }

diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\Exceptions\CriticalError;
+use CodeIgniter\I18n\Time;
 use Config\Cache;
 use Exception;
 use Predis\Client;
@@ -128,7 +129,7 @@ public function save(string $key, $value, int $ttl = 60)
         }
 
         if ($ttl) {
-            $this->redis->expireat($key, time() + $ttl);
+            $this->redis->expireat($key, Time::now()->getTimestamp() + $ttl);
         }
 
         return true;
@@ -204,11 +205,11 @@ public function getMetaData(string $key)
         $data = array_combine(['__ci_value'], $this->redis->hmget($key, ['__ci_value']));
 
         if (isset($data['__ci_value']) && $data['__ci_value'] !== false) {
-            $time = time();
+            $time = Time::now()->getTimestamp();
             $ttl  = $this->redis->ttl($key);
 
             return [
-                'expire' => $ttl > 0 ? time() + $ttl : null,
+                'expire' => $ttl > 0 ? $time + $ttl : null,
                 'mtime'  => $time,
                 'data'   => $data['__ci_value'],
             ];

diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\Exceptions\CriticalError;
+use CodeIgniter\I18n\Time;
 use Config\Cache;
 use Redis;
 use RedisException;
@@ -154,7 +155,7 @@ public function save(string $key, $value, int $ttl = 60)
         }
 
         if ($ttl) {
-            $this->redis->expireAt($key, time() + $ttl);
+            $this->redis->expireAt($key, Time::now()->getTimestamp() + $ttl);
         }
 
         return true;
@@ -236,11 +237,11 @@ public function getMetaData(string $key)
         $value = $this->get($key);
 
         if ($value !== null) {
-            $time = time();
+            $time = Time::now()->getTimestamp();
             $ttl  = $this->redis->ttl($key);
 
             return [
-                'expire' => $ttl > 0 ? time() + $ttl : null,
+                'expire' => $ttl > 0 ? $time + $ttl : null,
                 'mtime'  => $time,
                 'data'   => $value,
             ];

diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Cache\Handlers;
 
+use CodeIgniter\I18n\Time;
 use Config\Cache;
 use Exception;
 
@@ -124,7 +125,7 @@ public function getMetaData(string $key)
             $hitcount = $stored['ucache_entries'][1]['hitcount'];
 
             return [
-                'expire'   => $ttl > 0 ? time() + $ttl : null,
+                'expire'   => $ttl > 0 ? Time::now()->getTimestamp() + $ttl : null,
                 'hitcount' => $hitcount,
                 'age'      => $age,
                 'ttl'      => $ttl,

diff --git a/tests/system/Cache/Handlers/AbstractHandlerTest.php b/tests/system/Cache/Handlers/AbstractHandlerTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Cache\Handlers;
 
+use CodeIgniter\I18n\Time;
 use CodeIgniter\Test\CIUnitTestCase;
 
 /**
@@ -31,7 +32,7 @@ public function testGetMetaDataMiss()
 
     public function testGetMetaData()
     {
-        $time = time();
+        $time = Time::now()->getTimestamp();
         $this->handler->save(self::$key1, 'value');
 
         $actual = $this->handler->getMetaData(self::$key1);

diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Cache\Exceptions\CacheException;
 use CodeIgniter\CLI\CLI;
+use CodeIgniter\I18n\Time;
 use Config\Cache;
 
 /**
@@ -156,7 +157,7 @@ public function testSavePermanent()
         $metaData = $this->handler->getMetaData(self::$key1);
 
         $this->assertNull($metaData['expire']);
-        $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+        $this->assertLessThanOrEqual(1, $metaData['mtime'] - Time::now()->getTimestamp());
         $this->assertSame('value', $metaData['data']);
 
         $this->assertTrue($this->handler->delete(self::$key1));

diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
+use CodeIgniter\I18n\Time;
 use Config\Cache;
 use Exception;
 
@@ -105,7 +106,7 @@ public function testSavePermanent()
         $metaData = $this->handler->getMetaData(self::$key1);
 
         $this->assertNull($metaData['expire']);
-        $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+        $this->assertLessThanOrEqual(1, $metaData['mtime'] - Time::now()->getTimestamp());
         $this->assertSame('value', $metaData['data']);
 
         $this->assertTrue($this->handler->delete(self::$key1));

diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
+use CodeIgniter\I18n\Time;
 use Config\Cache;
 
 /**
@@ -108,7 +109,7 @@ public function testSavePermanent()
         $metaData = $this->handler->getMetaData(self::$key1);
 
         $this->assertNull($metaData['expire']);
-        $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+        $this->assertLessThanOrEqual(1, $metaData['mtime'] - Time::now()->getTimestamp());
         $this->assertSame('value', $metaData['data']);
 
         $this->assertTrue($this->handler->delete(self::$key1));

diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
+use CodeIgniter\I18n\Time;
 use Config\Cache;
 
 /**
@@ -112,7 +113,7 @@ public function testSavePermanent()
         $metaData = $this->handler->getMetaData(self::$key1);
 
         $this->assertNull($metaData['expire']);
-        $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+        $this->assertLessThanOrEqual(1, $metaData['mtime'] - Time::now()->getTimestamp());
         $this->assertSame('value', $metaData['data']);
 
         $this->assertTrue($this->handler->delete(self::$key1));