josh-taylor
diff --git a/‎src/Exceptions/HandlesErrors.php
Lines changed: 14 additions & 11 deletions b/‎src/Exceptions/HandlesErrors.php
Lines changed: 14 additions & 11 deletions
diff --git a/‎src/Http/Requests/AbstractRequest.php
Lines changed: 5 additions & 3 deletions b/‎src/Http/Requests/AbstractRequest.php
Lines changed: 5 additions & 3 deletions
@@ -18,13 +18,13 @@
 
 namespace CloudCreativity\LaravelJsonApi\Exceptions;
 
+use CloudCreativity\JsonApi\Document\Error;
 use CloudCreativity\LaravelJsonApi\Http\Responses\ResponseFactory;
 use CloudCreativity\LaravelJsonApi\Services\JsonApiService;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Neomerx\JsonApi\Contracts\Document\ErrorInterface;
-use Neomerx\JsonApi\Document\Error;
 use Neomerx\JsonApi\Exceptions\JsonApiException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
@@ -56,16 +56,24 @@ public function renderJsonApi(Request $request, Exception $e)
     {
         /** @var JsonApiService $service */
         $service = app(JsonApiService::class);
-        $errors = $this->parseToErrors($e);
 
         if (!$service->api()->hasEncoder()) {
-            return $this->renderWithoutEncoder($errors);
+            return $this->renderWithoutEncoder($e);
+        }
+
+        $statusCode = null;
+
+        if ($e instanceof JsonApiException) {
+            $statusCode = $e->getHttpCode();
+            $errors = $e->getErrors()->getArrayCopy() ?: new Error(null, null, $statusCode);
+        } else {
+            $errors = $this->parseToErrors($e);
         }
 
         /** @var ResponseFactory $responses */
         $responses = response()->jsonApi();
 
-        return $responses->errors($errors);
+        return $responses->errors($errors, $statusCode);
     }
 
     /**
@@ -74,11 +82,6 @@ public function renderJsonApi(Request $request, Exception $e)
      */
     protected function parseToErrors(Exception $e)
     {
-        if ($e instanceof JsonApiException) {
-            $errs = $e->getErrors()->getArrayCopy();
-            return $errs ?: new Error(null, null, $e->getHttpCode());
-        }
-
         $statusCode = ($e instanceof HttpExceptionInterface) ?
             $e->getStatusCode() :
             Response::HTTP_INTERNAL_SERVER_ERROR;
@@ -91,10 +94,10 @@ protected function parseToErrors(Exception $e)
     /**
      * Send a response if no JSON API encoder is available.
      *
-     * @param $errors
+     * @param Exception $e
      * @return Response
      */
-    protected function renderWithoutEncoder($errors)
+    protected function renderWithoutEncoder(Exception $e)
     {
         return response('', Response::HTTP_NOT_ACCEPTABLE);
     }
 
@@ -23,6 +23,7 @@
 use CloudCreativity\JsonApi\Contracts\Store\StoreInterface;
 use CloudCreativity\JsonApi\Contracts\Validators\DocumentValidatorInterface;
 use CloudCreativity\JsonApi\Contracts\Validators\ValidatorProviderInterface;
+use CloudCreativity\JsonApi\Document\Error;
 use CloudCreativity\JsonApi\Object\Document;
 use CloudCreativity\JsonApi\Object\ResourceIdentifier;
 use CloudCreativity\LaravelJsonApi\Contracts\Http\Requests\RequestHandlerInterface;
@@ -32,7 +33,6 @@
 use Illuminate\Http\Request as HttpRequest;
 use Illuminate\Http\Response;
 use Neomerx\JsonApi\Contracts\Encoder\Parameters\EncodingParametersInterface;
-use Neomerx\JsonApi\Document\Error;
 use Neomerx\JsonApi\Exceptions\JsonApiException;
 use RuntimeException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -328,7 +328,8 @@ protected function validateParameters()
             $this->validators->filterResources() : null;
 
         if ($validator && !$validator->isValid((array) $parameters->getFilteringParameters())) {
-            throw new JsonApiException($validator->errors());
+            $errors = $validator->errors();
+            throw new JsonApiException($errors, Error::getErrorStatus($errors));
         }
 
         return $parameters;
@@ -366,7 +367,8 @@ protected function validateDocument()
         $validator = $this->validator();
 
         if ($validator && !$validator->isValid($this->getDocument())) {
-            throw new JsonApiException($validator->errors());
+            $errors = $validator->errors();
+            throw new JsonApiException($errors, Error::getErrorStatus($errors));
         }
     }