mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17304 from owncloud/fix-17265 

Check if response could get generated
This commit is contained in:
Vincent Petry 2015-07-06 12:29:07 +02:00
parent 4dbc8ab77f 62e3de1bdb
commit 073e654692
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/public/appframework/http/jsonresponse.php
View File

@ -61,9 +61,16 @@ class JSONResponse extends Response {
* Returns the rendered json
* @return string the rendered json
* @since 6.0.0
* @throws \Exception If data could not get encoded
*/
public function render(){
return json_encode($this->data);
public function render() {
$response = json_encode($this->data);
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;
}
/**

11
tests/lib/appframework/http/JSONResponseTest.php
View File

@ -76,6 +76,17 @@ class JSONResponseTest extends \Test\TestCase {
$this->assertEquals($expected, $this->json->render());
}
/**
* @expectedException \Exception
* @expectedExceptionMessage Could not json_encode due to invalid non UTF-8 characters in the array: array (
* @requires PHP 5.5
*/
public function testRenderWithNonUtf8Encoding() {
$params = ['test' => hex2bin('e9')];
$this->json->setData($params);
$this->json->render();
}
public function testConstructorAllowsToSetData() {
$data = array('hi');
$code = 300;