From 745d16c6107bef96364dfffaca891bee0586d5dc Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed, 19 Oct 2016 21:51:12 +0100
Subject: [PATCH] Bring in upstream changed from github.com/laravel/laravel

Squashed commit of the following:

commit e6e0ea2e6e0db9637ae67dfa913ec42f7f08b81e
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Wed Oct 19 21:49:59 2016 +0100

    Remove needless .gitkeep files

commit 1c7704b2913c689c6cad0eb934787e9fedf0f4fa
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Wed Oct 19 21:48:47 2016 +0100

    Use fullpath import for the validator facade

commit dbc28853b6712ba040394cf9943a1a8de85bf44c
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Wed Oct 19 21:46:07 2016 +0100

    Add redirectTo attribute to the reset password controller

commit 0555680e24c0175acce0be66a2f332c5fa4b35a1
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Wed Oct 19 21:44:00 2016 +0100

    Ignore Passport-generated OAuth keys

commit 1be872180c52bc267cd43f3a7b8e2b49b4c6f023
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Wed Oct 19 21:41:42 2016 +0100

    Fixing typehint

commit d72b783f8511898fe13fbb99fa5739a846801db9
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Wed Oct 19 21:40:35 2016 +0100

    fix spacing

commit 4870a56fbe273a37ce67203c0e0aed857dccbb1f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Wed Oct 19 21:39:54 2016 +0100

    Add typehint for factory
---
 .gitignore                                            | 1 +
 app/Http/Controllers/Auth/RegisterController.php      | 2 +-
 app/Http/Controllers/Auth/ResetPasswordController.php | 7 +++++++
 database/factories/ModelFactory.php                   | 1 +
 database/migrations/.gitkeep                          | 1 -
 database/seeds/.gitkeep                               | 1 -
 6 files changed, 10 insertions(+), 3 deletions(-)
 delete mode 100644 database/migrations/.gitkeep
 delete mode 100644 database/seeds/.gitkeep

diff --git a/.gitignore b/.gitignore
index f791bec4..15f823fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ Homestead.json
 /public/files
 /public/keybase.txt
 /coverage
+/storage/*.key
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 34c376cf..e48e2e3b 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Auth;
 
 use App\User;
-use Validator;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
 class RegisterController extends Controller
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index c73bf99f..cf726eec 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -20,6 +20,13 @@ class ResetPasswordController extends Controller
 
     use ResetsPasswords;
 
+    /**
+     * Where to redirect users after resetting their password.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
     /**
      * Create a new controller instance.
      *
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index df9993c9..1eb6c116 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -11,6 +11,7 @@
 |
 */
 
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
 $factory->define(App\User::class, function (Faker\Generator $faker) {
     return [
         'name' => $faker->name,
diff --git a/database/migrations/.gitkeep b/database/migrations/.gitkeep
deleted file mode 100644
index 8b137891..00000000
--- a/database/migrations/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/database/seeds/.gitkeep b/database/seeds/.gitkeep
deleted file mode 100644
index 8b137891..00000000
--- a/database/seeds/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-