Skip to content

Commit 49aeab2

Browse files
MGatnerMGatner
authored
Merge pull request #6850 from ddevsr/cache-time-class
2 parents c8d53af + 4c3dfc2 commit 49aeab2

File tree

11 files changed

+26
-14
lines changed

11 files changed

+26
-14
lines changed

‎deptrac.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ parameters:
155155
API:
156156
- Format
157157
- HTTP
158+
Cache:
159+
- I18n
158160
Controller:
159161
- HTTP
160162
- Validation

‎system/Cache/Handlers/FileHandler.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\Cache\Handlers;
1313

1414
use CodeIgniter\Cache\Exceptions\CacheException;
15+
use CodeIgniter\I18n\Time;
1516
use Config\Cache;
1617
use Throwable;
1718

@@ -91,7 +92,7 @@ public function save(string $key, $value, int $ttl = 60)
9192
$key = static::validateKey($key, $this->prefix);
9293

9394
$contents = [
94-
'time' => time(),
95+
'time' => Time::now()->getTimestamp(),
9596
'ttl' => $ttl,
9697
'data' => $value,
9798
];

‎system/Cache/Handlers/MemcachedHandler.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\Cache\Handlers;
1313

1414
use CodeIgniter\Exceptions\CriticalError;
15+
use CodeIgniter\I18n\Time;
1516
use Config\Cache;
1617
use Exception;
1718
use Memcache;
@@ -155,7 +156,7 @@ public function save(string $key, $value, int $ttl = 60)
155156
if (! $this->config['raw']) {
156157
$value = [
157158
$value,
158-
time(),
159+
Time::now()->getTimestamp(),
159160
$ttl,
160161
];
161162
}

‎system/Cache/Handlers/PredisHandler.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\Cache\Handlers;
1313

1414
use CodeIgniter\Exceptions\CriticalError;
15+
use CodeIgniter\I18n\Time;
1516
use Config\Cache;
1617
use Exception;
1718
use Predis\Client;
@@ -128,7 +129,7 @@ public function save(string $key, $value, int $ttl = 60)
128129
}
129130

130131
if ($ttl) {
131-
$this->redis->expireat($key, time() + $ttl);
132+
$this->redis->expireat($key, Time::now()->getTimestamp() + $ttl);
132133
}
133134

134135
return true;
@@ -204,11 +205,11 @@ public function getMetaData(string $key)
204205
$data = array_combine(['__ci_value'], $this->redis->hmget($key, ['__ci_value']));
205206

206207
if (isset($data['__ci_value']) && $data['__ci_value'] !== false) {
207-
$time = time();
208+
$time = Time::now()->getTimestamp();
208209
$ttl = $this->redis->ttl($key);
209210

210211
return [
211-
'expire' => $ttl > 0 ? time() + $ttl : null,
212+
'expire' => $ttl > 0 ? $time + $ttl : null,
212213
'mtime' => $time,
213214
'data' => $data['__ci_value'],
214215
];

‎system/Cache/Handlers/RedisHandler.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\Cache\Handlers;
1313

1414
use CodeIgniter\Exceptions\CriticalError;
15+
use CodeIgniter\I18n\Time;
1516
use Config\Cache;
1617
use Redis;
1718
use RedisException;
@@ -154,7 +155,7 @@ public function save(string $key, $value, int $ttl = 60)
154155
}
155156

156157
if ($ttl) {
157-
$this->redis->expireAt($key, time() + $ttl);
158+
$this->redis->expireAt($key, Time::now()->getTimestamp() + $ttl);
158159
}
159160

160161
return true;
@@ -236,11 +237,11 @@ public function getMetaData(string $key)
236237
$value = $this->get($key);
237238

