chore: Try to avoid Route:: all lookup

medz · Mar 16, 2018 · 39ad437 · 39ad437
1 parent cade0f5
commit 39ad437
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Laravel/Middleware/Cors.php b/src/Laravel/Middleware/Cors.php
@@ -95,9 +95,6 @@ protected function hasShouldRouteGroup($request): bool
 
         $shouldClsssName = ShouldGroup::class;
         $shouldAlias = collect(Route::getMiddleware())->flip()->get($shouldClsssName, $shouldClsssName);
-        $middlewareGroups = collect(Route::getMiddlewareGroups())->filter(function ($group) use ($shouldClsssName, $shouldAlias) {
-            return in_array($shouldAlias, $group) || in_array($shouldClsssName, $group);
-        })->keys();
         $gatherMiddleware = collect(Route::getRoutes()->get())->first(function ($route) use ($request) {
             return $route->uri() === $request->path();
         })->gatherMiddleware();
@@ -106,6 +103,10 @@ protected function hasShouldRouteGroup($request): bool
             return true;
         }
 
+        $middlewareGroups = collect(Route::getMiddlewareGroups())->filter(function ($group) use ($shouldClsssName, $shouldAlias) {
+            return in_array($shouldAlias, $group) || in_array($shouldClsssName, $group);
+        })->keys();
+
         return $middlewareGroups->filter(function ($value) use ($gatherMiddleware) {
             return in_array($value, $gatherMiddleware);
         })->isNotEmpty();