Skip to content

Commit 7dfccb6

Browse files
committed
Revert "Refactor buildMessage method"
This reverts commit a5ab4c7.
1 parent a5ab4c7 commit 7dfccb6

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

src/CmsmsClient.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function send(CmsmsMessage $message, string $recipient): void
3333
$message->originator(config('services.cmsms.originator'));
3434
}
3535

36-
$payload = $this->buildMessagePayload($message, $recipient);
36+
$payload = $this->buildMessageJson($message, $recipient);
3737

3838
$response = $this->client->request('POST', static::GATEWAY_URL, [
3939
'body' => $payload,
@@ -60,7 +60,7 @@ public function send(CmsmsMessage $message, string $recipient): void
6060
/**
6161
* See: https://developers.cm.com/messaging/reference/messages_sendmessage-1
6262
*/
63-
public function buildMessagePayload(CmsmsMessage $message, string $recipient): array
63+
public function buildMessageJson(CmsmsMessage $message, string $recipient): string
6464
{
6565
$body = [];
6666
$body['content'] = $message->getBody();
@@ -82,7 +82,7 @@ public function buildMessagePayload(CmsmsMessage $message, string $recipient): a
8282
$reference['reference'] = $message->getReference();
8383
}
8484

85-
return [
85+
$json = [
8686
'messages' => [
8787
'authentication' => [
8888
'productToken' => $this->productToken,
@@ -100,5 +100,7 @@ public function buildMessagePayload(CmsmsMessage $message, string $recipient): a
100100
]],
101101
],
102102
];
103+
104+
return json_encode($json);
103105
}
104106
}

src/Events/SMSSentSuccessfullyEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class SMSSentSuccessfullyEvent
88
{
99
use Dispatchable;
1010

11-
public function __construct(public array $payload)
11+
public function __construct(public string $payload)
1212
{
1313
}
1414
}

tests/CmsmsClientTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ public function it_includes_multipart_data()
8989
$message = clone $this->message;
9090
$message->multipart(2, 6);
9191

92-
$messageJson = $this->client->buildMessagePayload($message, '00301234');
92+
$messageJson = $this->client->buildMessageJson($message, '00301234');
9393

94-
$messageJsonObject = json_decode(json_encode($messageJson));
94+
$messageJsonObject = json_decode($messageJson);
9595

9696
$this->assertTrue(isset($messageJsonObject->messages->msg[0]->minimumNumberOfMessageParts));
9797
$this->assertEquals(2, $messageJsonObject->messages->msg[0]->minimumNumberOfMessageParts);
@@ -105,9 +105,9 @@ public function it_includes_reference_data()
105105
$message = clone $this->message;
106106
$message->reference('ABC');
107107

108-
$messageJson = $this->client->buildMessagePayload($message, '00301234');
108+
$messageJson = $this->client->buildMessageJson($message, '00301234');
109109

110-
$messageJsonObject = json_decode(json_encode($messageJson));
110+
$messageJsonObject = json_decode($messageJson);
111111

112112
$this->assertTrue(isset($messageJsonObject->messages->msg[0]->reference));
113113
$this->assertEquals('ABC', $messageJsonObject->messages->msg[0]->reference);
@@ -119,9 +119,9 @@ public function it_includes_encoding_detection_type_data_in_body()
119119
$message = clone $this->message;
120120
$message->encodingDetectionType('AUTO');
121121

122-
$messageJson = $this->client->buildMessagePayload($message, '00301234');
122+
$messageJson = $this->client->buildMessageJson($message, '00301234');
123123

124-
$messageJsonObject = json_decode(json_encode($messageJson));
124+
$messageJsonObject = json_decode($messageJson);
125125

126126
$this->assertTrue(isset($messageJsonObject->messages->msg[0]->body->type));
127127
$this->assertEquals('AUTO', $messageJsonObject->messages->msg[0]->body->type);
@@ -134,9 +134,9 @@ public function it_includes_encoding_detection_type_data_in_message()
134134
$message = clone $this->message;
135135
$message->encodingDetectionType(1);
136136

137-
$messageJson = $this->client->buildMessagePayload($message, '00301234');
137+
$messageJson = $this->client->buildMessageJson($message, '00301234');
138138

139-
$messageJsonObject = json_decode(json_encode($messageJson));
139+
$messageJsonObject = json_decode($messageJson);
140140

141141
$this->assertFalse(isset($messageJsonObject->messages->msg[0]->body->type));
142142
$this->assertEquals('1', $messageJsonObject->messages->msg[0]->dcs);

0 commit comments

Comments
 (0)