Add dynamic return types to rescue helper (#48062)

laravel · Aug 14, 2023 · e5e7704 · e5e7704
1 parent 5a7f2b4
commit e5e7704
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Illuminate/Foundation/helpers.php b/src/Illuminate/Foundation/helpers.php
@@ -727,10 +727,13 @@ function request($key = null, $default = null)
     /**
      * Catch a potential exception and return a default value.
      *
-     * @param  callable  $callback
-     * @param  mixed  $rescue
+     * @template TRescueValue
+     * @template TRescueFallback
+     *
+     * @param  callable(): TRescueValue  $callback
+     * @param  (callable(\Throwable): TRescueFallback)|TRescueFallback  $rescue
      * @param  bool|callable  $report
-     * @return mixed
+     * @return TRescueValue|TRescueFallback
      */
     function rescue(callable $callback, $rescue = null, $report = true)
     {

diff --git a/types/Support/Helpers.php b/types/Support/Helpers.php
@@ -53,3 +53,7 @@
 assertType('null', transform(null, fn () => 1));
 assertType('null', transform('', fn () => 1));
 assertType('null', transform([], fn () => 1));
+
+assertType('int|null', rescue(fn () => 123));
+assertType('int', rescue(fn () => 123, 345));
+assertType('int', rescue(fn () => 123, fn () => 345));