Merge pull request #4875 from michalsn/fix/cache-handlers

Fix bug with respecting TTL in Predis and File cache
codeigniter4 · Jun 27, 2021 · 85cd690 · 85cd690
2 parents f072c86 + 639cf77
commit 85cd690
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 4 deletions.
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
@@ -278,7 +278,7 @@ public function getMetaData(string $key)
  }
 
  return [
- 'expire' => $data['time'] + $data['ttl'],
+ 'expire' => $data['ttl'] > 0 ? $data['time'] + $data['ttl'] : null,
  'mtime' => filemtime($this->path . $key),
  'data' => $data['data'],
  ];

diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
@@ -158,7 +158,9 @@ public function save(string $key, $value, int $ttl = 60)
  return false;
  }
 
- $this->redis->expireat($key, time() + $ttl);
+ if ($ttl) {
+ $this->redis->expireat($key, time() + $ttl);
+ }
 
  return true;
  }

diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -144,6 +144,18 @@ public function testSaveExcessiveKeyLength()
  unlink($file);
  }
 
+ public function testSavePermanent()
+ {
+ $this->assertTrue($this->fileHandler->save(self::$key1, 'value', 0));
+ $metaData = $this->fileHandler->getMetaData(self::$key1);
+
+ $this->assertSame(null, $metaData['expire']);
+ $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+ $this->assertSame('value', $metaData['data']);
+
+ $this->assertTrue($this->fileHandler->delete(self::$key1));
+ }
+
  public function testDelete()
  {
  $this->fileHandler->save(self::$key1, 'value');

diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -90,6 +90,18 @@ public function testSave()
  $this->assertTrue($this->memcachedHandler->save(self::$key1, 'value'));
  }
 
+ public function testSavePermanent()
+ {
+ $this->assertTrue($this->memcachedHandler->save(self::$key1, 'value', 0));
+ $metaData = $this->memcachedHandler->getMetaData(self::$key1);
+
+ $this->assertSame(null, $metaData['expire']);
+ $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+ $this->assertSame('value', $metaData['data']);
+
+ $this->assertTrue($this->memcachedHandler->delete(self::$key1));
+ }
+
  public function testDelete()
  {
  $this->memcachedHandler->save(self::$key1, 'value');

diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -50,10 +50,10 @@ public function testNew()
 
  public function testDestruct()
  {
- $this->PredisHandler = new PRedisHandler($this->config);
+ $this->PredisHandler = new PredisHandler($this->config);
  $this->PredisHandler->initialize();
 
- $this->assertInstanceOf(PRedisHandler::class, $this->PredisHandler);
+ $this->assertInstanceOf(PredisHandler::class, $this->PredisHandler);
  }
 
  /**
@@ -97,6 +97,18 @@ public function testSave()
  $this->assertTrue($this->PredisHandler->save(self::$key1, 'value'));
  }
 
+ public function testSavePermanent()
+ {
+ $this->assertTrue($this->PredisHandler->save(self::$key1, 'value', 0));
+ $metaData = $this->PredisHandler->getMetaData(self::$key1);
+
+ $this->assertSame(null, $metaData['expire']);
+ $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+ $this->assertSame('value', $metaData['data']);
+
+ $this->assertTrue($this->PredisHandler->delete(self::$key1));
+ }
+
  public function testDelete()
  {
  $this->PredisHandler->save(self::$key1, 'value');

diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -97,6 +97,18 @@ public function testSave()
  $this->assertTrue($this->redisHandler->save(self::$key1, 'value'));
  }
 
+ public function testSavePermanent()
+ {
+ $this->assertTrue($this->redisHandler->save(self::$key1, 'value', 0));
+ $metaData = $this->redisHandler->getMetaData(self::$key1);
+
+ $this->assertSame(null, $metaData['expire']);
+ $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+ $this->assertSame('value', $metaData['data']);
+
+ $this->assertTrue($this->redisHandler->delete(self::$key1));
+ }
+
  public function testDelete()
  {
  $this->redisHandler->save(self::$key1, 'value');