File tree Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -59,11 +59,8 @@ protected function registerMiddleware()
59
59
if (method_exists ($ kernel , 'appendMiddlewareToGroup ' )) {
60
60
$ kernel ->appendMiddlewareToGroup ($ group , Middleware::class);
61
61
62
- return ;
63
- }
64
-
65
62
// Laravel >= 5.4.4 && < 6.9.0
66
- if ($ this ->app [Router::class]->hasMiddlewareGroup ($ group )) {
63
+ } elseif ($ this ->app [Router::class]->hasMiddlewareGroup ($ group )) {
67
64
$ this ->app [Router::class]->pushMiddlewareToGroup ($ group , Middleware::class);
68
65
}
69
66
}
Original file line number Diff line number Diff line change @@ -51,10 +51,14 @@ public function test_route_macro_is_registered()
51
51
52
52
public function test_middleware_is_registered_to_the_web_group ()
53
53
{
54
- $ route = Route::middleware ('web ' )->get ('/ ' );
55
- $ middleware = App:: make (Router::class )->gatherRouteMiddleware ( $ route );
54
+ $ webRoute = Route::middleware ('web ' )->get ('/ ' );
55
+ $ apiRoute = Route:: middleware ( ' api ' )->get ( ' / ' );
56
56
57
- $ this ->assertContains (Middleware::class, $ middleware );
57
+ $ webMiddleware = App::make (Router::class)->gatherRouteMiddleware ($ webRoute );
58
+ $ apiMiddleware = App::make (Router::class)->gatherRouteMiddleware ($ apiRoute );
59
+
60
+ $ this ->assertContains (Middleware::class, $ webMiddleware );
61
+ $ this ->assertNotContains (Middleware::class, $ apiMiddleware );
58
62
}
59
63
60
64
public function test_validation_errors_are_registered ()
You can’t perform that action at this time.
0 commit comments