Fix: Correct typehint on repository retrieval methods (#53025)

* widen typehint on repository get * replace Closure(): mixed with mixed * fix type tests
laravel · Oct 7, 2024 · 6df8b61 · 6df8b61
1 parent 5caf767
commit 6df8b61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/src/Illuminate/Cache/Repository.php b/src/Illuminate/Cache/Repository.php
@@ -101,11 +101,9 @@ public function missing($key)
     /**
      * Retrieve an item from the cache by key.
      *
-     * @template TCacheValue
-     *
      * @param  array|string  $key
-     * @param  TCacheValue|(\Closure(): TCacheValue)  $default
-     * @return (TCacheValue is null ? mixed : TCacheValue)
+     * @param  mixed  $default
+     * @return mixed
      */
     public function get($key, $default = null): mixed
     {
@@ -198,11 +196,9 @@ protected function handleManyResult($keys, $key, $value)
     /**
      * Retrieve an item from the cache and delete it.
      *
-     * @template TCacheValue
-     *
      * @param  array|string  $key
-     * @param  TCacheValue|(\Closure(): TCacheValue)  $default
-     * @return (TCacheValue is null ? mixed : TCacheValue)
+     * @param  mixed  $default
+     * @return mixed
      */
     public function pull($key, $default = null)
     {

diff --git a/types/Cache/Repository.php b/types/Cache/Repository.php
@@ -8,14 +8,14 @@
 $cache = resolve(Repository::class);
 
 assertType('mixed', $cache->get('key'));
-assertType('int', $cache->get('cache', 27));
-assertType('int', $cache->get('cache', function (): int {
+assertType('mixed', $cache->get('cache', 27));
+assertType('mixed', $cache->get('cache', function (): int {
     return 26;
 }));
 
 assertType('mixed', $cache->pull('key'));
-assertType('int', $cache->pull('cache', 28));
-assertType('int', $cache->pull('cache', function (): int {
+assertType('mixed', $cache->pull('cache', 28));
+assertType('mixed', $cache->pull('cache', function (): int {
     return 30;
 }));
 assertType('int', $cache->sear('cache', function (): int {