Merge branch 'master' into 3.1-merge

Author: limingxinleo

src/Middleware/ValidationMiddleware.php

@@ -137,6 +137,9 @@ protected function prepareHandler(array|string $handler): array
                 return explode('@', $handler);
             }
             $array = explode('::', $handler);
+            if (! isset($array[1]) && class_exists($handler) && method_exists($handler, '__invoke')) {
+                $array[1] = '__invoke';
+            }
             return [$array[0], $array[1] ?? null];
         }
         if (is_array($handler) && isset($handler[0], $handler[1])) {

tests/Cases/Stub/DemoController.php

@@ -13,6 +13,11 @@
 
 class DemoController
 {
+    public function __invoke(DemoRequest $request)
+    {
+        return $request->all();
+    }
+
     public function signUp(DemoRequest $request)
     {
         return $request->all();

tests/Cases/ValidationMiddlewareTest.php

@@ -31,6 +31,7 @@
 use Hyperf\Translation\Translator;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Validation\Middleware\ValidationMiddleware;
+use Hyperf\Validation\ValidationException;
 use Hyperf\Validation\ValidatorFactory;
 use HyperfTest\Validation\Cases\Stub\DemoController;
 use HyperfTest\Validation\Cases\Stub\DemoRequest;
@@ -169,4 +170,27 @@ public function createContainer()
 
         return $container;
     }
+
+    public function testValidationOfInvocableControllerRoutingRequests()
+    {
+        $this->expectException(ValidationException::class);
+
+        $container = $this->createContainer();
+        $factory = $container->get(DispatcherFactory::class);
+
+        $router = $factory->getRouter('http');
+        $router->addRoute('POST', '/invokable', 'HyperfTest\Validation\Cases\Stub\DemoController');
+
+        $dispatcher = $factory->getDispatcher('http');
+        $middleware = new ValidationMiddleware($container);
+        $coreMiddleware = new CoreMiddleware($container, 'http');
+        $handler = new HttpRequestHandler([$middleware], $coreMiddleware, $container);
+        Context::set(ResponseInterface::class, new Response());
+
+        $request = (new Request('POST', new Uri('/invokable')))
+            ->withParsedBody(['username' => 'Hyperf']);
+        $routes = $dispatcher->dispatch($request->getMethod(), $request->getUri()->getPath());
+        $request = Context::set(ServerRequestInterface::class, $request->withAttribute(Dispatched::class, new Dispatched($routes)));
+        $middleware->process($request, $handler);
+    }
 }