From 112c7b15f7139436f2bbd0f3486783dff0db3718 Mon Sep 17 00:00:00 2001 From: zine <21418592@qq.com> Date: Mon, 12 Jun 2017 22:21:20 +0800 Subject: [PATCH 1/2] Create RequestGuard.php use Illuminate\Support\Traits\Macroable; --- src/Illuminate/Auth/RequestGuard.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Auth/RequestGuard.php b/src/Illuminate/Auth/RequestGuard.php index 30b3a1d77404..408b445735de 100644 --- a/src/Illuminate/Auth/RequestGuard.php +++ b/src/Illuminate/Auth/RequestGuard.php @@ -4,10 +4,11 @@ use Illuminate\Http\Request; use Illuminate\Contracts\Auth\Guard; +use Illuminate\Support\Traits\Macroable; class RequestGuard implements Guard { - use GuardHelpers; + use GuardHelpers,Macroable; /** * The guard callback. From a13c78cba43d6d9e3d72b10f72b782082d29cdc9 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 12 Jun 2017 18:11:51 -0500 Subject: [PATCH 2/2] Update RequestGuard.php --- src/Illuminate/Auth/RequestGuard.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Auth/RequestGuard.php b/src/Illuminate/Auth/RequestGuard.php index 408b445735de..d1a18c0f65bf 100644 --- a/src/Illuminate/Auth/RequestGuard.php +++ b/src/Illuminate/Auth/RequestGuard.php @@ -8,7 +8,7 @@ class RequestGuard implements Guard { - use GuardHelpers,Macroable; + use GuardHelpers, Macroable; /** * The guard callback.