Merge branch 'master' into 3.0

Author: jrean

src/UserVerification.php

@@ -331,15 +331,7 @@ 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) {
-            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));
+            $m = $this->createVerificationEmail($m, $user, $subject, $from, $name);
         });
     }
 
@@ -355,15 +347,7 @@ 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) {
-            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));
+            $m = $this->createVerificationEmail($m, $user, $subject, $from, $name);
         });
     }
 
@@ -380,15 +364,7 @@ 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) {
-            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));
+            $m = $this->createVerificationEmail($m, $user, $subject, $from, $name);
         });
     }
 
@@ -405,15 +381,7 @@ 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) {
-            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));
+            $m = $this->createVerificationEmail($m, $user, $subject, $from, $name);
         });
     }
 
@@ -430,16 +398,33 @@ 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) {
-            if (! empty($from)) {
-                $m->from($from, $name);
-            }
+            $m = $this->createVerificationEmail($m, $user, $subject, $from, $name);
+        });
+    }
 
-            $m->to($user->email);
+    /**
+     * 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->subject(is_null($subject) ? trans('laravel-user-verification::user-verification.verification_email_subject') : $subject);
+        $mail->to($user->email);
 
-            event(new VerificationEmailSent($user));
-        });
+        $mail->subject(is_null($subject) ? trans('laravel-user-verification::user-verification.verification_email_subject') : $subject);
+
+        event(new VerificationEmailSent($user));
+
+        return $mail;
     }
 
     /**