diff options
| author | Florian Pritz <bluewind@xinu.at> | 2017-07-04 11:31:38 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2017-07-04 12:10:44 +0200 |
| commit | 9bdf0973b337cbf73287422cc5fdceabc8703e61 (patch) | |
| tree | fb02b08b50a33e39229e4d0cfddec15b36852942 /application/test/Test.php | |
| parent | 0ce11c1416c0bce491952410e791f7ca6cfad2dd (diff) | |
API: Fix return type of empty values in file/history
If the array is not casted to a object, json_encode will encode it as
[] if empty, but {} if it contains data. Always return an object by
casting the array to an object if it is empty.
Fixes #15
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/test/Test.php')
| -rw-r--r-- | application/test/Test.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/application/test/Test.php b/application/test/Test.php index 33278436b..b8052fbba 100644 --- a/application/test/Test.php +++ b/application/test/Test.php @@ -90,10 +90,14 @@ abstract class Test { // Method: POST, PUT, GET etc // Data: array("param" => "value") ==> index.php?param=value // Source: http://stackoverflow.com/a/9802854/953022 - protected function CallAPI($method, $url, $data = false) + protected function CallAPI($method, $url, $data = false, $return_json = false) { $result = $this->SendHTTPRequest($method, $url, $data); + if ($return_json) { + return $result; + } + $json = json_decode($result, true); if ($json === NULL) { $this->t->fail("json decode"); |