238239
if ($value !== null) {
239-
$time = time();
240+
$time = Time::now()->getTimestamp();
240241
$ttl = $this->redis->ttl($key);
241242

242243
return [
243-
'expire' => $ttl > 0 ? time() + $ttl : null,
244+
'expire' => $ttl > 0 ? $time + $ttl : null,
244245
'mtime' => $time,
245246
'data' => $value,
246247
];

‎system/Cache/Handlers/WincacheHandler.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace CodeIgniter\Cache\Handlers;
1313

14+
use CodeIgniter\I18n\Time;
1415
use Config\Cache;
1516
use Exception;
1617

@@ -124,7 +125,7 @@ public function getMetaData(string $key)
124125
$hitcount = $stored['ucache_entries'][1]['hitcount'];
125126

126127
return [
127-
'expire' => $ttl > 0 ? time() + $ttl : null,
128+
'expire' => $ttl > 0 ? Time::now()->getTimestamp() + $ttl : null,
128129
'hitcount' => $hitcount,
129130
'age' => $age,
130131
'ttl' => $ttl,

‎tests/system/Cache/Handlers/AbstractHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace CodeIgniter\Cache\Handlers;
1313

14+
use CodeIgniter\I18n\Time;
1415
use CodeIgniter\Test\CIUnitTestCase;
1516

1617
/**
@@ -31,7 +32,7 @@ public function testGetMetaDataMiss()
3132

3233
public function testGetMetaData()
3334
{
34-
$time = time();
35+
$time = Time::now()->getTimestamp();
3536
$this->handler->save(self::$key1, 'value');
3637

3738
$actual = $this->handler->getMetaData(self::$key1);

‎tests/system/Cache/Handlers/FileHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use CodeIgniter\Cache\Exceptions\CacheException;
1515
use CodeIgniter\CLI\CLI;
16+
use CodeIgniter\I18n\Time;
1617
use Config\Cache;
1718

1819
/**
@@ -156,7 +157,7 @@ public function testSavePermanent()
156157
$metaData = $this->handler->getMetaData(self::$key1);
157158

158159
$this->assertNull($metaData['expire']);
159-
$this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
160+
$this->assertLessThanOrEqual(1, $metaData['mtime'] - Time::now()->getTimestamp());
160161
$this->assertSame('value', $metaData['data']);
161162

162163
$this->assertTrue($this->handler->delete(self::$key1));

‎tests/system/Cache/Handlers/MemcachedHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\Cache\Handlers;
1313

1414
use CodeIgniter\CLI\CLI;
15+
use CodeIgniter\I18n\Time;
1516
use Config\Cache;
1617
use Exception;
1718

@@ -105,7 +106,7 @@ public function testSavePermanent()
105106
$metaData = $this->handler->getMetaData(self::$key1);
106107

107108
$this->assertNull($metaData['expire']);
108-
$this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
109+
$this->assertLessThanOrEqual(1, $metaData['mtime'] - Time::now()->getTimestamp());
109110
$this->assertSame('value', $metaData['data']);
110111

111112
$this->assertTrue($this->handler->delete(self::$key1));

‎tests/system/Cache/Handlers/PredisHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\Cache\Handlers;
1313

1414
use CodeIgniter\CLI\CLI;
15+
use CodeIgniter\I18n\Time;
1516
use Config\Cache;
1617

1718
/**
@@ -108,7 +109,7 @@ public function testSavePermanent()
108109
$metaData = $this->handler->getMetaData(self::$key1);
109110

110111
$this->assertNull($metaData['expire']);
111-
$this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
112+
$this->assertLessThanOrEqual(1, $metaData['mtime'] - Time::now()->getTimestamp());
112113
$this->assertSame('value', $metaData['data']);
113114

114115
$this->assertTrue($this->handler->delete(self::$key1));

‎tests/system/Cache/Handlers/RedisHandlerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\Cache\Handlers;
1313

1414
use CodeIgniter\CLI\CLI;
15+
use CodeIgniter\I18n\Time;
1516
use Config\Cache;
1617

1718
/**
@@ -112,7 +113,7 @@ public function testSavePermanent()
112113
$metaData = $this->handler->getMetaData(self::$key1);
113114

114115
$this->assertNull($metaData['expire']);
115-
$this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
116+
$this->assertLessThanOrEqual(1, $metaData['mtime'] - Time::now()->getTimestamp());
116117
$this->assertSame('value', $metaData['data']);
117118

118119
$this->assertTrue($this->handler->delete(self::$key1));

0 commit comments

Comments
 (0)