Skip to content

refactor: fix failing tests #471

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

Merged
merged 1 commit into from
Mar 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"psalm/plugin-laravel": "^2.10",
"psr-mock/http": "^1",
"rector/rector": "^1",
"spatie/laravel-ray": "^1.40",
"squizlabs/php_codesniffer": "^3",
"symfony/cache": "^6 || ^7",
"vimeo/psalm": "^5",
Expand Down
7 changes: 7 additions & 0 deletions src/Bridges/SessionBridgeAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Auth0\Laravel\Bridges;

use Auth0\Laravel\Exceptions\SessionException;
use Illuminate\Http\Request;
use Illuminate\Session\Store;
use InvalidArgumentException;

Expand Down Expand Up @@ -155,7 +156,13 @@ protected function getPayload(): ?array
*/
protected function getStore(): Store
{
/**
* @var Store $store
*/
$store = app('session.store');
/**
* @var Request $request
*/
$request = app('request');

if (! $request->hasSession(true)) {
Expand Down
26 changes: 13 additions & 13 deletions src/EventsContract.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,67 +34,67 @@
interface EventsContract
{
/**
* @var class-string<\Auth0\Laravel\Events\AuthenticationFailed>
* @var class-string<AuthenticationFailed>
*/
public const AUTHENTICATION_FAILED = AuthenticationFailed::class;

/**
* @var class-string<\Auth0\Laravel\Events\AuthenticationSucceeded>
* @var class-string<AuthenticationSucceeded>
*/
public const AUTHENTICATION_SUCCEEDED = AuthenticationSucceeded::class;

/**
* @var class-string<\Auth0\Laravel\Events\Configuration\BuildingConfigurationEvent>
* @var class-string<BuildingConfigurationEvent>
*/
public const CONFIGURATION_BUILDING = BuildingConfigurationEvent::class;

/**
* @var class-string<\Auth0\Laravel\Events\Configuration\BuiltConfigurationEvent>
* @var class-string<BuiltConfigurationEvent>
*/
public const CONFIGURATION_BUILT = BuiltConfigurationEvent::class;

/**
* @var class-string<\Auth0\Laravel\Events\LoginAttempting>
* @var class-string<LoginAttempting>
*/
public const LOGIN_ATTEMPTING = LoginAttempting::class;

/**
* @var class-string<\Auth0\Laravel\Events\Middleware\StatefulMiddlewareRequest>
* @var class-string<StatefulMiddlewareRequest>
*/
public const MIDDLEWARE_STATEFUL_REQUEST = StatefulMiddlewareRequest::class;

/**
* @var class-string<\Auth0\Laravel\Events\Middleware\StatelessMiddlewareRequest>
* @var class-string<StatelessMiddlewareRequest>
*/
public const MIDDLEWARE_STATELESS_REQUEST = StatelessMiddlewareRequest::class;

/**
* @var class-string<\Auth0\Laravel\Events\TokenExpired>
* @var class-string<TokenExpired>
*/
public const TOKEN_EXPIRED = TokenExpired::class;

/**
* @var class-string<\Auth0\Laravel\Events\TokenRefreshFailed>
* @var class-string<TokenRefreshFailed>
*/
public const TOKEN_REFRESH_FAILED = TokenRefreshFailed::class;

/**
* @var class-string<\Auth0\Laravel\Events\TokenRefreshSucceeded>
* @var class-string<TokenRefreshSucceeded>
*/
public const TOKEN_REFRESH_SUCCEEDED = TokenRefreshSucceeded::class;

/**
* @var class-string<\Auth0\Laravel\Events\TokenVerificationAttempting>
* @var class-string<TokenVerificationAttempting>
*/
public const TOKEN_VERIFICATION_ATTEMPTING = TokenVerificationAttempting::class;

/**
* @var class-string<\Auth0\Laravel\Events\TokenVerificationFailed>
* @var class-string<TokenVerificationFailed>
*/
public const TOKEN_VERIFICATION_FAILED = TokenVerificationFailed::class;

/**
* @var class-string<\Auth0\Laravel\Events\TokenVerificationSucceeded>
* @var class-string<TokenVerificationSucceeded>
*/
public const TOKEN_VERIFICATION_SUCCEEDED = TokenVerificationSucceeded::class;

Expand Down
7 changes: 6 additions & 1 deletion src/Guards/AuthorizationGuard.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ public function findToken(): ?CredentialEntityContract
return $this->getImposter();
}

$token = trim(app('request')->bearerToken() ?? '');
/**
* @var \Illuminate\Http\Request $request
*/
$request = app('request');

$token = trim($request->bearerToken() ?? '');

if ('' === $token) {
return null;
Expand Down
13 changes: 12 additions & 1 deletion src/Guards/GuardAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,12 @@ final public function getProvider(): UserProvider
}

$providerName = trim($providerName);
$provider = app('auth')->createUserProvider($providerName);

/**
* @var \Illuminate\Auth\AuthManager $auth
*/
$auth = app('auth');
$provider = $auth->createUserProvider($providerName);

if ($provider instanceof UserProvider) {
$this->provider = $provider;
Expand All @@ -115,7 +120,13 @@ final public function getRefreshedUser(): ?Authenticatable
final public function getSession(): Session
{
if (! $this->session instanceof Session) {
/**
* @var \Illuminate\Session\Store $store
*/
$store = app('session.store');
/**
* @var \Illuminate\Http\Request $request
*/
$request = app('request');

if (! $request->hasSession(true)) {
Expand Down
7 changes: 6 additions & 1 deletion src/UserProviderAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,12 @@ protected function resolveRepository(

$this->setRepositoryName($model);

return $this->repository = app($model);
/**
* @var UserRepositoryContract $repository
*/
$repository = app($model);

return $this->repository = $repository;
}

protected function setConfiguration(
Expand Down
Loading