Skip to content

Commit 1e4ae86

Browse files
committed
WIP
1 parent 55136dd commit 1e4ae86

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/ServiceProvider.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,8 @@ protected function registerMiddleware()
5959
if (method_exists($kernel, 'appendMiddlewareToGroup')) {
6060
$kernel->appendMiddlewareToGroup($group, Middleware::class);
6161

62-
return;
63-
}
64-
6562
// Laravel >= 5.4.4 && < 6.9.0
66-
if ($this->app[Router::class]->hasMiddlewareGroup($group)) {
63+
} elseif ($this->app[Router::class]->hasMiddlewareGroup($group)) {
6764
$this->app[Router::class]->pushMiddlewareToGroup($group, Middleware::class);
6865
}
6966
}

tests/ServiceProviderTest.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,14 @@ public function test_route_macro_is_registered()
5151

5252
public function test_middleware_is_registered_to_the_web_group()
5353
{
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('/');
5656

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);
5862
}
5963

6064
public function test_validation_errors_are_registered()

0 commit comments

Comments
 (0)