Merge branch 'master' into 3.0

Author: jrean

README.md

@@ -187,13 +187,15 @@ No user found for the given e-mail adresse.
 
 ### Error View
 
-Create a view for the default verification error route `/verification/error` at
-`resources/views/errors/user-verification.blade.php`. If an error occurs, the
-user will be redirected to this route and this view will be rendered. **You
-must implement and customize this view to your needs.** For instance you may
-wish to display a short message saying that something went wrong and then ask
-for the user's e-mail again and start the process from scratch (generate, send,
-verify, ...).
+By default the `user-verification.blade.php` view will be loaded for the verification error route `/verification/error`. If an error occurs, the user will be redirected to this route and this view will be rendered.
+
+**You may customize this view to your needs.** To do so first publish the view to your resources folder:
+
+```
+    php artisan vendor:publish --tag=laravel-user-verification-views
+```
+
+The view will be available in the `resources/views/vendor/laravel-user-verification/` directory and can be customized.
 
 ## Usage
 
@@ -296,7 +298,7 @@ Where to redirect after a failling token verification.
 
 Name of the view returned by the getVerificationError method.
 
-* `$verificationEmailView = 'emails.user-verification';`
+* `$verificationErrorView = 'errors.user-verification';`
 
 Name of the default e-mail view.
 
@@ -346,8 +348,6 @@ Edit the `app\Http\Controllers\Auth\RegisterController.php` file.
 - [ ] Overwrite and customize the redirect attributes/properties paths
     available within the `RedirectsUsers` trait included by the
     `VerifiesUsers` trait. (not mandatory)
-- [ ] Overwrite the default error view name used by the `getVerificationError()` method
-    (not mandatory)
 - [x] Create the verification error view at
     `resources/views/errors/user-verification.blade.php` (mandatory)
 - [ ] Overwrite the contructor (not mandatory)

src/Traits/VerifiesUsers.php

@@ -74,7 +74,7 @@ protected function validateRequest(Request $request)
      */
     protected function verificationErrorView()
     {
-        return property_exists($this, 'verificationErrorView') ? $this->verificationErrorView : 'errors.user-verification';
+        return property_exists($this, 'verificationErrorView') ? $this->verificationErrorView : 'laravel-user-verification::user-verification';
     }
 
     /**

src/UserVerificationServiceProvider.php

@@ -11,6 +11,19 @@
 
 class UserVerificationServiceProvider extends ServiceProvider
 {
+    /**
+     * Perform post-registration booting of services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $this->loadViewsFrom(__DIR__.'/resources/views', 'laravel-user-verification');
+
+        $this->publishes([
+                __DIR__.'/resources/views' => resource_path('views/vendor/laravel-user-verification'),
+            ], 'laravel-user-verification-views');
+    }
     /**
      * Register the service provider.
      *

src/resources/views/user-verification.blade.php

@@ -0,0 +1,26 @@
+@extends('layouts.app')
+
+<!-- Main Content -->
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Verification failed</div>
+                <div class="panel-body">
+                    <span class="help-block">
+                        <strong>Your account could not be verified.</strong>
+                    </span>
+                    <div class="form-group">
+                        <div class="col-md-12">
+                            <a href="{{url('/')}}" class="btn btn-primary">
+                                Back
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection