Merge branch '4.1'

Author: jrean

src/Mail/VerificationTokenGenerated.php

@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of Jrean\UserVerification package.
+ *
+ * (c) Jean Ragouin <[email protected]> <www.askjong.com>
+ */
 namespace Jrean\UserVerification\Mail;
 
 use Illuminate\Bus\Queueable;
@@ -22,40 +26,44 @@ class VerificationTokenGenerated extends Mailable
     /**
      * The subject of the message.
      *
-     * @var string
+     * @var string|null
      */
     public $subject;
 
     /**
-     * The person the message is from.
+     * The person/company/project e-mail the message is from.
      *
-     * @var mixed
+     * @var string|null
      */
-    public $from;
+    public $from_address;
 
     /**
-     * The person name the message is from.
+     * The person/company/project name the message is from.
      *
-     * @var mixed
+     * @var string|null
      */
-    public $name;
+    public $from_name;
 
     /**
      * Create a new message instance.
      *
+     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
+     * @param  string|null  $subject
+     * @param  string|null  $from_address
+     * @param  string|null  $from_name
      * @return void
      */
     public function __construct(
         AuthenticatableContract $user,
         $subject = null,
-        $from = null,
-        $name = null
+        $from_address = null,
+        $from_name = null
     )
     {
         $this->user = $user;
         $this->subject = $subject;
-        $this->from = $from;
-        $this->name = $name;
+        $this->from_address = $from_address;
+        $this->from_name = $from_name;
     }
 
     /**
@@ -65,18 +73,22 @@ public function __construct(
      */
     public function build()
     {
-        if (! empty($this->from)) {
-            $this->from($this->from, $this->name);
+        if (! empty($this->from_address)) {
+            $this->from($this->from_address, $this->from_name);
         }
 
         $this->subject(is_null($this->subject)
             ? trans('laravel-user-verification::user-verification.verification_email_subject')
             : $this->subject);
 
         if (config('user-verification.email.type') == 'markdown') {
-            $this->markdown('laravel-user-verification::email-markdown');
+            is_null($view = config('user-verification.email.view'))
+                ? $this->markdown('laravel-user-verification::email-markdown')
+                : $this->markdown($view);
         } else {
-            $this->view('laravel-user-verification::email');
+            is_null($view = config('user-verification.email.view'))
+                ? $this->view('laravel-user-verification::email')
+                : $this->view($view);
         }
 
         return $this;

src/UserVerification.php

@@ -196,7 +196,7 @@ protected function emailVerificationLink(
     )
     {
         return $this->mailer
-            ->to($user->email)
+            ->to($user)
             ->send(new VerificationTokenGenerated($user, $subject, $from, $name));
     }
 
@@ -217,7 +217,7 @@ protected function emailQueueVerificationLink(
     )
     {
         return $this->mailer
-            ->to($user->email)
+            ->to($user)
             ->queue(new VerificationTokenGenerated($user, $subject, $from, $name));
     }
 
@@ -240,7 +240,7 @@ protected function emailLaterVerificationLink(
     )
     {
         return $this->mailer
-            ->to($user->email)
+            ->to($user)
             ->later($delay, new VerificationTokenGenerated($user, $subject, $from, $name));
     }
 

src/config/user-verification.php

@@ -3,26 +3,43 @@
 return [
 
     /*
-    |--------------------------------------------------------------------------
-    | Default Email View Type
-    |--------------------------------------------------------------------------
-    |
-    | This option controls the default email view type.
-    |
-    | Supported: "default", "markdown"
+    |---------------------------------------------------------------------------
+    | E-mail options
+    |---------------------------------------------------------------------------
     |
     */
     'email' => [
+        /*
+        |-----------------------------------------------------------------------
+        | Email View Type
+        |-----------------------------------------------------------------------
+        |
+        | This option defines the email view type.
+        |
+        | Supported: "default", "markdown"
+        |
+        */
         'type' => 'default',
+
+        /*
+        |-----------------------------------------------------------------------
+        | Custom view name
+        |-----------------------------------------------------------------------
+        |
+        | This option defines a custom view name.
+        |
+        */
+        'view' => null,
     ],
 
     /*
-    |--------------------------------------------------------------------------
+    |---------------------------------------------------------------------------
     | Log the user in after verification
-    |--------------------------------------------------------------------------
+    |---------------------------------------------------------------------------
     |
-    | This option defines if the user should be loged in after verification.
+    | This option defines if the user should be logged in after verification.
     | USE WITH CAUTION as it may introduce security issues in your app.
+    | By default Laravel log in a new registered user.
     |
     | Supported: (bool) "true", "false"
     |