Merge pull request #281 from Art4/port-275-to-v2-branch

Port #275 into v2.x

Author: Art4

src/Redmine/Api/AbstractApi.php

@@ -42,7 +42,7 @@ public function lastCallFailed()
      * @param string $path
      * @param bool   $decodeIfJson
      *
-     * @return string|array|SimpleXMLElement|null
+     * @return string|array|SimpleXMLElement|false
      */
     protected function get($path, $decodeIfJson = true)
     {
@@ -64,7 +64,7 @@ protected function get($path, $decodeIfJson = true)
             }
         }
 
-        return ('' === $body) ? null : $body;
+        return ('' === $body) ? false : $body;
     }
 
     /**

src/Redmine/Api/IssueRelation.php

@@ -42,7 +42,7 @@ public function all($issueId, array $params = [])
     public function show($id)
     {
         $ret = $this->get('/relations/'.urlencode($id).'.json');
-        if (null === $ret) {
+        if (false === $ret) {
             return [];
         }
 

tests/Unit/Api/AbstractApiTest.php

@@ -129,7 +129,8 @@ public function getJsonDecodingFromGetMethodData()
             ['{"foo_bar": 12345}', null, ['foo_bar' => 12345]], // test decode by default
             ['{"foo_bar": 12345}', false, '{"foo_bar": 12345}'],
             ['{"foo_bar": 12345}', true, ['foo_bar' => 12345]],
-            ['', true, null], // test decode with empty body
+            'Empty body, JSON decode: false' => ['', false, false],
+            'Empty body, JSON decode: true' => ['', true, false],
             ['{"foo_bar":', true, 'Error decoding body as JSON: Syntax error'], // test invalid JSON
         ];
     }