Merge branch 'master' into 3.0

Author: jrean

src/UserVerification.php

@@ -331,7 +331,15 @@ protected function updateUser($user)
     protected function emailVerificationLink(AuthenticatableContract $user, $subject, $from = null, $name = null)
     {
         return $this->mailer->send($this->emailView, compact('user'), function ($m) use ($user, $subject, $from, $name) {
-            $m = $this->createVerificationEmail($m, $user, $subject, $from, $name);
+            if (! empty($from)) {
+                $m->from($from, $name);
+            }
+
+            $m->to($user->email);
+
+            $m->subject(is_null($subject) ? trans('laravel-user-verification::user-verification.verification_email_subject') : $subject);
+
+            event(new VerificationEmailSent($user));
         });
     }
 
@@ -347,7 +355,15 @@ protected function emailVerificationLink(AuthenticatableContract $user, $subject
     protected function emailQueueVerificationLink(AuthenticatableContract $user, $subject, $from = null, $name = null)
     {
         return $this->mailer->queue($this->emailView, compact('user'), function ($m) use ($user, $subject, $from, $name) {
-            $m = $this->createVerificationEmail($m, $user, $subject, $from, $name);
+            if (! empty($from)) {
+                $m->from($from, $name);
+            }
+
+            $m->to($user->email);
+
+            $m->subject(is_null($subject) ? trans('laravel-user-verification::user-verification.verification_email_subject') : $subject);
+
+            event(new VerificationEmailSent($user));
         });
     }
 
@@ -364,7 +380,15 @@ protected function emailQueueVerificationLink(AuthenticatableContract $user, $su
     protected function emailQueueOnVerificationLink($queue, AuthenticatableContract $user, $subject, $from = null, $name = null)
     {
         return $this->mailer->queueOn($queue, $this->emailView, compact('user'), function ($m) use ($user, $subject, $from, $name) {
-            $m = $this->createVerificationEmail($m, $user, $subject, $from, $name);
+            if (! empty($from)) {
+                $m->from($from, $name);
+            }
+
+            $m->to($user->email);
+
+            $m->subject(is_null($subject) ? trans('laravel-user-verification::user-verification.verification_email_subject') : $subject);
+
+            event(new VerificationEmailSent($user));
         });
     }
 
@@ -381,7 +405,15 @@ protected function emailQueueOnVerificationLink($queue, AuthenticatableContract
     protected function emailLaterVerificationLink($seconds, AuthenticatableContract $user, $subject, $from = null, $name = null)
     {
         return $this->mailer->later($seconds, $this->emailView, compact('user'), function ($m) use ($user, $subject, $from, $name) {
-            $m = $this->createVerificationEmail($m, $user, $subject, $from, $name);
+            if (! empty($from)) {
+                $m->from($from, $name);
+            }
+
+            $m->to($user->email);
+
+            $m->subject(is_null($subject) ? trans('laravel-user-verification::user-verification.verification_email_subject') : $subject);
+
+            event(new VerificationEmailSent($user));
         });
     }
 
@@ -398,33 +430,16 @@ protected function emailLaterVerificationLink($seconds, AuthenticatableContract
     protected function emailLaterOnVerificationLink($queue, $seconds, AuthenticatableContract $user, $subject, $from = null, $name = null)
     {
         return $this->mailer->laterOn($queue, $seconds, $this->emailView, compact('user'), function ($m) use ($user, $subject, $from, $name) {
-            $m = $this->createVerificationEmail($m, $user, $subject, $from, $name);
-        });
-    }
+            if (! empty($from)) {
+                $m->from($from, $name);
+            }
 
-    /**
-     * Creates and format the e-mail to be sent.
-     *
-     * @param  string  $mail
-     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
-     * @param  string  $subject
-     * @param  string  $from
-     * @param  string  $name
-     * @return mixed
-     */
-    protected function createVerificationEmail($mail, $user, $subject, $from, $name)
-    {
-        if (! empty($from)) {
-            $mail->from($from, $name);
-        }
+            $m->to($user->email);
 
-        $mail->to($user->email);
+            $m->subject(is_null($subject) ? trans('laravel-user-verification::user-verification.verification_email_subject') : $subject);
 
-        $mail->subject(is_null($subject) ? trans('laravel-user-verification::user-verification.verification_email_subject') : $subject);
-
-        event(new VerificationEmailSent($user));
-
-        return $mail;
+            event(new VerificationEmailSent($user));
+        });
     }
 
     /**