Updated to simple-cache 3.0 and adjusted tests (#5)

* Updated to simple-cache 3.0 and adjusted tests

Author: thomasnordahl-dk

composer.json

@@ -13,7 +13,7 @@
     "prefer-stable": true,
     "require": {
         "php": ">=8.0",
-        "psr/simple-cache": "^2.0",
+        "psr/simple-cache": "^2.0|^3.0",
         "predis/predis": "^1.1"
     },
     "autoload": {

src/PredisSimpleCache.php

@@ -29,14 +29,14 @@ public function __construct(Client $client, int $default_ttl)
         $this->default_ttl = $default_ttl;
     }
 
-    public function get($key, $default = null)
+    public function get(string $key, mixed $default = null): mixed
     {
         $this->validateKey($key);
 
         return $this->client->exists($key) ? unserialize($this->client->get($key)) : $default;
     }
 
-    public function set($key, $value, $ttl = null): bool
+    public function set(string $key, mixed $value, null|int|\DateInterval $ttl = null): bool
     {
         $this->validateKey($key);
 
@@ -57,7 +57,7 @@ public function set($key, $value, $ttl = null): bool
         }
     }
 
-    public function delete($key): bool
+    public function delete(string $key): bool
     {
         $this->validateKey($key);
 
@@ -73,7 +73,7 @@ public function clear(): bool
         return mb_strpos('OK', $result) !== false;
     }
 
-    public function getMultiple($keys, $default = null)
+    public function getMultiple(iterable $keys, mixed $default = null): iterable
     {
         $this->validateIterable($keys);
 
@@ -93,7 +93,7 @@ public function getMultiple($keys, $default = null)
         return $result;
     }
 
-    public function setMultiple($values, $ttl = null): bool
+    public function setMultiple(iterable $values, null|int|\DateInterval $ttl = null): bool
     {
         $this->validateIterable($values);
 
@@ -120,7 +120,7 @@ public function setMultiple($values, $ttl = null): bool
         return true;
     }
 
-    public function deleteMultiple($keys): bool
+    public function deleteMultiple(iterable $keys): bool
     {
         /** @var $keys array|Traversable */
         $this->validateIterable($keys);
@@ -143,7 +143,7 @@ public function deleteMultiple($keys): bool
         return true;
     }
 
-    public function has($key): bool
+    public function has(string $key): bool
     {
         $this->validateKey($key);
 

tests/integration/PredisSimpleCacheCest.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kodus\PredisSimpleCache\Test;
 
@@ -9,6 +10,7 @@
 use Kodus\PredisSimpleCache\PredisSimpleCache;
 use Psr\SimpleCache\CacheInterface;
 use Psr\SimpleCache\InvalidArgumentException;
+use TypeError;
 
 class PredisSimpleCacheCest
 {
@@ -261,7 +263,7 @@ public function testGetMultipleInvalidKeys(IntegrationTester $I, Example $exampl
 
     public function getMultipleNoIterable(IntegrationTester $I): void
     {
-        $I->expectThrowable(InvalidArgumentException::class, fn() => $this->cache->getMultiple('key'));
+        $I->expectThrowable(TypeError::class, fn() => $this->cache->getMultiple('key'));
     }
 
     /**
@@ -290,7 +292,7 @@ public function setMultipleInvalidKeys(IntegrationTester $I, Example $example):
 
     public function setMultipleNoIterable(IntegrationTester $I): void
     {
-        $I->expectThrowable(InvalidArgumentException::class, fn() => $this->cache->setMultiple('key'));
+        $I->expectThrowable(TypeError::class, fn() => $this->cache->setMultiple('key'));
     }
 
     /**
@@ -326,7 +328,7 @@ public function deleteMultipleInvalidKeys(IntegrationTester $I, Example $example
 
     public function deleteMultipleNoIterable(IntegrationTester $I): void
     {
-        $I->expectThrowable(InvalidArgumentException::class, fn() => $this->cache->deleteMultiple('key'));
+        $I->expectThrowable(TypeError::class, fn() => $this->cache->deleteMultiple('key'));
     }
 
     /**
@@ -336,7 +338,7 @@ public function setInvalidTtl(IntegrationTester $I, Example $example): void
     {
         $ttl = $example['ttl'];
 
-        $I->expectThrowable(InvalidArgumentException::class, fn() => $this->cache->set('key', 'value', $ttl));
+        $I->expectThrowable(TypeError::class, fn() => $this->cache->set('key', 'value', $ttl));
     }
 
     /**
@@ -347,7 +349,7 @@ public function setMultipleInvalidTtl(IntegrationTester $I, Example $example): v
         $ttl = $example['ttl'];
 
         $I->expectThrowable(
-            InvalidArgumentException::class,
+            TypeError::class,
             fn() => $this->cache->setMultiple(['key' => 'value'], $ttl)
         );
     }
@@ -575,24 +577,38 @@ protected function validData(): array
         ];
     }
 
-    protected function invalidKeys(): array
+    /**
+     * ['0' => 'some data'] and [0 => 'some data'] are equivalent in PHP, so we have to accept integers as keys, when
+     * reading or writing multiple entries with getMultiple() or setMultiple().
+     *
+     * But when using get() or set(), integer keys are clearly integers and are considered invalid.
+     */
+    protected function invalidKeyTypes(): array
     {
         return array_merge(
-            $this->invalidArrayKeys(),
+            $this->invalidArrayKeyTypes(),
             [
                 ['key' => 0],
                 ['key' => 2],
             ]);
     }
 
-    protected function invalidArrayKeys(): array
+    protected function invalidArrayKeyTypes(): array
     {
         return [
-            ['key' => ''],
+            ['key' => new \stdClass()],
             ['key' => true],
             ['key' => false],
             ['key' => null],
             ['key' => 2.5],
+            ['key' => ['array']],
+        ];
+    }
+
+    protected function invalidKeys(): array
+    {
+        return [
+            ['key' => ''],
             ['key' => '{str'],
             ['key' => 'rand{'],
             ['key' => 'rand{str'],
@@ -603,21 +619,27 @@ protected function invalidArrayKeys(): array
             ['key' => 'rand\\str'],
             ['key' => 'rand@str'],
             ['key' => 'rand:str'],
-            ['key' => new \stdClass()],
-            ['key' => ['array']],
         ];
     }
 
-    protected function invalidTTL(): array
+    protected function invalidArrayKeys(): array
+    {
+        return array_merge(
+            $this->invalidKeys(),
+            $this->invalidArrayKeyTypes(),
+        );
+    }
+
+    protected function invalidTtl(): array
     {
         return [
             ['ttl' => ''],
             ['ttl' => true],
             ['ttl' => false],
             ['ttl' => 'abc'],
             ['ttl' => 2.5],
-            ['ttl' => ' 1'], // Could be cast to a int
-            ['ttl' => '12foo'], // Could be cast to a int
+            ['ttl' => ' 1'], // Could be cast to an int
+            ['ttl' => '12foo'], // Could be cast to an int
             ['ttl' => '025'], // Could be interpreted as hex
             ['ttl' => new \stdClass()],
             ['ttl' => ['array']],