From 9089ae21ac4ac79e54b5f625b37fc4a39cc2ec09 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Wed, 26 Oct 2016 11:05:43 -0400
Subject: [PATCH] Pull in upstream laravel updates

---
 .gitignore                                                | 3 +--
 .laravel-commit                                           | 2 +-
 app/Http/Controllers/Auth/RegisterController.php          | 2 +-
 app/Http/Controllers/Auth/ResetPasswordController.php     | 7 +++++++
 config/filesystems.php                                    | 8 ++++----
 database/factories/ModelFactory.php                       | 1 +
 database/migrations/.gitkeep                              | 0
 .../migrations/2014_10_12_000000_create_users_table.php   | 2 +-
 .../2014_10_12_100000_create_password_resets_table.php    | 2 +-
 database/seeds/.gitkeep                                   | 0
 10 files changed, 17 insertions(+), 10 deletions(-)
 delete mode 100644 database/migrations/.gitkeep
 delete mode 100644 database/seeds/.gitkeep

diff --git a/.gitignore b/.gitignore
index c94d145..e33e4dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@
 /public/fonts
 /public/uploads
 /storage/exports
+/storage.*.key
 /.idea
 .env
-Homestead.yaml
-Homestead.json
diff --git a/.laravel-commit b/.laravel-commit
index 05c86ec..7a017e1 100644
--- a/.laravel-commit
+++ b/.laravel-commit
@@ -1 +1 @@
-f4606d2bb94dc9579488df61fa3744b17e91be62
+6a2bf4476528a359e9b80a296f26830f75770d35
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 69c667e..0eb1679 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 c73bf99..2c863aa 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 = '/';
+
     /**
      * Create a new controller instance.
      *
diff --git a/config/filesystems.php b/config/filesystems.php
index 75b5002..e1c4c95 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -8,10 +8,8 @@ return [
     |--------------------------------------------------------------------------
     |
     | Here you may specify the default filesystem disk that should be used
-    | by the framework. A "local" driver, as well as a variety of cloud
-    | based drivers are available for your choosing. Just store away!
-    |
-    | Supported: "local", "ftp", "s3", "rackspace"
+    | by the framework. The "local" disk, as well as a variety of cloud
+    | based disks are available to your application. Just store away!
     |
     */
 
@@ -39,6 +37,8 @@ return [
     | may even configure multiple disks of the same driver. Defaults have
     | been setup for each driver as an example of the required options.
     |
+    | Supported Drivers: "local", "ftp", "s3", "rackspace"
+    |
     */
 
     'disks' => [
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index e0dc869..7926c79 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) {
     static $password;
 
diff --git a/database/migrations/.gitkeep b/database/migrations/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 72644b2..07f6139 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -30,6 +30,6 @@ class CreateUsersTable extends Migration
      */
     public function down()
     {
-        Schema::drop('users');
+        Schema::dropIfExists('users');
     }
 }
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
index c15e17f..77fdea8 100644
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -27,6 +27,6 @@ class CreatePasswordResetsTable extends Migration
      */
     public function down()
     {
-        Schema::drop('password_resets');
+        Schema::dropIfExists('password_resets');
     }
 }
diff --git a/database/seeds/.gitkeep b/database/seeds/.gitkeep
deleted file mode 100644
index e69de29..0000000