From 5cf20c3424fb5a57aac82e476e637493a3f32030 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Mon, 22 Aug 2016 14:34:21 -0400
Subject: [PATCH] Pull in changes from laravel upstream

---
 .laravel-commit                        | 2 +-
 app/Providers/RouteServiceProvider.php | 2 +-
 database/factories/ModelFactory.php    | 4 +++-
 routes/api.php                         | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.laravel-commit b/.laravel-commit
index 8d08a51..635c8a4 100644
--- a/.laravel-commit
+++ b/.laravel-commit
@@ -1 +1 @@
-268953862ff649ccf186e6740cd2e9af40b8906a
+e959c228400341d4f2f8812606a0b16d740a2f2d
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 057f82c..7e6b14f 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -69,7 +69,7 @@ class RouteServiceProvider extends ServiceProvider
     protected function mapApiRoutes()
     {
         Route::group([
-            'middleware' => ['api', 'auth:api'],
+            'middleware' => 'api',
             'namespace' => $this->namespace,
             'prefix' => 'api',
         ], function ($router) {
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index f596d0b..5995164 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -12,10 +12,12 @@
 */
 
 $factory->define(App\User::class, function (Faker\Generator $faker) {
+    static $password;
+
     return [
         'name' => $faker->name,
         'email' => $faker->safeEmail,
-        'password' => bcrypt(str_random(10)),
+        'password' => $password ?: $password = bcrypt('secret'),
         'remember_token' => str_random(10),
     ];
 });
diff --git a/routes/api.php b/routes/api.php
index 32f7cf7..6b907f3 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -15,4 +15,4 @@ use Illuminate\Http\Request;
 
 Route::get('/user', function (Request $request) {
     return $request->user();
-});
+})->middleware('auth:api');