Refactored HttpException

igniphp · Sep 13, 2018 · ccb5039 · ccb5039
1 parent 4e4356c
commit ccb5039
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/Exception/HttpException.php b/src/Exception/HttpException.php
@@ -6,5 +6,5 @@
 
 interface HttpException extends NetworkException
 {
-    public function asResponse(): ResponseInterface;
+    public function toResponse(): ResponseInterface;
 }
diff --git a/src/Exception/RouterException.php b/src/Exception/RouterException.php
@@ -40,7 +40,7 @@ public static function invalidRoute($given): self
         return $exception;
     }
 
-    public function asResponse(): ResponseInterface
+    public function toResponse(): ResponseInterface
     {
         return Response::asText($this->getMessage(), $this->httpStatus);
     }

diff --git a/src/Http/Middleware/ErrorMiddleware.php b/src/Http/Middleware/ErrorMiddleware.php
@@ -53,7 +53,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             }
 
             if ($exception instanceof HttpException) {
-                $response = $exception->asResponse();
+                $response = $exception->toResponse();
             } else {
                 $response = Response::asText($exception->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR);
             }

diff --git a/src/Server/HttpServer.php b/src/Server/HttpServer.php
@@ -64,7 +64,7 @@ protected function createOnRequestListener(): void
                     $psrResponse = $listener->onRequest($this->getClient($request->fd), $psrRequest, $psrResponse);
                 }
             } catch (HttpException $exception) {
-                $psrResponse = $exception->asResponse();
+                $psrResponse = $exception->toResponse();
             } catch (\Throwable $throwable) {
                 $this->logger->error($throwable->getMessage());
                 $psrResponse = Response::empty(Response::HTTP_INTERNAL_SERVER_ERROR);

diff --git a/tests/Fixtures/CustomHttpException.php b/tests/Fixtures/CustomHttpException.php
@@ -15,7 +15,7 @@ public function __construct(string $message = "", int $code = 0, Throwable $prev
         parent::__construct($message, $code, $previous);
     }
 
-    public function asResponse(): ResponseInterface
+    public function toResponse(): ResponseInterface
     {
         return Response::asJson([
             'error_code' => $this->getCode(),

diff --git a/tests/Functional/Network/Http/Middleware/ErrorMiddlewareTest.php b/tests/Functional/Network/Http/Middleware/ErrorMiddlewareTest.php
@@ -67,7 +67,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         $response = $middleware->process(Mockery::mock(ServerRequestInterface::class), $requestHandler);
 
-        self::assertSame($error->asResponse()->getStatusCode(), $response->getStatusCode());
-        self::assertSame((string) $error->asResponse()->getBody(), (string) $response->getBody());
+        self::assertSame($error->toResponse()->getStatusCode(), $response->getStatusCode());
+        self::assertSame((string) $error->toResponse()->getBody(), (string) $response->getBody());
     }
 }