wip

Author: binaryk

src/Exceptions/RestifyHandler.php

@@ -71,13 +71,13 @@ public function render($request, $exception)
         $response = new RestResponse();
 
         switch (true) {
-            case $exception instanceof NotFoundHttpException:
             case $exception instanceof ModelNotFoundException:
                 $response->addError(__('messages.not_found'))->missing();
                 break;
             // These has custom message, that message could be displayed in production.
             case $exception instanceof EntityNotFoundExceptionEloquent:
             case $exception instanceof EntityNotFoundException:
+            case $exception instanceof NotFoundHttpException:
                 $response->addError($exception->getMessage())->missing();
                 break;
 
@@ -108,8 +108,9 @@ public function render($request, $exception)
             case $exception instanceof InvalidSignatureException:
                 $response->addError($exception->getMessage())->forbidden();
                 break;
+
             case $exception instanceof HttpException:
-                $response->addError($exception->getMessage())->forbidden();
+                $response->addError($exception->getMessage())->code($exception->getStatusCode());
                 break;
 
             default:

tests/Feature/REST/HandlerTest.php

@@ -54,7 +54,7 @@ public function test_404_by_generated_by_framework()
     {
         $response = $this->handler->render($this->request, new NotFoundHttpException('This message is not visible'));
         $this->assertInstanceOf(JsonResponse::class, $response);
-        $this->assertEquals($response->getData()->errors[0], __('messages.not_found'));
+        $this->assertEquals($response->getData()->errors[0], 'This message is not visible');
         $this->assertEquals($response->getStatusCode(), 404);
 
         $response = $this->handler->render($this->request, new ModelNotFoundException('This message is not visible'));
@@ -161,7 +161,7 @@ public function test_can_inject_custom_handler_but_handler_will_continue_handle(
 
         $response = $this->handler->render($this->request, new NotFoundHttpException('This message is not visible'));
         $this->assertInstanceOf(JsonResponse::class, $response);
-        $this->assertEquals($response->getData()->errors[0], __('messages.not_found'));
+        $this->assertEquals($response->getData()->errors[0], 'This message is not visible');
         $this->assertEquals($response->getStatusCode(), 404);
     }
 }