Merge pull request #199 from spiral/develop

Update JsonTrait.php
spiral · Oct 3, 2017 · 1f7f91e · 1f7f91e
2 parents 75560b7 + a3b8b7b
commit 1f7f91e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/source/Spiral/Http/Traits/JsonTrait.php b/source/Spiral/Http/Traits/JsonTrait.php
@@ -28,6 +28,10 @@ private function writeJson(
         $json,
         int $code = 200
     ): ResponseInterface {
+        if ($json instanceof \JsonSerializable) {
+            $json = $json->jsonSerialize();
+        }
+
         if (is_array($json) && isset($json['status'])) {
             $code = $json['status'];
         }
@@ -36,4 +40,4 @@ private function writeJson(
 
         return $response->withStatus($code)->withHeader('Content-Type', 'application/json');
     }
-}
+}