Skip to content
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.

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

Convert auth() helper to use Auth facade #1656

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Conversation

barryvdh
Copy link
Owner

@barryvdh barryvdh commented Jan 8, 2025

Summary

When the auth() helper is included, fix the return type to match \Auth

if (! function_exists('auth')) {
    /**
     * Get the available auth instance.
     *
     * @param  string|null  $guard
     * @return \Auth|($guard is null ? \Illuminate\Contracts\Auth\Factory : \Illuminate\Contracts\Auth\StatefulGuard)
     */
    function auth($guard = null)
    {
        if (is_null($guard)) {
            return app(AuthFactory::class);
        }

        return app(AuthFactory::class)->guard($guard);
    }
}

This will make auth()->user() behave the same as \Auth::user() which is returning the default User model already.

This might be useful to do for only the helpers that are actually required to change, like auth() and perhaps request()

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • Misc. change (internal, infrastructure, maintenance, etc.)

Checklist

  • Existing tests have been adapted and/or new tests have been added
  • Update the README.md
  • Code style has been fixed via composer fix-style

@barryvdh barryvdh merged commit 299a81b into master Jan 8, 2025
17 checks passed
@barryvdh barryvdh deleted the feat-tweak-helpers branch January 8, 2025 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant