Skip to content

Use JSON_THROW_ON_ERROR instead of custom error handling #32628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
May 31, 2022
Merged

Use JSON_THROW_ON_ERROR instead of custom error handling #32628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Use JSON_THROW_ON_ERROR instead of custom error handling 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed May 30, 2022
commit 3901a93c72ed7a008902a79fb5e0ee1de018f7bd
8 changes: 1 addition & 7 deletions lib/public/AppFramework/Http/JSONResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,7 @@ public function __construct($data = [], $statusCode = Http::STATUS_OK) {
* @throws \Exception If data could not get encoded
*/
public function render() {
$response = json_encode($this->data, JSON_HEX_TAG);
if ($response === false) {
throw new \Exception(sprintf('Could not json_encode due to invalid ' .
'non UTF-8 characters in the array: %s', var_export($this->data, true)));
}

return $response;
return json_encode($this->data, JSON_HEX_TAG | JSON_THROW_ON_ERROR);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions tests/lib/AppFramework/Http/JSONResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ public function testRender(array $input, $expected) {
$this->assertEquals($expected, $this->json->render());
}


public function testRenderWithNonUtf8Encoding() {
$this->expectException(\Exception::class);
$this->expectExceptionMessage('Could not json_encode due to invalid non UTF-8 characters in the array: array (');
$this->expectException(\JsonException::class);
$this->expectExceptionMessage('Malformed UTF-8 characters, possibly incorrectly encoded');

$params = ['test' => hex2bin('e9')];
$this->json->setData($params);
Expand Down