mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-20 16:21:18 +02:00
Code Issues Releases Wiki Activity

Fix JSON serialization error on PHP 7

Browse Source 
Closes #685.

Thanks to @sijad.
This commit is contained in:
Franz Liedke
2016-03-18 21:11:54 +09:00
parent 3a8b11e389
commit f13956d94b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/core/src/Api/JsonApiResponse.php
View File

@@ -22,6 +22,9 @@ class JsonApiResponse extends JsonResponse
{
$headers['content-type'] = 'application/vnd.api+json';
parent::__construct($document, $status, $headers, $encodingOptions);
// The call to jsonSerialize prevents rare issues with json_encode() failing with a
// syntax error even though Document implements the JsonSerializable interface.
// See https://github.com/flarum/core/issues/685
parent::__construct($document->jsonSerialize(), $status, $headers, $encodingOptions);
}
}