From d156f79f38a74dd50a9f1112c0714bafaaaf9a09 Mon Sep 17 00:00:00 2001 From: Arman <407448+armanist@users.noreply.github.com> Date: Mon, 5 Oct 2026 14:44:32 +0400 Subject: [PATCH] [#570] Fix PHPStan analysis errors --- CHANGELOG.md | 1 + src/Cache/Adapters/FileAdapter.php | 4 ++-- src/Cache/Adapters/MemcachedAdapter.php | 4 ++-- src/Cache/Adapters/RedisAdapter.php | 4 ++-- src/Model/ModelCollection.php | 6 +++--- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9142e15..98ba6d2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is based on Keep a Changelog. - Added adapter-based Lang provider support with `DeepL` and `Google Translate` adapters plus shared remote request/caching infrastructure (#533) ### Changed +- Corrected cache adapter deserialization exception handling and `ModelCollection` key type declarations (#570) - Refactored `HttpClient` internals behind explicit `CurlAdapter` and `MultiCurlAdapter` wrappers while preserving the existing facade methods and keeping `php-curl-class` as the underlying transport for this phase (#534) - Replaced the single-request `HttpClient` `CurlAdapter` execution path with native PHP cURL (#566) - Replaced the multi-request `HttpClient` `MultiCurlAdapter` execution path with native PHP multi-curl and removed the `php-curl-class` dependency while preserving facade, factory, helper, callback, and response aggregation behavior (#567) diff --git a/src/Cache/Adapters/FileAdapter.php b/src/Cache/Adapters/FileAdapter.php index e949ece0..ef9759c5 100644 --- a/src/Cache/Adapters/FileAdapter.php +++ b/src/Cache/Adapters/FileAdapter.php @@ -20,7 +20,7 @@ use Quantum\Storage\FileSystem; use InvalidArgumentException; use ReflectionException; -use Exception; +use Throwable; /** * Class FileAdapter @@ -66,7 +66,7 @@ public function get($key, $default = null) try { return unserialize($cacheItem); - } catch (Exception) { + } catch (Throwable) { $this->delete($key); return $default; } diff --git a/src/Cache/Adapters/MemcachedAdapter.php b/src/Cache/Adapters/MemcachedAdapter.php index 68cd44c7..88935b8a 100644 --- a/src/Cache/Adapters/MemcachedAdapter.php +++ b/src/Cache/Adapters/MemcachedAdapter.php @@ -17,7 +17,7 @@ use Psr\SimpleCache\CacheInterface; use InvalidArgumentException; use Memcached; -use Exception; +use Throwable; /** * Class MemcachedAdapter @@ -56,7 +56,7 @@ public function get($key, $default = null) try { return unserialize($cacheItem); - } catch (Exception) { + } catch (Throwable) { $this->delete($key); return $default; } diff --git a/src/Cache/Adapters/RedisAdapter.php b/src/Cache/Adapters/RedisAdapter.php index fc3d8430..19aacd37 100644 --- a/src/Cache/Adapters/RedisAdapter.php +++ b/src/Cache/Adapters/RedisAdapter.php @@ -15,7 +15,7 @@ use Psr\SimpleCache\CacheInterface; use InvalidArgumentException; use RedisException; -use Exception; +use Throwable; use Redis; /** @@ -51,7 +51,7 @@ public function get($key, $default = null) try { return unserialize($cacheItem); - } catch (Exception) { + } catch (Throwable) { $this->delete($key); return $default; } diff --git a/src/Model/ModelCollection.php b/src/Model/ModelCollection.php index 86581879..50c42a6c 100644 --- a/src/Model/ModelCollection.php +++ b/src/Model/ModelCollection.php @@ -21,17 +21,17 @@ * @package Quantum\Model * @template TKey of array-key * @template TValue of Model - * @implements IteratorAggregate + * @implements IteratorAggregate */ class ModelCollection implements Countable, IteratorAggregate { /** - * @var array + * @var array */ private array $models = []; /** - * @var iterable + * @var iterable */ private iterable $originalModels;