From be166ae0ced92e2f7a8195126ad5314c2623f4d5 Mon Sep 17 00:00:00 2001 From: Jeremy Angele <131715596+angelej@users.noreply.github.com> Date: Thu, 20 Nov 2025 00:11:45 +0100 Subject: [PATCH 1/2] refactor: use scopedIf in CacheManager::memo() --- src/Illuminate/Cache/CacheManager.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Illuminate/Cache/CacheManager.php b/src/Illuminate/Cache/CacheManager.php index 2df3fa42ff6f..2ea576300630 100755 --- a/src/Illuminate/Cache/CacheManager.php +++ b/src/Illuminate/Cache/CacheManager.php @@ -81,11 +81,9 @@ public function memo($driver = null) { $driver = $driver ?: $this->getDefaultDriver(); - if (! $this->app->bound($bindingKey = "cache.__memoized:{$driver}")) { - $this->app->scoped($bindingKey, fn () => $this->repository( - new MemoizedStore($driver, $this->store($driver)), ['events' => false] - )); - } + $this->app->scopedIf($bindingKey = "cache.__memoized:{$driver}", fn() => $this->repository( + new MemoizedStore($driver, $this->store($driver)), ['events' => false] + )); return $this->app->make($bindingKey); } From 129c77c98872bc349f5254f11457a6d6d6d3d427 Mon Sep 17 00:00:00 2001 From: Jeremy Angele <131715596+angelej@users.noreply.github.com> Date: Thu, 20 Nov 2025 00:24:14 +0100 Subject: [PATCH 2/2] fix: styleci --- src/Illuminate/Cache/CacheManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Cache/CacheManager.php b/src/Illuminate/Cache/CacheManager.php index 2ea576300630..311dee5a78e9 100755 --- a/src/Illuminate/Cache/CacheManager.php +++ b/src/Illuminate/Cache/CacheManager.php @@ -81,7 +81,7 @@ public function memo($driver = null) { $driver = $driver ?: $this->getDefaultDriver(); - $this->app->scopedIf($bindingKey = "cache.__memoized:{$driver}", fn() => $this->repository( + $this->app->scopedIf($bindingKey = "cache.__memoized:{$driver}", fn () => $this->repository( new MemoizedStore($driver, $this->store($driver)), ['events' => false] ));