From 092e3a04a8be7666019f01fc10e9a1bbda4244f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Guzm=C3=A1n=20Maeso?= Date: Fri, 3 May 2024 14:45:41 +0200 Subject: [PATCH 1/3] fix: add missing method setCallbackWrapper --- src/Tracing/Cache/TraceableCacheAdapterTrait.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Tracing/Cache/TraceableCacheAdapterTrait.php b/src/Tracing/Cache/TraceableCacheAdapterTrait.php index 0bf2bc2f..258f4d6c 100644 --- a/src/Tracing/Cache/TraceableCacheAdapterTrait.php +++ b/src/Tracing/Cache/TraceableCacheAdapterTrait.php @@ -190,4 +190,18 @@ private function traceFunction(string $spanOperation, \Closure $callback, string } } } + + /** + * @phpstan-template TResult + * + * @phpstan-param \Closure(): TResult $callback + * + * @phpstan-return TResult + */ + private function setCallbackWrapper(callable $callback, string $key): callable + { + return function () use ($callback, $key) { + return $callback($this->decoratedAdapter->getItem($key)); + }; + } } From 828457de1d81cc9ddf90902d25d538feec375f3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Guzm=C3=A1n=20Maeso?= Date: Fri, 3 May 2024 15:00:37 +0200 Subject: [PATCH 2/3] fix: add missing phpstan arguments --- src/Tracing/Cache/TraceableCacheAdapterTrait.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Tracing/Cache/TraceableCacheAdapterTrait.php b/src/Tracing/Cache/TraceableCacheAdapterTrait.php index 258f4d6c..7717771f 100644 --- a/src/Tracing/Cache/TraceableCacheAdapterTrait.php +++ b/src/Tracing/Cache/TraceableCacheAdapterTrait.php @@ -195,12 +195,13 @@ private function traceFunction(string $spanOperation, \Closure $callback, string * @phpstan-template TResult * * @phpstan-param \Closure(): TResult $callback + * @phpstan-param string $key * - * @phpstan-return TResult + * @phpstan-return callable(): CacheItem */ private function setCallbackWrapper(callable $callback, string $key): callable { - return function () use ($callback, $key) { + return function () use ($callback, $key): CacheItem { return $callback($this->decoratedAdapter->getItem($key)); }; } From 82f247e2d54538877a6dfe9d41999ba5b6fc13df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Guzm=C3=A1n=20Maeso?= Date: Tue, 4 Jun 2024 20:33:48 +0200 Subject: [PATCH 3/3] fix: template for phpstan removed --- src/Tracing/Cache/TraceableCacheAdapterTrait.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Tracing/Cache/TraceableCacheAdapterTrait.php b/src/Tracing/Cache/TraceableCacheAdapterTrait.php index 7717771f..a479c0b9 100644 --- a/src/Tracing/Cache/TraceableCacheAdapterTrait.php +++ b/src/Tracing/Cache/TraceableCacheAdapterTrait.php @@ -192,9 +192,7 @@ private function traceFunction(string $spanOperation, \Closure $callback, string } /** - * @phpstan-template TResult - * - * @phpstan-param \Closure(): TResult $callback + * @phpstan-param \Closure(CacheItem): CacheItem $callback * @phpstan-param string $key * * @phpstan-return callable(): CacheItem