From 26848d1f071792f789421bdb2476e5b78fd2f282 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Thu, 22 Sep 2016 13:40:58 -0400
Subject: [PATCH] Pull in upstream laravel changes

---
 .laravel-commit                     | 2 +-
 config/app.php                      | 1 +
 database/factories/ModelFactory.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.laravel-commit b/.laravel-commit
index ca8e85b..05c86ec 100644
--- a/.laravel-commit
+++ b/.laravel-commit
@@ -1 +1 @@
-49a48100a79c13da3de27e91b0a77742e7cb2227
+f4606d2bb94dc9579488df61fa3744b17e91be62
diff --git a/config/app.php b/config/app.php
index 0071caa..06a30f5 100644
--- a/config/app.php
+++ b/config/app.php
@@ -206,6 +206,7 @@ return [
         'Artisan' => Illuminate\Support\Facades\Artisan::class,
         'Auth' => Illuminate\Support\Facades\Auth::class,
         'Blade' => Illuminate\Support\Facades\Blade::class,
+        'Bus' => Illuminate\Support\Facades\Bus::class,
         'Cache' => Illuminate\Support\Facades\Cache::class,
         'Config' => Illuminate\Support\Facades\Config::class,
         'Cookie' => Illuminate\Support\Facades\Cookie::class,
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 5995164..e0dc869 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -16,7 +16,7 @@ $factory->define(App\User::class, function (Faker\Generator $faker) {
 
     return [
         'name' => $faker->name,
-        'email' => $faker->safeEmail,
+        'email' => $faker->unique()->safeEmail,
         'password' => $password ?: $password = bcrypt('secret'),
         'remember_token' => str_random(10),
     ];