feat!: support psr/simple-cache v2 and v3

Resolves #2

Author: Jonathon Hill

composer.json

@@ -41,7 +41,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "dflydev/fig-cookies": "^3.0",
-        "psr/simple-cache": "^1",
+        "psr/simple-cache": "^2 || ^3",
         "psr/http-message": "^1",
         "psr/http-server-handler": "^1",
         "psr/http-server-middleware": "^1"
@@ -51,12 +51,11 @@
         "bramus/monolog-colored-line-formatter": "^3.0",
         "compwright/swoole-psr7-compat": "^2.0",
         "friendsofphp/php-cs-fixer": "^3.11",
-        "kodus/file-cache": "^1.1",
+        "kodus/file-cache": "^2",
         "league/flysystem": "^2.2",
         "matthiasmullie/scrapbook": "^1.4",
         "middlewares/access-log": "^2.0",
         "monolog/monolog": "^2.3",
-        "odan/cache": "^0.5.0",
         "php-di/php-di": "^6.3",
         "phpstan/phpstan": "^1.8",
         "phpunit/phpunit": "^9.5",

composer.lock

@@ -20,5 +20,4 @@ Feature: Session Persistence
       | kodus     | A        |
       | scrapbook | B        |
       | redis     | 0        |
-      | opcache   | C        |
-      | file      | D        |
+      | file      | C        |

features/persistence.feature

@@ -53,11 +53,7 @@ public function close(): bool
         return true;
     }
 
-    /**
-     * @param string $id
-     * @return string|false
-     */
-    public function read($id)
+    public function read(string $id): string|false
     {
         if (
             !array_key_exists($id, $this->store)
@@ -172,7 +168,7 @@ public function destroy($id): bool
         return true;
     }
 
-    public function gc($max_lifetime): bool
+    public function gc($max_lifetime): int|false
     {
         $garbage = array_filter(
             $this->store,
@@ -192,7 +188,7 @@ function ($store) use ($max_lifetime) {
             unset($this->store[$session['meta']['id']]);
         }
 
-        return true;
+        return count($garbage);
     }
 
     public function count(): int

src/Handlers/ArrayHandler.php

@@ -55,11 +55,7 @@ public function close(): bool
         return true;
     }
 
-    /**
-     * @param string $id
-     * @return string|false
-     */
-    public function read($id)
+    public function read(string $id): string|false
     {
         if (!$this->validateId($id)) {
             return false;
@@ -86,7 +82,7 @@ public function destroy($id): bool
         return unlink($this->getFilePath($id));
     }
 
-    public function gc($maxlifetime): bool
+    public function gc(int $maxlifetime): int|false
     {
         $files = glob($this->getFilePath('*')) ?: [];
 
@@ -96,7 +92,7 @@ public function gc($maxlifetime): bool
             }
         }
 
-        return true;
+        return count($files);
     }
 
     public function validateId($id): bool

src/Handlers/FileHandler.php

@@ -47,11 +47,7 @@ public function close(): bool
         return true;
     }
 
-    /**
-     * @param string $id
-     * @return string|false
-     */
-    public function read($id)
+    public function read(string $id): string|false
     {
         if (!$this->store->has($id)) {
             return false;
@@ -94,9 +90,9 @@ public function destroy($id): bool
         return $this->store->delete($id);
     }
 
-    public function gc($max_lifetime): bool
+    public function gc(int $max_lifetime): int|false
     {
-        return true;
+        return 0;
     }
 
     /**

src/Handlers/Psr16Handler.php

@@ -64,11 +64,7 @@ public function close(): bool
         return true;
     }
 
-    /**
-     * @param string $id
-     * @return string|false
-     */
-    public function read($id)
+    public function read(string $id): string|false
     {
         $value = $this->store->get($id);
         if (is_string($value) || $value === false) {
@@ -130,9 +126,9 @@ public function destroy($id): bool
         return $this->store->delete($id);
     }
 
-    public function gc($max_lifetime): bool
+    public function gc(int $max_lifetime): int|false
     {
-        return true;
+        return 0;
     }
 
     /**

src/Handlers/ScrapbookHandler.php

@@ -59,10 +59,6 @@ public function sessionHandlerStoredAtLocation(string $handler, string $location
                 $this->config->setSavePath('tcp://localhost:6379?database=0');
                 $handler = new RedisHandler($this->config);
                 break;
-            case 'opcache':
-                $cache = new \Odan\Cache\Simple\OpCache($location);
-                $handler = new Psr16Handler($this->config, $cache);
-                break;
             case 'file':
                 $handler = new FileHandler($this->config);
                 break;