Added method Hyperf\Testing\Client::sendRequest(), you can use your own server request. (#3403)

Author: limingxinleo

src/Client.php

@@ -137,31 +137,46 @@ public function file($uri, $data = [], $headers = [])
     public function request(string $method, string $path, array $options = [])
     {
         return wait(function () use ($method, $path, $options) {
-            /*
-             * @var Psr7Request
-             */
-            [$psr7Request, $psr7Response] = $this->init($method, $path, $options);
-
-            $psr7Request = $this->coreMiddleware->dispatch($psr7Request);
-            /** @var Dispatched $dispatched */
-            $dispatched = $psr7Request->getAttribute(Dispatched::class);
-            $middlewares = $this->middlewares;
-            if ($dispatched->isFound()) {
-                $registeredMiddlewares = MiddlewareManager::get($this->serverName, $dispatched->handler->route, $psr7Request->getMethod());
-                $middlewares = array_merge($middlewares, $registeredMiddlewares);
-            }
-
-            try {
-                $psr7Response = $this->dispatcher->dispatch($psr7Request, $middlewares, $this->coreMiddleware);
-            } catch (\Throwable $throwable) {
-                // Delegate the exception to exception handler.
-                $psr7Response = $this->exceptionHandlerDispatcher->dispatch($throwable, $this->exceptionHandlers);
-            }
+            return $this->execute($this->init($method, $path, $options));
+        }, $this->waitTimeout);
+    }
 
-            return $psr7Response;
+    public function sendRequest(ServerRequestInterface $psr7Request): ResponseInterface
+    {
+        return wait(function () use ($psr7Request) {
+            return $this->execute($psr7Request);
         }, $this->waitTimeout);
     }
 
+    protected function execute(ServerRequestInterface $psr7Request): ResponseInterface
+    {
+        $this->persistToContext($psr7Request, new Psr7Response());
+
+        $psr7Request = $this->coreMiddleware->dispatch($psr7Request);
+        /** @var Dispatched $dispatched */
+        $dispatched = $psr7Request->getAttribute(Dispatched::class);
+        $middlewares = $this->middlewares;
+        if ($dispatched->isFound()) {
+            $registeredMiddlewares = MiddlewareManager::get($this->serverName, $dispatched->handler->route, $psr7Request->getMethod());
+            $middlewares = array_merge($middlewares, $registeredMiddlewares);
+        }
+
+        try {
+            $psr7Response = $this->dispatcher->dispatch($psr7Request, $middlewares, $this->coreMiddleware);
+        } catch (\Throwable $throwable) {
+            // Delegate the exception to exception handler.
+            $psr7Response = $this->exceptionHandlerDispatcher->dispatch($throwable, $this->exceptionHandlers);
+        }
+
+        return $psr7Response;
+    }
+
+    protected function persistToContext(ServerRequestInterface $request, ResponseInterface $response)
+    {
+        Context::set(ServerRequestInterface::class, $request);
+        Context::set(ResponseInterface::class, $response);
+    }
+
     protected function initBaseUri($server): void
     {
         if ($this->container->has(ConfigInterface::class)) {
@@ -176,7 +191,7 @@ protected function initBaseUri($server): void
         }
     }
 
-    protected function init(string $method, string $path, array $options = []): array
+    protected function init(string $method, string $path, array $options = []): ServerRequestInterface
     {
         $query = $options['query'] ?? [];
         $params = $options['form_params'] ?? [];
@@ -198,14 +213,9 @@ protected function init(string $method, string $path, array $options = []): arra
         $body = new SwooleStream($content);
 
         $request = new Psr7Request($method, $uri, $headers, $body);
-        $request = $request->withQueryParams($query)
+        return $request->withQueryParams($query)
             ->withParsedBody($data)
             ->withUploadedFiles($this->normalizeFiles($multipart));
-
-        Context::set(ServerRequestInterface::class, $psr7Request = $request);
-        Context::set(ResponseInterface::class, $psr7Response = new Psr7Response());
-
-        return [$psr7Request, $psr7Response];
     }
 
     protected function normalizeFiles(array $multipart): array

src/HttpClient.php

@@ -106,4 +106,9 @@ public function file($uri, $data = [], $headers = [])
 
         return $this->packer->unpack((string) $response->getBody());
     }
+
+    public function client()
+    {
+        return $this->client;
+    }
 }