Use MessageReponse mapper instead of Message when calling list endpoint

.github/workflows/psalm.yml

@@ -13,7 +13,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Psalm – Static Analysis for PHP
         uses: docker://vimeo/psalm-github-actions:4.18.1

.github/workflows/tests.yml

@@ -11,14 +11,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ '7.3', '7.4', '8.0', '8.1' ]
-        stability: [ prefer-lowest, prefer-stable ]
+        php: [ '7.4', '8.0', '8.1', '8.2' ]
+        stability: [ prefer-stable ]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

src/MessageBird/Resources/Base.php

@@ -185,11 +185,16 @@ public function getList(?array $parameters = [])
             }
 
             foreach ($items as $item) {
-                /** @psalm-suppress UndefinedClass */
-                $object = new $objectName($this->httpClient);
-
-                $message = $object->loadFromArray($item);
-                $baseList->items[] = $message;
+                if ($this->responseObject) {
+                    $responseObject = clone $this->responseObject;
+                    $baseList->items[] =  $responseObject->loadFromStdclass($item);
+                } else {
+                    /** @psalm-suppress UndefinedClass */
+                    $object = new $objectName($this->httpClient);
+
+                    $message = $object->loadFromArray($item);
+                    $baseList->items[] = $message;
+                }
             }
 
             return $baseList;

tests/Integration/Contacts/ContactTest.php

@@ -7,7 +7,8 @@
 use MessageBird\Objects\BaseList;
 use MessageBird\Objects\Contact;
 use MessageBird\Objects\Group;
-use MessageBird\Objects\Message;
+use MessageBird\Objects\MessageResponse;
+
 use Tests\Integration\BaseTest;
 
 class ContactTest extends BaseTest
@@ -155,7 +156,7 @@ public function testContactGetMessages(): void
         $messages = $this->client->contacts->getMessages("contact_id");
 
         foreach ($messages->items as $message) {
-            self::assertInstanceOf(Message::class, $message);
+            self::assertInstanceOf(MessageResponse::class, $message);
         }
     }
 }

tests/Integration/Messages/MessagesTest.php

@@ -100,14 +100,28 @@ public function testFlashSmsMessage(): void
 
     public function testListMessage(): void
     {
-        $this->expectException(ServerException::class);
+        $this->mockClient->expects(self::atLeastOnce())->method('performHttpRequest')->willReturn([
+            200,
+            '',
+            file_get_contents(__DIR__ . '/get-list-response.json')
+        ]);
+
         $this->mockClient->expects(self::once())->method('performHttpRequest')->with(
             "GET",
             'messages',
             ['offset' => 100, 'limit' => 30],
             null
         );
-        $this->client->messages->getList(['offset' => 100, 'limit' => 30]);
+
+
+        $messageList = $this->client->messages->getList(['offset' => 100, 'limit' => 30]);
+
+        self::assertSame('7d8451f8', $messageList->items[0]->id);
+        self::assertSame('https://rest.messagebird.com/messages/7d8451f8', $messageList->items[0]->href);
+
+        self::assertSame('7d8451f9', $messageList->items[1]->id);
+        self::assertSame('https://rest.messagebird.com/messages/7d8451f9', $messageList->items[1]->href);
+
     }
 
     public function testReadMessage(): void

tests/Integration/Messages/get-list-response.json

@@ -0,0 +1,116 @@
+{
+    "offset": 0,
+    "limit": 10,
+    "count": 10,
+    "totalCount": 16,
+    "links":
+    {
+        "first": "https://rest.messagebird.com/messages/?offset=0&limit=10&recipient=31653474496&from=2021-03-16T00%3A00%3A00%2B00%3A00",
+        "previous": null,
+        "next": "https://rest.messagebird.com/messages/?offset=10&limit=10&recipient=31653474496&from=2021-03-16T00%3A00%3A00%2B00%3A00",
+        "last": "https://rest.messagebird.com/messages/?offset=10&limit=10&recipient=31653474496&from=2021-03-16T00%3A00%3A00%2B00%3A00"
+    },
+    "items":
+    [
+        {
+            "id": "7d8451f8",
+            "href": "https://rest.messagebird.com/messages/7d8451f8",
+            "direction": "mt",
+            "type": "sms",
+            "originator": "+31612345678",
+            "body": "Hi there",
+            "reference": null,
+            "validity": null,
+            "gateway": 10,
+            "typeDetails":
+            {
+                "verify": true
+            },
+            "datacoding": "plain",
+            "mclass": 1,
+            "scheduledDatetime": null,
+            "createdDatetime": "2022-10-12T18:46:22+00:00",
+            "recipients":
+            {
+                "totalCount": 1,
+                "totalSentCount": 1,
+                "totalDeliveredCount": 1,
+                "totalDeliveryFailedCount": 0,
+                "items":
+                [
+                    {
+                        "recipient": 31612345678,
+                        "originator": null,
+                        "status": "delivered",
+                        "statusDatetime": "2022-10-12T18:46:24+00:00",
+                        "recipientCountry": "Netherlands",
+                        "recipientCountryPrefix": 31,
+                        "recipientOperator": "KPN",
+                        "messageLength": 20,
+                        "statusErrorCode": null,
+                        "statusReason": "successfully delivered",
+                        "price":
+                        {
+                            "amount": 0.076,
+                            "currency": "EUR"
+                        },
+                        "mccmnc": "20408",
+                        "mcc": "204",
+                        "mnc": "08",
+                        "messagePartCount": 1
+                    }
+                ]
+            }
+        },
+        {
+            "id": "7d8451f9",
+            "href": "https://rest.messagebird.com/messages/7d8451f9",
+            "direction": "mt",
+            "type": "sms",
+            "originator": "+31612345678",
+            "body": "Hi there",
+            "reference": null,
+            "validity": null,
+            "gateway": 10,
+            "typeDetails":
+            {
+                "verify": true
+            },
+            "datacoding": "plain",
+            "mclass": 1,
+            "scheduledDatetime": null,
+            "createdDatetime": "2022-10-12T18:46:22+00:00",
+            "recipients":
+            {
+                "totalCount": 1,
+                "totalSentCount": 1,
+                "totalDeliveredCount": 1,
+                "totalDeliveryFailedCount": 0,
+                "items":
+                [
+                    {
+                        "recipient": 31612345678,
+                        "originator": null,
+                        "status": "delivered",
+                        "statusDatetime": "2022-10-12T18:46:24+00:00",
+                        "recipientCountry": "Netherlands",
+                        "recipientCountryPrefix": 31,
+                        "recipientOperator": "KPN",
+                        "messageLength": 20,
+                        "statusErrorCode": null,
+                        "statusReason": "successfully delivered",
+                        "price":
+                        {
+                            "amount": 0.076,
+                            "currency": "EUR"
+                        },
+                        "mccmnc": "20408",
+                        "mcc": "204",
+                        "mnc": "08",
+                        "messagePartCount": 1
+                    }
+                ]
+            }
+        }
+    ]
+}