Fix #144: Fix route did not override dispatcher middlewares (#146)

yiisoft · Dec 26, 2021 · f0dc0cb · f0dc0cb
1 parent 077d4bc
commit f0dc0cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/Route.php b/src/Route.php
@@ -370,10 +370,6 @@ private function getDispatcherWithMiddlewares(): MiddlewareDispatcher
             throw new RuntimeException(sprintf('There is no dispatcher in the route %s.', $this->getData('name')));
         }
 
-        if ($this->dispatcher->hasMiddlewares()) {
-            return $this->dispatcher;
-        }
-
         /** @var mixed $definition */
         foreach ($this->middlewareDefinitions as $index => $definition) {
             if (in_array($definition, $this->disabledMiddlewareDefinitions, true)) {

diff --git a/tests/RouteTest.php b/tests/RouteTest.php
@@ -229,18 +229,19 @@ public function testGetDispatcherWithMiddlewares(): void
             ])
         )->withMiddlewares([
             TestMiddleware1::class,
-            TestMiddleware2::class,
             [TestController::class, 'index'],
         ]);
 
-        $route = Route::get('/');
+        $route = Route::get('/')
+            ->middleware(TestMiddleware2::class)
+            ->action([TestController::class, 'index']);
         $route->injectDispatcher($injectDispatcher);
 
         $dispatcher = $route->getData('dispatcherWithMiddlewares');
 
         $response = $dispatcher->dispatch($request, $this->getRequestHandler());
         $this->assertSame(200, $response->getStatusCode());
-        $this->assertSame('12', (string) $response->getBody());
+        $this->assertSame('2', (string) $response->getBody());
     }
 
     public function testDebugInfo(): void