Add context to exception only if exists

contributte · Feb 9, 2019 · 22a1e60 · 22a1e60
1 parent 8a119b4
commit 22a1e60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Transformer/JsonTransformer.php b/src/Transformer/JsonTransformer.php
@@ -58,7 +58,9 @@ protected function extractException(ApiRequest $request, ApiResponse $response,
 
 		if ($exception instanceof ClientErrorException || $exception instanceof ServerErrorException) {
 			$data['exception'] = $exception->getMessage();
-			$data['context'] = $exception->getContext();
+			if ($exception->getContext() !== null) {
+				$data['context'] = $exception->getContext();
+			}
 		} else {
 			$data['exception'] = $this->debug ? $exception->getMessage() : 'Application encountered an internal error. Please try again later.';
 		}

diff --git a/src/Transformer/JsonUnifyTransformer.php b/src/Transformer/JsonUnifyTransformer.php
@@ -98,9 +98,12 @@ protected function processClientError(ClientErrorException $exception, ApiReques
 		$data = [
 			'code' => $exception->getCode(),
 			'error' => $exception->getMessage(),
-			'context' => $exception->getContext(),
 		];
 
+		if ($exception->getContext() !== null) {
+			$data['context'] = $exception->getContext();
+		}
+
 		return $response
 			->withStatus($exception->getCode())
 			->withAttribute(ResponseAttributes::ATTR_ENTITY, ArrayEntity::from([