Skip to content

Commit 404fc40

Browse files
authored
Merge pull request #41 from dstotijn/add-report-url-param
Add `reportUrl` parameter for SMS and voice messages
2 parents 27ff624 + 2bafd65 commit 404fc40

File tree

5 files changed

+22
-7
lines changed

5 files changed

+22
-7
lines changed

src/MessageBird/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Client
1212
const ENDPOINT = 'https://rest.messagebird.com';
1313
const CHATAPI_ENDPOINT = 'https://chat.messagebird.com/1';
1414

15-
const CLIENT_VERSION = '1.6.4';
15+
const CLIENT_VERSION = '1.6.5';
1616

1717
/**
1818
* @var string

src/MessageBird/Objects/Message.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,13 @@ class Message extends Base
130130
*/
131131
public $recipients = array ();
132132

133+
/**
134+
* The URL to send status delivery reports for the message to
135+
*
136+
* @var string
137+
*/
138+
public $reportUrl;
139+
133140

134141
/**
135142
* Send a premium SMS

src/MessageBird/Objects/VoiceMessage.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@ class VoiceMessage extends Base
101101
*/
102102
public $recipients = array ();
103103

104+
/**
105+
* The URL to send status delivery reports for the voice message to
106+
*
107+
* @var string
108+
*/
109+
public $reportUrl;
110+
104111
/**
105112
* Get the created id
106113
*

tests/integration/messages/MessagesTest.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ public function testCreateMessage()
4343
"statusDatetime":"2015-07-03T07:55:31+00:00"
4444
}
4545
]
46-
}
46+
},
47+
"reportUrl":null
4748
}'));
48-
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("POST", 'messages', null, '{"direction":"mt","type":"sms","originator":"MessageBird","body":"This is a test message.","reference":null,"validity":null,"gateway":null,"typeDetails":[],"datacoding":"plain","mclass":1,"scheduledDatetime":null,"recipients":[31612345678]}');
49+
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("POST", 'messages', null, '{"direction":"mt","type":"sms","originator":"MessageBird","body":"This is a test message.","reference":null,"validity":null,"gateway":null,"typeDetails":[],"datacoding":"plain","mclass":1,"scheduledDatetime":null,"recipients":[31612345678],"reportUrl":null}');
4950
$this->client->messages->create($Message);
5051
}
5152

@@ -59,7 +60,7 @@ public function testPremiumSmsMessage()
5960
$Message->recipients = array(31612345678);
6061
$Message->body = 'This is a test message.';
6162
$Message->setPremiumSms(2002, 'mb', 1, 2);
62-
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("POST", 'messages', null, '{"direction":"mt","type":"premium","originator":"MessageBird","body":"This is a test message.","reference":null,"validity":null,"gateway":null,"typeDetails":{"shortcode":2002,"keyword":"mb","tariff":1,"mid":2},"datacoding":"plain","mclass":1,"scheduledDatetime":null,"recipients":[31612345678]}');
63+
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("POST", 'messages', null, '{"direction":"mt","type":"premium","originator":"MessageBird","body":"This is a test message.","reference":null,"validity":null,"gateway":null,"typeDetails":{"shortcode":2002,"keyword":"mb","tariff":1,"mid":2},"datacoding":"plain","mclass":1,"scheduledDatetime":null,"recipients":[31612345678],"reportUrl":null}');
6364
$this->client->messages->create($Message);
6465
}
6566

@@ -73,7 +74,7 @@ public function testBinarySmsMessage()
7374
$Message->recipients = array(31612345678);
7475
$Message->body = 'This is a test message.';
7576
$Message->setBinarySms("HEADER", "test");
76-
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("POST", 'messages', null, '{"direction":"mt","type":"binary","originator":"MessageBird","body":"test","reference":null,"validity":null,"gateway":null,"typeDetails":{"udh":"HEADER"},"datacoding":"plain","mclass":1,"scheduledDatetime":null,"recipients":[31612345678]}');
77+
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("POST", 'messages', null, '{"direction":"mt","type":"binary","originator":"MessageBird","body":"test","reference":null,"validity":null,"gateway":null,"typeDetails":{"udh":"HEADER"},"datacoding":"plain","mclass":1,"scheduledDatetime":null,"recipients":[31612345678],"reportUrl":null}');
7778
$this->client->messages->create($Message);
7879
}
7980

@@ -89,7 +90,7 @@ public function testFlashSmsMessage()
8990
$Message->body = 'This is a test message.';
9091
$Message->setBinarySms("HEADER", "test");
9192
$Message->setFlash(true);
92-
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("POST", 'messages', null, '{"direction":"mt","type":"binary","originator":"MessageBird","body":"test","reference":null,"validity":null,"gateway":null,"typeDetails":{"udh":"HEADER"},"datacoding":"plain","mclass":0,"scheduledDatetime":null,"recipients":[31612345678]}');
93+
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("POST", 'messages', null, '{"direction":"mt","type":"binary","originator":"MessageBird","body":"test","reference":null,"validity":null,"gateway":null,"typeDetails":{"udh":"HEADER"},"datacoding":"plain","mclass":0,"scheduledDatetime":null,"recipients":[31612345678],"reportUrl":null}');
9394
$this->client->messages->create($Message);
9495
}
9596

tests/integration/voicemessages/VoiceMessagesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function testVoiceMessageCreate()
1818
$Message->body = 'This is a test message.';
1919
$Message->language = "nl";
2020
$Message->voice = "male";
21-
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("POST", 'voicemessages', null, '{"originator":"MessageBird","body":"This is a test message.","reference":null,"language":"nl","voice":"male","repeat":1,"ifMachine":"continue","scheduledDatetime":null,"recipients":[31612345678]}');
21+
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("POST", 'voicemessages', null, '{"originator":"MessageBird","body":"This is a test message.","reference":null,"language":"nl","voice":"male","repeat":1,"ifMachine":"continue","scheduledDatetime":null,"recipients":[31612345678],"reportUrl":null}');
2222
$this->client->voicemessages->create($Message);
2323
}
2424

0 commit comments

Comments
 (0)