Updated psr/simple-cache dependency to "^2.0||^3.0"

Author: Geolim4

bin/ci/scripts/setup_gcp.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-printenv BASE64_GOOGLE_APPLICATION_CREDENTIALS | base64 --decode > /tmp/phpfastcache-gac.json
+printenv BASE64_GOOGLE_APPLICATION_CREDENTIALS | base64 --decode > GOOGLE_APPLICATION_CREDENTIALS

composer.json

@@ -21,7 +21,7 @@
     "require": {
         "php": ">=8.0",
         "psr/cache": "^2.0||^3.0",
-        "psr/simple-cache": "^1.0.",
+        "psr/simple-cache": "^2.0||^3.0",
         "ext-mbstring": "*",
         "ext-json": "*"
     },

lib/Phpfastcache/Exceptions/PhpfastcacheRootException.php

@@ -17,7 +17,7 @@
 
 use Exception;
 
-class PhpfastcacheRootException extends Exception implements PhpfastcacheExceptionInterface
+abstract class PhpfastcacheRootException extends Exception implements PhpfastcacheExceptionInterface
 {
 
 }

lib/Phpfastcache/Helper/Psr16Adapter.php

@@ -62,11 +62,11 @@ public function __construct($driver, ConfigurationOptionInterface $config = null
 
     /**
      * @param string $key
-     * @param mixed|null $default
-     * @return mixed|null
+     * @param mixed $default
+     * @return mixed
      * @throws PhpfastcacheSimpleCacheException
      */
-    public function get($key, $default = null)
+    public function get(string $key, mixed $default = null): mixed
     {
         try {
             $cacheItem = $this->internalCacheInstance->getItem($key);
@@ -87,7 +87,7 @@ public function get($key, $default = null)
      * @return bool
      * @throws PhpfastcacheSimpleCacheException
      */
-    public function set($key, $value, $ttl = null): bool
+    public function set(string $key, mixed $value, null|int|\DateInterval $ttl = null): bool
     {
         try {
             $cacheItem = $this->internalCacheInstance
@@ -110,7 +110,7 @@ public function set($key, $value, $ttl = null): bool
      * @throws PhpfastcacheSimpleCacheException
      * @throws InvalidArgumentException
      */
-    public function delete($key): bool
+    public function delete(string $key): bool
     {
         try {
             return $this->internalCacheInstance->deleteItem($key);
@@ -135,10 +135,10 @@ public function clear(): bool
     /**
      * @param iterable $keys
      * @param null $default
-     * @return ExtendedCacheItemInterface[]|iterable
+     * @return ExtendedCacheItemInterface[]
      * @throws PhpfastcacheSimpleCacheException
      */
-    public function getMultiple($keys, $default = null)
+    public function getMultiple(iterable $keys, mixed $default = null): iterable
     {
         if ($keys instanceof Traversable) {
             $keys = \iterator_to_array($keys);
@@ -154,12 +154,12 @@ public function getMultiple($keys, $default = null)
     }
 
     /**
-     * @param string[] $values
+     * @param iterable $values
      * @param null|int|DateInterval $ttl
      * @return bool
      * @throws PhpfastcacheSimpleCacheException
      */
-    public function setMultiple($values, $ttl = null): bool
+    public function setMultiple(iterable $values, null|int|\DateInterval $ttl = null): bool
     {
         try {
             foreach ($values as $key => $value) {
@@ -180,12 +180,12 @@ public function setMultiple($values, $ttl = null): bool
     }
 
     /**
-     * @param iterable|array $keys
+     * @param iterable $keys
      * @return bool
      * @throws PhpfastcacheSimpleCacheException
      * @throws InvalidArgumentException
      */
-    public function deleteMultiple($keys): bool
+    public function deleteMultiple(iterable $keys): bool
     {
         try {
             if ($keys instanceof Traversable) {
@@ -207,7 +207,7 @@ public function deleteMultiple($keys): bool
      * @return bool
      * @throws PhpfastcacheSimpleCacheException
      */
-    public function has($key): bool
+    public function has(string $key): bool
     {
         try {
             $cacheItem = $this->internalCacheInstance->getItem($key);