Fixed middleware will be handled twice when used in optional route.

CHANGELOG-2.1.md

@@ -3,6 +3,7 @@
 ## Fixed
 
 - [#3423](https://github.com/hyperf/hyperf/pull/3423) Fixed crontab does not works when worker_num isn't integer for task worker strategy.
+- [#3426](https://github.com/hyperf/hyperf/pull/3426) Fixed bug that middleware will be handled twice when used in optional route.
 
 ## Optimized
 

src/http-server/src/Router/RouteCollector.php

@@ -70,8 +70,9 @@ public function addRoute($httpMethod, string $route, $handler, array $options =
             $method = strtoupper($method);
             foreach ($routeDatas as $routeData) {
                 $this->dataGenerator->addRoute($method, $routeData, new Handler($handler, $route, $options));
-                MiddlewareManager::addMiddlewares($this->server, $route, $method, $options['middleware'] ?? []);
             }
+
+            MiddlewareManager::addMiddlewares($this->server, $route, $method, $options['middleware'] ?? []);
         }
     }
 

src/http-server/tests/Router/RouteCollectorTest.php

@@ -130,4 +130,22 @@ public function testRouterCollectorMergeOptions()
         $res = $collector->mergeOptions($origin, $options);
         $this->assertSame(['A', 'B', 'C', 'B'], $res['middleware']);
     }
+
+    public function testMiddlewareInOptionalRoute()
+    {
+        $parser = new Std();
+        $generator = new DataGenerator();
+        $collector = new RouteCollectorStub($parser, $generator, 'test');
+
+        $routes = [
+            '/user/[{id:\d+}]',
+            '/role/{id:\d+}',
+            '/user',
+        ];
+
+        foreach ($routes as $route) {
+            $collector->addRoute('GET', $route, 'User::Info', ['middleware' => $middlewares = ['FooMiddleware']]);
+            $this->assertSame($middlewares, MiddlewareManager::get('test', $route, 'GET'));
+        }
+    }
 }

src/rpc-server/src/Router/RouteCollector.php

@@ -13,7 +13,6 @@
 
 use FastRoute\DataGenerator;
 use FastRoute\RouteParser;
-use Hyperf\HttpServer\MiddlewareManager;
 use Hyperf\HttpServer\Router\Handler;
 
 class RouteCollector
@@ -59,11 +58,8 @@ public function addRoute(string $route, $handler, array $options = [])
     {
         $route = $this->currentGroupPrefix . $route;
         $routeDatas = $this->routeParser->parse($route);
-        $server = $options['server'] ?? 'rpc';
         foreach ($routeDatas as $routeData) {
-            // Use 'GET' method for RPC.
             $this->dataGenerator->addRoute('POST', $routeData, new Handler($handler, $route));
-            MiddlewareManager::addMiddlewares($server, $route, 'GET', $options['middleware'] ?? []);
         }
     }