Fix TTL

Author: byjg

.github/workflows/phpunit.yml

@@ -16,12 +16,10 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - "8.2"
           - "8.1"
           - "8.0"
           - "7.4"
-          - "7.3"
-          - "7.2"
-          - "7.1"
 
     # Service containers to run 
     services:

composer.json

@@ -7,7 +7,7 @@
     }
   },
   "require": {
-    "php": ">=7.0",
+    "php": ">=7.4",
     "psr/cache": "^1.0",
     "psr/log": "^1.1",
     "psr/simple-cache": "^1.0"

src/Psr16/ArrayCacheEngine.php

@@ -2,6 +2,7 @@
 
 namespace ByJG\Cache\Psr16;
 
+use DateInterval;
 use Psr\Log\NullLogger;
 
 class ArrayCacheEngine extends BaseCacheEngine
@@ -67,13 +68,12 @@ public function get($key, $default = null)
      *
      * @param string                $key   The key of the item to store.
      * @param mixed                 $value The value of the item to store, must be serializable.
-     * @param null|int|\DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
+     * @param null|int|DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
      *                                     the driver supports TTL then the library may set a default value
      *                                     for it or let the driver take care of that.
      *
      * @return bool True on success and false on failure.
      *
-     * @throws \Psr\SimpleCache\InvalidArgumentException
      *   MUST be thrown if the $key string is not a legal value.
      */
     public function set($key, $value, $ttl = null)

src/Psr16/BaseCacheEngine.php

@@ -4,6 +4,8 @@
 
 use ByJG\Cache\CacheAvailabilityInterface;
 use ByJG\Cache\Exception\InvalidArgumentException;
+use DateInterval;
+use DateTime;
 use Psr\SimpleCache\CacheInterface;
 
 abstract class BaseCacheEngine implements CacheInterface, CacheAvailabilityInterface
@@ -59,12 +61,25 @@ protected function addToNow($ttl)
             return strtotime("+$ttl second");
         }
 
-        if ($ttl instanceof \DateInterval) {
-            $now = new \DateTime();
+        if ($ttl instanceof DateInterval) {
+            $now = new DateTime();
             $now->add($ttl);
             return $now->getTimestamp();
         }
 
         return null;
     }
+
+    protected function convertToSeconds($ttl)
+    {
+        if (empty($ttl) || is_numeric($ttl)) {
+            return $ttl;
+        }
+
+        if ($ttl instanceof DateInterval) {
+            return $ttl->days*86400 + $ttl->h*3600 + $ttl->i*60 + $ttl->s;
+        }
+
+        throw new InvalidArgumentException('Invalid TTL');
+    }
 }

src/Psr16/FileSystemCacheEngine.php

@@ -3,6 +3,7 @@
 namespace ByJG\Cache\Psr16;
 
 use ByJG\Cache\CacheLockInterface;
+use DateInterval;
 use Exception;
 use Psr\Log\NullLogger;
 
@@ -69,13 +70,12 @@ public function get($key, $default = null)
      *
      * @param string                $key   The key of the item to store.
      * @param mixed                 $value The value of the item to store, must be serializable.
-     * @param null|int|\DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
+     * @param null|int|DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
      *                                     the driver supports TTL then the library may set a default value
      *                                     for it or let the driver take care of that.
      *
      * @return bool True on success and false on failure.
      *
-     * @throws \Psr\SimpleCache\InvalidArgumentException
      *   MUST be thrown if the $key string is not a legal value.
      */
     public function set($key, $value, $ttl = null)

src/Psr16/MemcachedEngine.php

@@ -3,6 +3,7 @@
 namespace ByJG\Cache\Psr16;
 
 use ByJG\Cache\Exception\StorageErrorException;
+use DateInterval;
 use Memcached;
 use Psr\Log\NullLogger;
 
@@ -78,15 +79,17 @@ public function get($key, $default = null)
 
     /**
      * @param string $key The object Key
-     * @param object $value The object to be cached
-     * @param int $ttl The time to live in seconds of this objects
+     * @param mixed $value The object to be cached
+     * @param DateInterval|int|null $ttl The time to live in seconds of this objects
      * @return bool If the object is successfully posted
      * @throws StorageErrorException
      */
     public function set($key, $value, $ttl = null)
     {
         $this->lazyLoadMemCachedServers();
 
+        $ttl = $this->convertToSeconds($ttl);
+
         $this->memCached->set($this->fixKey($key), serialize($value), is_null($ttl) ? 0 : $ttl);
         $this->logger->info("[Memcached] Set '$key' result " . $this->memCached->getResultCode());
         if ($this->memCached->getResultCode() !== Memcached::RES_SUCCESS) {

src/Psr16/RedisCacheEngine.php

@@ -79,6 +79,8 @@ public function set($key, $value, $ttl = null)
     {
         $this->lazyLoadRedisServer();
 
+        $ttl = $this->convertToSeconds($ttl);
+
         $this->redis->set($this->fixKey($key), serialize($value), $ttl);
         $this->logger->info("[Redis Cache] Set '$key' result ");
 
@@ -98,7 +100,7 @@ public function clear()
     {
         $keys = $this->redis->keys('cache:*');
         foreach ((array)$keys as $key) {
-            if (preg_match('/^cache\:(?<key>.*)/', $key, $matches)) {
+            if (preg_match('/^cache:(?<key>.*)/', $key, $matches)) {
                 $this->delete($matches['key']);
             }
         }