From 6de145e1ba1dfabce46990d922ddaf24b34b3e95 Mon Sep 17 00:00:00 2001 From: Nixon Samuel Date: Thu, 5 Jul 2018 17:30:35 +0530 Subject: [PATCH] changed apiId, message position in constructors --- src/Plivo/Resources/Call/CallRecording.php | 4 ++-- src/Plivo/Resources/Conference/ConferenceInterface.php | 5 +++-- src/Plivo/Resources/Conference/ConferenceRecording.php | 4 ++-- src/Plivo/Resources/Endpoint/EndpointCreateReponse.php | 4 ++-- src/Plivo/Resources/Endpoint/EndpointInterface.php | 2 +- src/Plivo/Resources/Message/MessageCreateResponse.php | 4 ++-- src/Plivo/Resources/Message/MessageInterface.php | 5 +++-- src/Plivo/Resources/PhoneNumber/PhoneNumberBuyResponse.php | 4 ++-- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/Plivo/Resources/Call/CallRecording.php b/src/Plivo/Resources/Call/CallRecording.php index 39e96bb9..c1c0b09b 100644 --- a/src/Plivo/Resources/Call/CallRecording.php +++ b/src/Plivo/Resources/Call/CallRecording.php @@ -20,9 +20,9 @@ class CallRecording extends ResponseUpdate * @param string $url * @param string $recordingId */ - public function __construct($url, $message, $recordingId, $apiID) + public function __construct($url, $apiID, $recordingId, $message) { - parent::__construct($message, $apiID); + parent::__construct($apiID, $message); $this->url = $url; $this->recordingId = $recordingId; diff --git a/src/Plivo/Resources/Conference/ConferenceInterface.php b/src/Plivo/Resources/Conference/ConferenceInterface.php index de9a3743..4f01e73e 100644 --- a/src/Plivo/Resources/Conference/ConferenceInterface.php +++ b/src/Plivo/Resources/Conference/ConferenceInterface.php @@ -356,10 +356,11 @@ public function startRecording($conferenceName, $optionalArgs = []) $responseContents = $response->getContent(); return new ConferenceRecording( + $responseContents['api_id'], $responseContents['message'], - $responseContents['url'], $responseContents['recording_id'], - $responseContents['api_id']); + $responseContents['url'] + ); } /** diff --git a/src/Plivo/Resources/Conference/ConferenceRecording.php b/src/Plivo/Resources/Conference/ConferenceRecording.php index 1479062d..8f0689ce 100644 --- a/src/Plivo/Resources/Conference/ConferenceRecording.php +++ b/src/Plivo/Resources/Conference/ConferenceRecording.php @@ -26,9 +26,9 @@ class ConferenceRecording extends ResponseUpdate * @param $url * @param $recordingId */ - public function __construct($message, $url, $recordingId, $apiID) + public function __construct($apiId, $message, $recordingId, $url) { - parent::__construct($message, $apiID); + parent::__construct($apiId, $message); $this->url = $url; $this->recordingId = $recordingId; diff --git a/src/Plivo/Resources/Endpoint/EndpointCreateReponse.php b/src/Plivo/Resources/Endpoint/EndpointCreateReponse.php index 84f278d7..86a54748 100644 --- a/src/Plivo/Resources/Endpoint/EndpointCreateReponse.php +++ b/src/Plivo/Resources/Endpoint/EndpointCreateReponse.php @@ -31,9 +31,9 @@ class EndpointCreateReponse extends ResponseUpdate * @param string $alias * @param string $endpointId */ - public function __construct($message, $username, $alias, $endpointId, $apiID) + public function __construct($username, $alias, $message, $endpointId, $apiID) { - parent::__construct($message, $apiID); + parent::__construct($apiID, $message); $this->username = $username; $this->alias = $alias; $this->endpointId = $endpointId; diff --git a/src/Plivo/Resources/Endpoint/EndpointInterface.php b/src/Plivo/Resources/Endpoint/EndpointInterface.php index 584beb37..b15c62e7 100644 --- a/src/Plivo/Resources/Endpoint/EndpointInterface.php +++ b/src/Plivo/Resources/Endpoint/EndpointInterface.php @@ -65,9 +65,9 @@ public function create($username, $password, $alias, $appId = null) $responseContents = $response->getContent(); return new EndpointCreateReponse( - $responseContents['message'], $responseContents['username'], $responseContents['alias'], + $responseContents['message'], $responseContents['endpoint_id'], $responseContents['api_id']); } diff --git a/src/Plivo/Resources/Message/MessageCreateResponse.php b/src/Plivo/Resources/Message/MessageCreateResponse.php index 2b01fdc1..d9141821 100644 --- a/src/Plivo/Resources/Message/MessageCreateResponse.php +++ b/src/Plivo/Resources/Message/MessageCreateResponse.php @@ -18,9 +18,9 @@ class MessageCreateResponse extends ResponseUpdate * @param $message * @param array $messageUuid */ - public function __construct($message, $apiID, array $messageUuid) + public function __construct($message, array $messageUuid, $apiId) { - parent::__construct($message, $apiID); + parent::__construct($apiId, $message); $this->messageUuid = $messageUuid; } diff --git a/src/Plivo/Resources/Message/MessageInterface.php b/src/Plivo/Resources/Message/MessageInterface.php index 4fee9ba1..9714c760 100644 --- a/src/Plivo/Resources/Message/MessageInterface.php +++ b/src/Plivo/Resources/Message/MessageInterface.php @@ -163,9 +163,10 @@ public function create($src, array $dst, $text, $responseContents = $response->getContent(); return new MessageCreateResponse( - $responseContents['api_id'], $responseContents['message'], - $responseContents['message_uuid']); + $responseContents['message_uuid'], + $responseContents['api_id'] + ); } } \ No newline at end of file diff --git a/src/Plivo/Resources/PhoneNumber/PhoneNumberBuyResponse.php b/src/Plivo/Resources/PhoneNumber/PhoneNumberBuyResponse.php index 27b928ff..58961e8d 100644 --- a/src/Plivo/Resources/PhoneNumber/PhoneNumberBuyResponse.php +++ b/src/Plivo/Resources/PhoneNumber/PhoneNumberBuyResponse.php @@ -22,9 +22,9 @@ class PhoneNumberBuyResponse extends ResponseUpdate * @param $numberStatus * @param $status */ - public function __construct($message, $apiID, $number, $numberStatus, $status) + public function __construct($apiID, $message, $number, $numberStatus, $status) { - parent::__construct($message, $apiID); + parent::__construct($apiID, $message); $this->number = $number; $this->numberStatus = $numberStatus;