Improve types of InteractsWithData::whenEnum (#60507)

Author: takaram

src/Illuminate/Support/Traits/InteractsWithData.php

@@ -181,11 +181,15 @@ public function whenFilled($key, callable $callback, ?callable $default = null)
     /**
      * Apply the callback if the instance contains a valid enum value for the given key.
      *
+     * @template TEnum of \BackedEnum
+     * @template TReturn
+     * @template TReturnDefault = never
+     *
      * @param  string  $key
-     * @param  class-string<\BackedEnum>  $enumClass
-     * @param  callable  $callback
-     * @param  callable|null  $default
-     * @return $this|mixed
+     * @param  class-string<TEnum>  $enumClass
+     * @param  callable(TEnum):TReturn  $callback
+     * @param  (callable(): TReturnDefault)|null  $default
+     * @return $this|TReturn|TReturnDefault
      */
     public function whenEnum($key, string $enumClass, callable $callback, ?callable $default = null)
     {

types/Support/Traits.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Traits\Localizable;
+use Illuminate\Support\UriQueryString;
 
 use function PHPStan\Testing\assertType;
 
@@ -13,3 +14,21 @@ public function useWithLocale(): void
         assertType("'foo'", $this->withLocale('en', fn () => 'foo'));
     }
 };
+
+$interactsWithData = function (UriQueryString $query): void {
+    assertType('1|2|Illuminate\Support\UriQueryString', $query->whenEnum('foo', TestIntEnum::class, function ($enum) {
+        assertType('TestIntEnum', $enum);
+
+        return 1;
+    }, function () {
+        return 2;
+    }));
+
+    assertType('3|Illuminate\Support\UriQueryString', $query->whenEnum('foo', TestIntEnum::class, function ($enum) {
+        return 3;
+    }));
+};
+
+enum TestIntEnum: int
+{
+}