Skip to content

Commit 4461221

Browse files
committed
Add missing exception class and uodate twilio sdk driver
1 parent c33f24e commit 4461221

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

src/DriverManager.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use GuzzleHttp\Client;
66
use AfricasTalking\Gateway;
77
use Illuminate\Support\Manager;
8+
use Twilio\Rest\Client as Twilio;
89
use Elimuswift\SMS\Drivers\NexmoSMS;
910
use Elimuswift\SMS\Drivers\TwilioSMS;
1011

@@ -73,10 +74,8 @@ protected function createTwilioDriver()
7374
$config = $this->app['config']->get('sms.twilio', []);
7475

7576
return new TwilioSMS(
76-
new \Services_Twilio($config['account_sid'], $config['auth_token']),
77-
$config['auth_token'],
78-
$this->app['request']->url(),
79-
$config['verify']
77+
new Twilio($config['account_sid'], $config['auth_token']),
78+
$config['auth_token']
8079
);
8180
}
8281
}

src/Drivers/TwilioSMS.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class TwilioSMS extends AbstractSMS implements DriverInterface
4444
* @param $url
4545
* @param bool $verify
4646
*/
47-
public function __construct(Services_Twilio $twilio, $authToken, $url, $verify = false)
47+
public function __construct(Twilio $twilio, $authToken, $url, $verify = false)
4848
{
4949
$this->twilio = $twilio;
5050
$this->authToken = $authToken;
@@ -63,11 +63,9 @@ public function send(OutgoingMessage $message)
6363
$composeMessage = $message->composeMessage();
6464

6565
foreach ($message->getTo() as $to) {
66-
$this->twilio->account->messages->create([
67-
'To' => $to,
66+
$this->twilio->messages->create($to, [
6867
'From' => $from,
6968
'Body' => $composeMessage,
70-
'MediaUrl' => $message->getAttachImages(),
7169
]);
7270
}
7371
}
@@ -99,7 +97,7 @@ public function checkMessages(array $options = [])
9997
$start = array_key_exists('start', $options) ? $options['start'] : 0;
10098
$end = array_key_exists('end', $options) ? $options['end'] : 25;
10199

102-
$rawMessages = $this->twilio->account->messages->getIterator($start, $end, $options);
100+
$rawMessages = $this->twilio->messages->getIterator($start, $end, $options);
103101
$incomingMessages = [];
104102

105103
foreach ($rawMessages as $rawMessage) {
@@ -120,7 +118,7 @@ public function checkMessages(array $options = [])
120118
*/
121119
public function getMessage($messageId)
122120
{
123-
$rawMessage = $this->twilio->account->messages->get($messageId);
121+
$rawMessage = $this->twilio->messages->get($messageId);
124122
$incomingMessage = $this->createIncomingMessage();
125123
$this->processReceive($incomingMessage, $rawMessage);
126124

0 commit comments

Comments
 (0)