Skip to content

fix: base class guard in return types is breaking custom guards #56779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 27, 2025
Merged

fix: base class guard in return types is breaking custom guards #56779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
335ebd7
fix: base class guard in return types
phadaphunk Aug 26, 2025
c041aa2
review: remove unused guard
phadaphunk Aug 26, 2025
e85c91e
fix: failing type check
phadaphunk Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Illuminate/Foundation/helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Illuminate\Container\Container;
use Illuminate\Contracts\Auth\Access\Gate;
use Illuminate\Contracts\Auth\Factory as AuthFactory;
use Illuminate\Contracts\Auth\StatefulGuard;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Contracts\Broadcasting\Factory as BroadcastFactory;
use Illuminate\Contracts\Bus\Dispatcher;
use Illuminate\Contracts\Cookie\Factory as CookieFactory;
Expand Down Expand Up @@ -169,9 +169,9 @@ function asset($path, $secure = null): string
* Get the available auth instance.
*
* @param string|null $guard
* @return ($guard is null ? \Illuminate\Contracts\Auth\Factory : \Illuminate\Contracts\Auth\StatefulGuard)
* @return ($guard is null ? \Illuminate\Contracts\Auth\Factory : \Illuminate\Contracts\Auth\Guard)
*/
function auth($guard = null): AuthFactory|StatefulGuard
function auth($guard = null): AuthFactory|Guard
{
if (is_null($guard)) {
return app(AuthFactory::class);
Expand Down
2 changes: 1 addition & 1 deletion types/Foundation/Helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
assertType('Illuminate\Config\Repository', app(Repository::class));

assertType('Illuminate\Contracts\Auth\Factory', auth());
assertType('Illuminate\Contracts\Auth\StatefulGuard', auth('foo'));
assertType('Illuminate\Contracts\Auth\Guard', auth('foo'));

assertType('Illuminate\Cache\CacheManager', cache());
assertType('bool', cache(['foo' => 'bar'], 42));
Expand Down