fix(Laravel): Fixed get current route is null, reading gather middle…

…ware error.
medz · Apr 8, 2018 · 26c2841 · 26c2841
1 parent d0ab007
commit 26c2841
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Laravel/Middleware/Cors.php b/src/Laravel/Middleware/Cors.php
@@ -95,9 +95,13 @@ protected function hasShouldRouteGroup($request): bool
 
         $shouldClsssName = ShouldGroup::class;
         $shouldAlias = collect(Route::getMiddleware())->flip()->get($shouldClsssName, $shouldClsssName);
-        $gatherMiddleware = collect(Route::getRoutes()->get())->first(function ($route) use ($request) {
+        $route = collect(Route::getRoutes()->get())->first(function ($route) use ($request) {
             return $route->matches($request, false);
-        })->gatherMiddleware();
+        });
+        if (! $route) {
+            return false;
+        }
+        $gatherMiddleware = $route->gatherMiddleware();
 
         if (in_array($shouldClsssName, $gatherMiddleware) || in_array($shouldAlias, $gatherMiddleware)) {
             return true;