改名

2021-09-18 10:38:38 +08:00
parent d0e9f834d4
commit 1f34eb6675
7 changed files with 125 additions and 78 deletions
@@ -8,10 +8,10 @@ use Http\Handler\Abstracts\HandlerManager;
 use Http\Message\ServerRequest;
 use Http\Message\Stream;
 use Http\Route\MiddlewareManager;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Server\Constrict\RequestInterface;
 use Server\Constrict\ResponseEmitter;
+use Server\Constrict\ResponseInterface;
 use Swoole\Http\Request;
 use Swoole\Http\Response;

@@ -19,75 +19,65 @@ class TestRequest
 {


-    private ?ResponseEmitter $response = null;
+	private ?ResponseEmitter $response = null;


-    /**
-     * @param Request $request
-     * @param Response $response
-     * @throws Exception
-     */
-    public function onRequest(Request $request, Response $response): void
-    {
-        try {
-            [$PsrRequest, $PsrResponse] = $this->initRequestResponse($request);
-            /** @var Handler $handler */
-            $handler = HandlerManager::get($request->server['request_uri'], $request->getMethod());
-            if (is_integer($handler)) {
-                $PsrResponse->withStatus($handler)->withBody(null);
-            } else if (is_null($handler)) {
-                $PsrResponse->withStatus(404)->withBody(null);
-            } else {
-                $PsrResponse = $this->handler($handler, $PsrRequest);
-            }
-        } catch (\Throwable $throwable) {
-            $PsrResponse = $this->throwable($throwable);
-        } finally {
-            $this->response->sender($response, $PsrResponse);
-        }
-    }
+	/**
+	 * @param Request $request
+	 * @param Response $response
+	 * @throws Exception
+	 */
+	public function onRequest(Request $request, Response $response): void
+	{
+		try {
+			[$PsrRequest, $PsrResponse] = $this->initRequestResponse($request);
+			/** @var Handler $handler */
+			$handler = HandlerManager::get($request->server['request_uri'], $request->getMethod());
+			if (is_integer($handler)) {
+				$PsrResponse->withStatus($handler)->withBody(null);
+			} else if (is_null($handler)) {
+				$PsrResponse->withStatus(404)->withBody(null);
+			} else {
+				$PsrResponse = $this->handler($handler, $PsrRequest);
+			}
+		} catch (\Throwable $throwable) {
+			$PsrResponse = \response()->withStatus($throwable->getCode())
+				->withContentType(\Http\Message\Response::CONTENT_TYPE_HTML)
+				->withBody(new Stream(jTraceEx($throwable)));
+		} finally {
+			$this->response->sender($response, $PsrResponse);
+		}
+	}


-    /**
-     * @param \Throwable $throwable
-     * @return \Psr\Http\Message\ResponseInterface
-     */
-    protected function throwable(\Throwable $throwable): ResponseInterface
-    {
-        return \response()->withStatus($throwable->getCode())
-            ->withContentType(\Http\Message\Response::CONTENT_TYPE_HTML)
-            ->withBody(new Stream(jTraceEx($throwable)));
-    }
+	/**
+	 * @param Handler $handler
+	 * @param $PsrRequest
+	 * @return ResponseInterface
+	 * @throws Exception
+	 */
+	protected function handler(Handler $handler, $PsrRequest): \Psr\Http\Message\ResponseInterface
+	{
+		$middlewares = MiddlewareManager::get($handler->callback);
+
+		$dispatcher = new Dispatcher($handler, $middlewares);
+
+		return $dispatcher->handle($PsrRequest);
+	}


-    /**
-     * @param \Http\Handler\Handler $handler
-     * @param $PsrRequest
-     * @return \Psr\Http\Message\ResponseInterface
-     * @throws \Exception
-     */
-    protected function handler(Handler $handler, $PsrRequest): ResponseInterface
-    {
-        $middlewares = MiddlewareManager::get($handler->callback);
+	/**
+	 * @param Request $request
+	 * @return array<ServerRequestInterface, ResponseInterface>
+	 * @throws Exception
+	 */
+	private function initRequestResponse(Request $request): array
+	{
+		$PsrResponse = Context::setContext(ResponseInterface::class, new \Http\Message\Response());

-        $dispatcher = new Dispatcher($handler, $middlewares);
+		$PsrRequest = Context::setContext(RequestInterface::class, ServerRequest::createServerRequest($request));

-        return $dispatcher->handle($PsrRequest);
-    }
-
-
-    /**
-     * @param Request $request
-     * @return array<ServerRequestInterface, ResponseInterface>
-     * @throws Exception
-     */
-    private function initRequestResponse(Request $request): array
-    {
-        $PsrResponse = Context::setContext(ResponseInterface::class, new \Http\Message\Response());
-
-        $PsrRequest = Context::setContext(RequestInterface::class, ServerRequest::createServerRequest($request));
-
-        return [$PsrRequest, $PsrResponse];
-    }
+		return [$PsrRequest, $PsrResponse];
+	}

 }