From 423e15b9119d94912a1099cb069245787d4c6809 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Wed, 18 Dec 2024 13:32:55 -0600 Subject: [PATCH] use type declarations for Auth events --- src/Illuminate/Auth/Events/Attempting.php | 6 +++--- src/Illuminate/Auth/Events/Authenticated.php | 5 +++-- src/Illuminate/Auth/Events/CurrentDeviceLogout.php | 5 +++-- src/Illuminate/Auth/Events/Failed.php | 8 +++++--- src/Illuminate/Auth/Events/Lockout.php | 13 +++---------- src/Illuminate/Auth/Events/Login.php | 7 ++++--- src/Illuminate/Auth/Events/Logout.php | 5 +++-- src/Illuminate/Auth/Events/OtherDeviceLogout.php | 5 +++-- src/Illuminate/Auth/Events/PasswordReset.php | 3 ++- .../Auth/Events/PasswordResetLinkSent.php | 3 ++- src/Illuminate/Auth/Events/Registered.php | 3 ++- src/Illuminate/Auth/Events/Validated.php | 5 +++-- src/Illuminate/Auth/Events/Verified.php | 3 ++- 13 files changed, 38 insertions(+), 33 deletions(-) diff --git a/src/Illuminate/Auth/Events/Attempting.php b/src/Illuminate/Auth/Events/Attempting.php index ac700c9015e5..ba54e3475cbb 100644 --- a/src/Illuminate/Auth/Events/Attempting.php +++ b/src/Illuminate/Auth/Events/Attempting.php @@ -13,9 +13,9 @@ class Attempting * @return void */ public function __construct( - public $guard, - #[\SensitiveParameter] public $credentials, - public $remember, + public string $guard, + #[\SensitiveParameter] public array $credentials, + public bool $remember, ) { } } diff --git a/src/Illuminate/Auth/Events/Authenticated.php b/src/Illuminate/Auth/Events/Authenticated.php index c0b0db6cba32..3fade6a8bce9 100644 --- a/src/Illuminate/Auth/Events/Authenticated.php +++ b/src/Illuminate/Auth/Events/Authenticated.php @@ -2,6 +2,7 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Queue\SerializesModels; class Authenticated @@ -16,8 +17,8 @@ class Authenticated * @return void */ public function __construct( - public $guard, - public $user, + public string $guard, + public Authenticatable $user, ) { } } diff --git a/src/Illuminate/Auth/Events/CurrentDeviceLogout.php b/src/Illuminate/Auth/Events/CurrentDeviceLogout.php index 8f2e694ffbd5..0ddb8793e4df 100644 --- a/src/Illuminate/Auth/Events/CurrentDeviceLogout.php +++ b/src/Illuminate/Auth/Events/CurrentDeviceLogout.php @@ -2,6 +2,7 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Queue\SerializesModels; class CurrentDeviceLogout @@ -16,8 +17,8 @@ class CurrentDeviceLogout * @return void */ public function __construct( - public $guard, - public $user, + public string $guard, + public Authenticatable $user, ) { } } diff --git a/src/Illuminate/Auth/Events/Failed.php b/src/Illuminate/Auth/Events/Failed.php index 32a5610053b7..b2bcb09b2910 100644 --- a/src/Illuminate/Auth/Events/Failed.php +++ b/src/Illuminate/Auth/Events/Failed.php @@ -2,6 +2,8 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\Authenticatable; + class Failed { /** @@ -13,9 +15,9 @@ class Failed * @return void */ public function __construct( - public $guard, - public $user, - #[\SensitiveParameter] public $credentials, + public string $guard, + public ?Authenticatable $user, + #[\SensitiveParameter] public array $credentials, ) { } } diff --git a/src/Illuminate/Auth/Events/Lockout.php b/src/Illuminate/Auth/Events/Lockout.php index 347943feb181..0adb1f578f1a 100644 --- a/src/Illuminate/Auth/Events/Lockout.php +++ b/src/Illuminate/Auth/Events/Lockout.php @@ -6,21 +6,14 @@ class Lockout { - /** - * The throttled request. - * - * @var \Illuminate\Http\Request - */ - public $request; - /** * Create a new event instance. * * @param \Illuminate\Http\Request $request * @return void */ - public function __construct(Request $request) - { - $this->request = $request; + public function __construct( + public Request $request, + ) { } } diff --git a/src/Illuminate/Auth/Events/Login.php b/src/Illuminate/Auth/Events/Login.php index c3e2e69e9832..402c8379a11d 100644 --- a/src/Illuminate/Auth/Events/Login.php +++ b/src/Illuminate/Auth/Events/Login.php @@ -2,6 +2,7 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Queue\SerializesModels; class Login @@ -17,9 +18,9 @@ class Login * @return void */ public function __construct( - public $guard, - public $user, - public $remember, + public string $guard, + public Authenticatable $user, + public bool $remember, ) { } } diff --git a/src/Illuminate/Auth/Events/Logout.php b/src/Illuminate/Auth/Events/Logout.php index e13693be67e9..7fd19f50fff7 100644 --- a/src/Illuminate/Auth/Events/Logout.php +++ b/src/Illuminate/Auth/Events/Logout.php @@ -2,6 +2,7 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Queue\SerializesModels; class Logout @@ -16,8 +17,8 @@ class Logout * @return void */ public function __construct( - public $guard, - public $user, + public string $guard, + public Authenticatable $user, ) { } } diff --git a/src/Illuminate/Auth/Events/OtherDeviceLogout.php b/src/Illuminate/Auth/Events/OtherDeviceLogout.php index 5687086910ba..3a63c98ed890 100644 --- a/src/Illuminate/Auth/Events/OtherDeviceLogout.php +++ b/src/Illuminate/Auth/Events/OtherDeviceLogout.php @@ -2,6 +2,7 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Queue\SerializesModels; class OtherDeviceLogout @@ -16,8 +17,8 @@ class OtherDeviceLogout * @return void */ public function __construct( - public $guard, - public $user, + public string $guard, + public Authenticatable $user, ) { } } diff --git a/src/Illuminate/Auth/Events/PasswordReset.php b/src/Illuminate/Auth/Events/PasswordReset.php index cb09d8a92498..ef0dbf84603f 100644 --- a/src/Illuminate/Auth/Events/PasswordReset.php +++ b/src/Illuminate/Auth/Events/PasswordReset.php @@ -2,6 +2,7 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Queue\SerializesModels; class PasswordReset @@ -15,7 +16,7 @@ class PasswordReset * @return void */ public function __construct( - public $user, + public Authenticatable $user, ) { } } diff --git a/src/Illuminate/Auth/Events/PasswordResetLinkSent.php b/src/Illuminate/Auth/Events/PasswordResetLinkSent.php index 2540a2e6ee46..1141d8d092bd 100644 --- a/src/Illuminate/Auth/Events/PasswordResetLinkSent.php +++ b/src/Illuminate/Auth/Events/PasswordResetLinkSent.php @@ -2,6 +2,7 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\CanResetPassword; use Illuminate\Queue\SerializesModels; class PasswordResetLinkSent @@ -15,7 +16,7 @@ class PasswordResetLinkSent * @return void */ public function __construct( - public $user, + public CanResetPassword $user, ) { } } diff --git a/src/Illuminate/Auth/Events/Registered.php b/src/Illuminate/Auth/Events/Registered.php index 646cdaf95051..9be366a631f6 100644 --- a/src/Illuminate/Auth/Events/Registered.php +++ b/src/Illuminate/Auth/Events/Registered.php @@ -2,6 +2,7 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Queue\SerializesModels; class Registered @@ -15,7 +16,7 @@ class Registered * @return void */ public function __construct( - public $user, + public Authenticatable $user, ) { } } diff --git a/src/Illuminate/Auth/Events/Validated.php b/src/Illuminate/Auth/Events/Validated.php index 5cd01a533363..b5e33f63e032 100644 --- a/src/Illuminate/Auth/Events/Validated.php +++ b/src/Illuminate/Auth/Events/Validated.php @@ -2,6 +2,7 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Queue\SerializesModels; class Validated @@ -16,8 +17,8 @@ class Validated * @return void */ public function __construct( - public $guard, - public $user, + public string $guard, + public Authenticatable $user, ) { } } diff --git a/src/Illuminate/Auth/Events/Verified.php b/src/Illuminate/Auth/Events/Verified.php index 03c2aff12e81..ed1161dc1c1b 100644 --- a/src/Illuminate/Auth/Events/Verified.php +++ b/src/Illuminate/Auth/Events/Verified.php @@ -2,6 +2,7 @@ namespace Illuminate\Auth\Events; +use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Queue\SerializesModels; class Verified @@ -15,7 +16,7 @@ class Verified * @return void */ public function __construct( - public $user, + public MustVerifyEmail $user, ) { } }