let Group::all() throw UnexpectedResponseException

kbsali · Dec 28, 2023 · dccdc9c · dccdc9c
1 parent cfa3527
commit dccdc9c
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/src/Redmine/Api/CustomField.php b/src/Redmine/Api/CustomField.php
@@ -33,7 +33,7 @@ final public function list(array $params = []): array
         try {
             $this->customFields = $this->retrieveData('/custom_fields.json', $params);
         } catch (SerializerException $th) {
-            throw new UnexpectedResponseException('Redmine server has responded with an unexpected body.', $th->getCode(), $th);
+            throw new UnexpectedResponseException('The Redmine server responded with an unexpected body.', $th->getCode(), $th);
         }
 
         return $this->customFields;

diff --git a/src/Redmine/Api/Group.php b/src/Redmine/Api/Group.php
@@ -5,6 +5,7 @@
 use Redmine\Exception;
 use Redmine\Exception\MissingParameterException;
 use Redmine\Exception\SerializerException;
+use Redmine\Exception\UnexpectedResponseException;
 use Redmine\Serializer\PathSerializer;
 use Redmine\Serializer\XmlSerializer;
 
@@ -26,13 +27,17 @@ class Group extends AbstractApi
      *
      * @param array $params optional parameters to be passed to the api (offset, limit, ...)
      *
-     * @throws SerializerException if response body could not be converted into array
+     * @throws UnexpectedResponseException if response body could not be converted into array
      *
      * @return array list of groups found
      */
     final public function list(array $params = []): array
     {
-        $this->groups = $this->retrieveData('/groups.json', $params);
+        try {
+            $this->groups = $this->retrieveData('/groups.json', $params);
+        } catch (SerializerException $th) {
+            throw new UnexpectedResponseException('The Redmine server responded with an unexpected body.', $th->getCode(), $th);
+        }
 
         return $this->groups;
     }
@@ -55,6 +60,10 @@ public function all(array $params = [])
         try {
             return $this->list($params);
         } catch (Exception $e) {
+            if ($e instanceof UnexpectedResponseException && $e->getPrevious() !== null) {
+                $e = $e->getPrevious();
+            }
+
             if ($this->client->getLastResponseBody() === '') {
                 return false;
             }

diff --git a/tests/Unit/Api/CustomField/ListTest.php b/tests/Unit/Api/CustomField/ListTest.php
@@ -150,7 +150,7 @@ public function testListThrowsException()
         $api = new CustomField($client);
 
         $this->expectException(UnexpectedResponseException::class);
-        $this->expectExceptionMessage('Redmine server has responded with an unexpected body.');
+        $this->expectExceptionMessage('The Redmine server responded with an unexpected body.');
 
         // Perform the tests
         $api->list();

diff --git a/tests/Unit/Api/Group/ListTest.php b/tests/Unit/Api/Group/ListTest.php
@@ -5,6 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use Redmine\Api\Group;
 use Redmine\Client\Client;
+use Redmine\Exception\UnexpectedResponseException;
 
 /**
  * @covers \Redmine\Api\Group::list
@@ -63,4 +64,29 @@ public function testListeWithParametersReturnsResponse()
         // Perform the tests
         $this->assertSame($expectedReturn, $api->list($parameters));
     }
+
+    public function testListThrowsException()
+    {
+        // Create the used mock objects
+        $client = $this->createMock(Client::class);
+        $client->expects($this->exactly(1))
+            ->method('requestGet')
+            ->with('/groups.json')
+            ->willReturn(true);
+        $client->expects($this->exactly(1))
+            ->method('getLastResponseBody')
+            ->willReturn('');
+        $client->expects($this->exactly(1))
+            ->method('getLastResponseContentType')
+            ->willReturn('application/json');
+
+        // Create the object under test
+        $api = new Group($client);
+
+        $this->expectException(UnexpectedResponseException::class);
+        $this->expectExceptionMessage('The Redmine server responded with an unexpected body.');
+
+        // Perform the tests
+        $api->list();
+    }
 }