From ab4616a3ad1ce2dda1c062b508be015f0c5cec30 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 29 Mar 2016 16:10:51 +0200 Subject: [PATCH] Make some vars longer. --- app/Events/ResendConfirmation.php | 11 +++++------ app/Events/UserRegistration.php | 9 ++++----- app/Handlers/Events/SendRegistrationMail.php | 2 +- app/Handlers/Events/UserConfirmation.php | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/Events/ResendConfirmation.php b/app/Events/ResendConfirmation.php index 813334f5aa..6b7091ee24 100644 --- a/app/Events/ResendConfirmation.php +++ b/app/Events/ResendConfirmation.php @@ -21,19 +21,18 @@ class ResendConfirmation extends Event { use SerializesModels; - public $ip; + public $ipAddress; public $user; /** * Create a new event instance. * * @param User $user - * - * @param string $ip + * @param string $ipAddress */ - public function __construct(User $user, string $ip) + public function __construct(User $user, string $ipAddress) { - $this->user = $user; - $this->ip = $ip; + $this->user = $user; + $this->ipAddress = $ipAddress; } } \ No newline at end of file diff --git a/app/Events/UserRegistration.php b/app/Events/UserRegistration.php index 9ede0bfc2e..5f19b3f776 100644 --- a/app/Events/UserRegistration.php +++ b/app/Events/UserRegistration.php @@ -21,19 +21,18 @@ class UserRegistration extends Event { use SerializesModels; - public $ip; + public $ipAddress; public $user; /** * Create a new event instance. * * @param User $user - * - * @param string $ip + * @param string $ipAddress */ - public function __construct(User $user, string $ip) + public function __construct(User $user, string $ipAddress) { $this->user = $user; - $this->ip = $ip; + $this->ip = $ipAddress; } } \ No newline at end of file diff --git a/app/Handlers/Events/SendRegistrationMail.php b/app/Handlers/Events/SendRegistrationMail.php index 03e74a2e3e..71d623641b 100644 --- a/app/Handlers/Events/SendRegistrationMail.php +++ b/app/Handlers/Events/SendRegistrationMail.php @@ -48,7 +48,7 @@ class SendRegistrationMail // get the email address $email = $event->user->email; $address = route('index'); - $ipAddress = $event->ip; + $ipAddress = $event->ipAddress; // send email. try { Mail::send( diff --git a/app/Handlers/Events/UserConfirmation.php b/app/Handlers/Events/UserConfirmation.php index 536e9ed671..fe7eaa56bc 100644 --- a/app/Handlers/Events/UserConfirmation.php +++ b/app/Handlers/Events/UserConfirmation.php @@ -42,7 +42,7 @@ class UserConfirmation public function resendConfirmation(ResendConfirmation $event) { $user = $event->user; - $ipAddress = $event->ip; + $ipAddress = $event->ipAddress; $this->doConfirm($user, $ipAddress); } @@ -54,7 +54,7 @@ class UserConfirmation public function sendConfirmation(UserRegistration $event) { $user = $event->user; - $ipAddress = $event->ip; + $ipAddress = $event->ipAddress; $this->doConfirm($user, $ipAddress); }