Skip to content

Commit 891e229

Browse files
authored
refactor: fix failing tests (#471)
Add type hinting Add missing spatie/laravel-ray as dev dependency
1 parent 890ef8c commit 891e229

File tree

6 files changed

+45
-16
lines changed

6 files changed

+45
-16
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
"psalm/plugin-laravel": "^2.10",
5858
"psr-mock/http": "^1",
5959
"rector/rector": "^1",
60+
"spatie/laravel-ray": "^1.40",
6061
"squizlabs/php_codesniffer": "^3",
6162
"symfony/cache": "^6 || ^7",
6263
"vimeo/psalm": "^5",

src/Bridges/SessionBridgeAbstract.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Auth0\Laravel\Bridges;
66

77
use Auth0\Laravel\Exceptions\SessionException;
8+
use Illuminate\Http\Request;
89
use Illuminate\Session\Store;
910
use InvalidArgumentException;
1011

@@ -155,7 +156,13 @@ protected function getPayload(): ?array
155156
*/
156157
protected function getStore(): Store
157158
{
159+
/**
160+
* @var Store $store
161+
*/
158162
$store = app('session.store');
163+
/**
164+
* @var Request $request
165+
*/
159166
$request = app('request');
160167

161168
if (! $request->hasSession(true)) {

src/EventsContract.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,67 +34,67 @@
3434
interface EventsContract
3535
{
3636
/**
37-
* @var class-string<\Auth0\Laravel\Events\AuthenticationFailed>
37+
* @var class-string<AuthenticationFailed>
3838
*/
3939
public const AUTHENTICATION_FAILED = AuthenticationFailed::class;
4040

4141
/**
42-
* @var class-string<\Auth0\Laravel\Events\AuthenticationSucceeded>
42+
* @var class-string<AuthenticationSucceeded>
4343
*/
4444
public const AUTHENTICATION_SUCCEEDED = AuthenticationSucceeded::class;
4545

4646
/**
47-
* @var class-string<\Auth0\Laravel\Events\Configuration\BuildingConfigurationEvent>
47+
* @var class-string<BuildingConfigurationEvent>
4848
*/
4949
public const CONFIGURATION_BUILDING = BuildingConfigurationEvent::class;
5050

5151
/**
52-
* @var class-string<\Auth0\Laravel\Events\Configuration\BuiltConfigurationEvent>
52+
* @var class-string<BuiltConfigurationEvent>
5353
*/
5454
public const CONFIGURATION_BUILT = BuiltConfigurationEvent::class;
5555

5656
/**
57-
* @var class-string<\Auth0\Laravel\Events\LoginAttempting>
57+
* @var class-string<LoginAttempting>
5858
*/
5959
public const LOGIN_ATTEMPTING = LoginAttempting::class;
6060

6161
/**
62-
* @var class-string<\Auth0\Laravel\Events\Middleware\StatefulMiddlewareRequest>
62+
* @var class-string<StatefulMiddlewareRequest>
6363
*/
6464
public const MIDDLEWARE_STATEFUL_REQUEST = StatefulMiddlewareRequest::class;
6565

6666
/**
67-
* @var class-string<\Auth0\Laravel\Events\Middleware\StatelessMiddlewareRequest>
67+
* @var class-string<StatelessMiddlewareRequest>
6868
*/
6969
public const MIDDLEWARE_STATELESS_REQUEST = StatelessMiddlewareRequest::class;
7070

7171
/**
72-
* @var class-string<\Auth0\Laravel\Events\TokenExpired>
72+
* @var class-string<TokenExpired>
7373
*/
7474
public const TOKEN_EXPIRED = TokenExpired::class;
7575

7676
/**
77-
* @var class-string<\Auth0\Laravel\Events\TokenRefreshFailed>
77+
* @var class-string<TokenRefreshFailed>
7878
*/
7979
public const TOKEN_REFRESH_FAILED = TokenRefreshFailed::class;
8080

8181
/**
82-
* @var class-string<\Auth0\Laravel\Events\TokenRefreshSucceeded>
82+
* @var class-string<TokenRefreshSucceeded>
8383
*/
8484
public const TOKEN_REFRESH_SUCCEEDED = TokenRefreshSucceeded::class;
8585

8686
/**
87-
* @var class-string<\Auth0\Laravel\Events\TokenVerificationAttempting>
87+
* @var class-string<TokenVerificationAttempting>
8888
*/
8989
public const TOKEN_VERIFICATION_ATTEMPTING = TokenVerificationAttempting::class;
9090

9191
/**
92-
* @var class-string<\Auth0\Laravel\Events\TokenVerificationFailed>
92+
* @var class-string<TokenVerificationFailed>
9393
*/
9494
public const TOKEN_VERIFICATION_FAILED = TokenVerificationFailed::class;
9595

9696
/**
97-
* @var class-string<\Auth0\Laravel\Events\TokenVerificationSucceeded>
97+
* @var class-string<TokenVerificationSucceeded>
9898
*/
9999
public const TOKEN_VERIFICATION_SUCCEEDED = TokenVerificationSucceeded::class;
100100

src/Guards/AuthorizationGuard.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@ public function findToken(): ?CredentialEntityContract
3434
return $this->getImposter();
3535
}
3636

37-
$token = trim(app('request')->bearerToken() ?? '');
37+
/**
38+
* @var \Illuminate\Http\Request $request
39+
*/
40+
$request = app('request');
41+
42+
$token = trim($request->bearerToken() ?? '');
3843

3944
if ('' === $token) {
4045
return null;

src/Guards/GuardAbstract.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,12 @@ final public function getProvider(): UserProvider
9292
}
9393

9494
$providerName = trim($providerName);
95-
$provider = app('auth')->createUserProvider($providerName);
95+
96+
/**
97+
* @var \Illuminate\Auth\AuthManager $auth
98+
*/
99+
$auth = app('auth');
100+
$provider = $auth->createUserProvider($providerName);
96101

97102
if ($provider instanceof UserProvider) {
98103
$this->provider = $provider;
@@ -115,7 +120,13 @@ final public function getRefreshedUser(): ?Authenticatable
115120
final public function getSession(): Session
116121
{
117122
if (! $this->session instanceof Session) {
123+
/**
124+
* @var \Illuminate\Session\Store $store
125+
*/
118126
$store = app('session.store');
127+
/**
128+
* @var \Illuminate\Http\Request $request
129+
*/
119130
$request = app('request');
120131

121132
if (! $request->hasSession(true)) {

src/UserProviderAbstract.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,12 @@ protected function resolveRepository(
222222

223223
$this->setRepositoryName($model);
224224

225-
return $this->repository = app($model);
225+
/**
226+
* @var UserRepositoryContract $repository
227+
*/
228+
$repository = app($model);
229+
230+
return $this->repository = $repository;
226231
}
227232

228233
protected function setConfiguration(

0 commit comments

Comments
 (0)