Adding symfony cache

composer.json

@@ -31,7 +31,7 @@
         "php": ">=8.0",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.3||^7.0",
-        "sabre/cache": "^1.0",
+        "symfony/cache": "^6.3",
         "symfony/http-foundation": "^6.2"
     },
     "require-dev": {

src/cache/DefaultCache.php

@@ -2,6 +2,10 @@
 
 namespace ipinfo\ipinfo\cache;
 
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Cache\ItemInterface;
+
 /**
  * Default implementation of the CacheInterface. Provides in-memory caching.
  */
@@ -14,9 +18,9 @@ class DefaultCache implements CacheInterface
     private $cache;
     private $element_queue;
 
-    public function __construct(int $maxsize, int $ttl)
+    public function __construct(FilesystemAdapter $cache, int $maxsize, int $ttl)
     {
-        $this->cache = new \Sabre\Cache\Memory();
+        $this->cache = $cache;
         $this->element_queue = array();
         $this->maxsize = $maxsize;
         $this->ttl = $ttl;
@@ -29,21 +33,30 @@ public function __construct(int $maxsize, int $ttl)
    */
     public function has(string $name)
     {
-        return $this->cache->has($name);
+        return $this->cache->get($name);
+    }
+
+    public function delete(string $name): bool
+    {
+        return $this->$cache->delete($name);
     }
 
+
   /**
    * Set the IP address key to the specified value.
    * @param string $ip_address IP address to cache data for.
    * @param mixed $value Data for specified IP address.
    */
     public function set(string $name, $value)
     {
-        if (!$this->cache->has($name)) {
-            $this->element_queue[] = $name;
-        }
-
-        $this->cache->set($name, $value, $this->ttl);
+        // The callable will only be executed on a cache miss.
+        $this->$cache->get($name, function (ItemInterface $item): string {
+            $item->expiresAfter($this->ttl);
+            // On chache miss update queue.
+            $this->$element_queue[] = $name;
+
+            return $value;
+        });
 
         $this->manageSize();
     }
@@ -53,7 +66,7 @@ public function set(string $name, $value)
    * @param  string $ip_address IP address to lookup in cache.
    * @return mixed IP address data.
    */
-    public function get(string $name)
+    public function get(string $key, callable $callback, ?float $beta = null, ?array &$metadata = null): mixed
     {
         return $this->cache->get($name);
     }
@@ -66,7 +79,7 @@ private function manageSize()
         $overflow = count($this->element_queue) - $this->maxsize;
         if ($overflow > 0) {
             foreach (array_slice($this->element_queue, 0, $overflow) as $name) {
-                if ($this->cache->has($name)) {
+                if ($this->cache->get($name)) {
                     $this->cache->delete($name);
                 }
             }

tests/DefaultCacheTest.php

@@ -3,13 +3,14 @@
 namespace ipinfo\ipinfo\tests;
 
 use ipinfo\ipinfo\cache\DefaultCache;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use PHPUnit\Framework\TestCase;
 
 class DefaultCacheTest extends TestCase
 {
     public function testHasValue()
     {
-        $cache = new DefaultCache($maxsize = 4, $ttl = 2);
+        $cache = new DefaultCache(new FilesystemAdapter(), $maxsize = 4, $ttl = 2);
         $key1 = 'test';
         $value1 = 'obama';
         $cache->set($key1, $value1);
@@ -24,15 +25,15 @@ public function testHasValue()
 
     public function testDoesNotHaveValue()
     {
-        $cache = new DefaultCache($maxsize = 4, $ttl = 2);
+        $cache = new DefaultCache(new FilesystemAdapter(), $maxsize = 4, $ttl = 2);
         $key = 'test';
 
         $this->assertFalse($cache->has($key));
     }
 
     public function testGetValue()
     {
-        $cache = new DefaultCache($maxsize = 4, $ttl = 2);
+        $cache = new DefaultCache(new FilesystemAdapter(), $maxsize = 4, $ttl = 2);
         $key1 = 'test';
         $value1 = 'obama';
         $cache->set($key1, $value1);
@@ -47,7 +48,7 @@ public function testGetValue()
 
     public function testMaxSizeExceeded()
     {
-        $cache = new DefaultCache($maxsize = 2, $ttl = 2);
+        $cache = new DefaultCache(new FilesystemAdapter(), $maxsize = 2, $ttl = 2);
 
         $key1 = 'test';
         $value1 = 'obama';
@@ -70,7 +71,7 @@ public function testMaxSizeExceeded()
 
     public function testTimeToLiveExceeded()
     {
-        $cache = new DefaultCache($maxsize = 2, $ttl = 1);
+        $cache = new DefaultCache(new FilesystemAdapter(), $maxsize = 2, $ttl = 1);
 
         $key = 'test';
         $value = 'obama';