Cache WIP

src/Cache/Cache.php

@@ -2,10 +2,12 @@
 
 namespace Detection\Cache;
 
+use DateTime;
 use Psr\SimpleCache\CacheInterface;
 
 /**
- * Generic implementation of a cache system using an associative array.
+ * Generic implementation of a Simple Cache system using an associative array.
+ * The cache items are PSR-6 compatible.
  */
 class Cache implements CacheInterface
 {
@@ -47,7 +49,9 @@ public function set(string $key, mixed $value, \DateInterval|int|null $ttl = nul
         if (empty($key)) {
             throw new CacheException('Invalid cache key');
         }
-        $item = new CacheItem($key, $value, $ttl);
+        $item = new CacheItem($key, $value);
+        $item->expiresAt($ttl);
+        $item->expiresAfter($ttl);
         $this->cache_db[$key] = $item;
         return true;
     }

src/Cache/CacheItem.php

@@ -2,6 +2,9 @@
 
 namespace Detection\Cache;
 
+use DateInterval;
+use DateTime;
+use DateTimeInterface;
 use Psr\Cache\CacheItemInterface;
 
 /**
@@ -18,14 +21,23 @@ class CacheItem implements CacheItemInterface
      * @var bool|null Mobile Detect only needs to store booleans (e.g. "isMobile" => true)
      */
     protected bool|null $value = null;
-    protected int|null $ttl = 0;
-    public function __construct($key, $value = null, $ttl = null)
+    /**
+     * @var DateTimeInterface|null
+     */
+    public DateTimeInterface|null $expiresAt = null;
+    /**
+     * @var DateInterval|null
+     */
+    public DateInterval|null $expiresAfter = null;
+
+    public function __construct($key, $value = null, $expiresAt = null, $expiresAfter = null)
     {
         $this->key = $key;
         if (!is_null($value)) {
             $this->value = $value;
         }
-        $this->ttl = $ttl;
+        $this->expiresAt = $expiresAt;
+        $this->expiresAfter = $expiresAfter;
     }
 
     public function getKey(): string
@@ -43,23 +55,47 @@ public function set($value): void
         $this->value = $value;
     }
 
-    public function getTtl(): int|null
+    public function isHit(): bool
     {
-        return $this->ttl;
-    }
+        // Item never expires.
+        if ($this->expiresAt === null) {
+            return true;
+        }
 
-    public function isHit()
-    {
-        // TODO: Implement isHit() method.
+        if ($this->expiresAt > new DateTime()) {
+            return true;
+        }
+
+        return false;
     }
 
-    public function expiresAt($expiration)
+    public function expiresAt($expiration): void
     {
-        // TODO: Implement expiresAt() method.
+        $expiresAt = null;
+
+        if ($expiration instanceof \DateInterval) {
+            $expiresAt = (new DateTime())->add($expiration);
+        } elseif (is_int($expiration)) {
+            if ($expiration > 0) {
+                $expiresAt = new DateTime("{$expiration} seconds");
+            }
+        }
+
+        $this->expiresAt = $expiresAt;
     }
 
-    public function expiresAfter($time)
+    public function expiresAfter($time): void
     {
-        // TODO: Implement expiresAfter() method.
+        $expiresAfter = null;
+
+        if ($time instanceof \DateInterval) {
+            $expiresAfter = $time;
+        } elseif (is_int($time)) {
+            if ($time > 0) {
+                $expiresAfter = new \DateInterval("PT{$time}S");
+            }
+        }
+
+        $this->expiresAfter = $expiresAfter;
     }
 }

tests/CacheTest.php

@@ -57,17 +57,26 @@ public function testGetTTL0()
     {
         $this->cache->set('isMobile', true, 0);
         $this->assertInstanceOf(CacheItem::class, $this->cache->get('isMobile'));
-        $this->assertEquals(0, $this->cache->get('isMobile')->getTtl());
+        $this->assertNull($this->cache->get('isMobile')->expiresAt);
+        $this->assertNull($this->cache->get('isMobile')->expiresAfter);
+    }
+
+    public function testGetTtlIsInteger()
+    {
+        $this->cache->set('isMobile', true, 1000);
+        $this->assertInstanceOf(CacheItem::class, $this->cache->get('isMobile'));
+        $this->assertInstanceOf(\DateTime::class, $this->cache->get('isMobile')->expiresAt);
+        $this->assertInstanceOf(\DateInterval::class, $this->cache->get('isMobile')->expiresAfter);
     }
 
     /**
      * @throws CacheException
      */
-    public function testGetTTLNull()
+    public function testGetExpiresAfter()
     {
         $this->cache->set('isMobile', true);
         $this->assertInstanceOf(CacheItem::class, $this->cache->get('isMobile'));
-        $this->assertNull($this->cache->get('isMobile')->getTtl());
+        $this->assertNull($this->cache->get('isMobile')->expiresAfter);
     }
 
     /**