WIP

inertiajs · Sep 30, 2020 · 1e4ae86 · 1e4ae86
1 parent 55136dd
commit 1e4ae86
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -59,11 +59,8 @@ protected function registerMiddleware()
         if (method_exists($kernel, 'appendMiddlewareToGroup')) {
             $kernel->appendMiddlewareToGroup($group, Middleware::class);
 
-            return;
-        }
-
         // Laravel >= 5.4.4 && < 6.9.0
-        if ($this->app[Router::class]->hasMiddlewareGroup($group)) {
+        } elseif ($this->app[Router::class]->hasMiddlewareGroup($group)) {
             $this->app[Router::class]->pushMiddlewareToGroup($group, Middleware::class);
         }
     }

diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -51,10 +51,14 @@ public function test_route_macro_is_registered()
 
     public function test_middleware_is_registered_to_the_web_group()
     {
-        $route = Route::middleware('web')->get('/');
-        $middleware = App::make(Router::class)->gatherRouteMiddleware($route);
+        $webRoute = Route::middleware('web')->get('/');
+        $apiRoute = Route::middleware('api')->get('/');
 
-        $this->assertContains(Middleware::class, $middleware);
+        $webMiddleware = App::make(Router::class)->gatherRouteMiddleware($webRoute);
+        $apiMiddleware = App::make(Router::class)->gatherRouteMiddleware($apiRoute);
+
+        $this->assertContains(Middleware::class, $webMiddleware);
+        $this->assertNotContains(Middleware::class, $apiMiddleware);
     }
 
     public function test_validation_errors_are_registered()