From 69072738c0e63e574937d87d4dedb430c9d0afae Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Wed, 11 Dec 2024 15:19:35 -0600 Subject: [PATCH] use promoted properties for Mail events - move property comments to constructor docblock - add type hints to `public` properties - rename `MessageSent` constructor parameter `$message` to `$sent` to match property name --- src/Illuminate/Mail/Events/MessageSending.php | 26 +++++-------------- src/Illuminate/Mail/Events/MessageSent.php | 26 +++++-------------- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/src/Illuminate/Mail/Events/MessageSending.php b/src/Illuminate/Mail/Events/MessageSending.php index 31435fb6e0e7..3353a43c26dc 100644 --- a/src/Illuminate/Mail/Events/MessageSending.php +++ b/src/Illuminate/Mail/Events/MessageSending.php @@ -6,30 +6,16 @@ class MessageSending { - /** - * The Symfony Email instance. - * - * @var \Symfony\Component\Mime\Email - */ - public $message; - - /** - * The message data. - * - * @var array - */ - public $data; - /** * Create a new event instance. * - * @param \Symfony\Component\Mime\Email $message - * @param array $data + * @param \Symfony\Component\Mime\Email $message The Symfony Email instance. + * @param array $data The message data. * @return void */ - public function __construct(Email $message, array $data = []) - { - $this->data = $data; - $this->message = $message; + public function __construct( + public Email $message, + public array $data = [], + ) { } } diff --git a/src/Illuminate/Mail/Events/MessageSent.php b/src/Illuminate/Mail/Events/MessageSent.php index 954704c14557..1634676aa02d 100644 --- a/src/Illuminate/Mail/Events/MessageSent.php +++ b/src/Illuminate/Mail/Events/MessageSent.php @@ -11,31 +11,17 @@ */ class MessageSent { - /** - * The message that was sent. - * - * @var \Illuminate\Mail\SentMessage - */ - public $sent; - - /** - * The message data. - * - * @var array - */ - public $data; - /** * Create a new event instance. * - * @param \Illuminate\Mail\SentMessage $message - * @param array $data + * @param \Illuminate\Mail\SentMessage $sent The message that was sent. + * @param array $data The message data. * @return void */ - public function __construct(SentMessage $message, array $data = []) - { - $this->sent = $message; - $this->data = $data; + public function __construct( + public SentMessage $sent, + public array $data = [], + ) { } /**