Skip to content

Commit

Permalink
Merge pull request #423 from twilio/regenerate-mainline-04-27
Browse files Browse the repository at this point in the history
Regenerate Mainline 4/27
  • Loading branch information
codejudas committed Apr 27, 2017
2 parents 802b1a7 + c25e9ee commit ef5a12c
Show file tree
Hide file tree
Showing 128 changed files with 16,615 additions and 197 deletions.
7 changes: 7 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
twilio-php Changelog
====================

[2017-04-27] Version 5.8.0
--------------------------
- Add support for Twilio Chat v2
- Add `recordingChannels`, `recordingStatusCallback`, `recordingStatusCallbackMethod`, `sipAuthUsername`, `sipAuthPassword`, `region`, `conferenceRecordingStatusCallback`, `conferenceRecordingStatusCallbackMethod` optional parameters to conference participant resource.
- Add support for setting `DEBUG_HTTP_TRAFFIC=true` environment varibale to dump request and response information. Thanks @kevinburke, PR #394.
- Add deprecation warning to `ConversationsGrant`, it is being replaced by `VideoGrant`.

[2017-04-12] Version 5.7.3
--------------------------
- Add TaskRouterGrant.
Expand Down
8 changes: 8 additions & 0 deletions Twilio/Rest/Api/V2010/Account/Conference/ParticipantList.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ public function create($from, $to, $options = array()) {
'ConferenceStatusCallback' => $options['conferenceStatusCallback'],
'ConferenceStatusCallbackMethod' => $options['conferenceStatusCallbackMethod'],
'ConferenceStatusCallbackEvent' => $options['conferenceStatusCallbackEvent'],
'RecordingChannels' => $options['recordingChannels'],
'RecordingStatusCallback' => $options['recordingStatusCallback'],
'RecordingStatusCallbackMethod' => $options['recordingStatusCallbackMethod'],
'SipAuthUsername' => $options['sipAuthUsername'],
'SipAuthPassword' => $options['sipAuthPassword'],
'Region' => $options['region'],
'ConferenceRecordingStatusCallback' => $options['conferenceRecordingStatusCallback'],
'ConferenceRecordingStatusCallbackMethod' => $options['conferenceRecordingStatusCallbackMethod'],
));

$payload = $this->version->create(
Expand Down
129 changes: 125 additions & 4 deletions Twilio/Rest/Api/V2010/Account/Conference/ParticipantOptions.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,21 @@ public static function update($muted = Values::NONE, $hold = Values::NONE, $hold
* conference_status_callback_method
* @param string $conferenceStatusCallbackEvent The
* conference_status_callback_event
* @param string $recordingChannels The recording_channels
* @param string $recordingStatusCallback The recording_status_callback
* @param string $recordingStatusCallbackMethod The
* recording_status_callback_method
* @param string $sipAuthUsername The sip_auth_username
* @param string $sipAuthPassword The sip_auth_password
* @param string $region The region
* @param string $conferenceRecordingStatusCallback The
* conference_recording_status_callback
* @param string $conferenceRecordingStatusCallbackMethod The
* conference_recording_status_callback_method
* @return CreateParticipantOptions Options builder
*/
public static function create($statusCallback = Values::NONE, $statusCallbackMethod = Values::NONE, $statusCallbackEvent = Values::NONE, $timeout = Values::NONE, $record = Values::NONE, $muted = Values::NONE, $beep = Values::NONE, $startConferenceOnEnter = Values::NONE, $endConferenceOnExit = Values::NONE, $waitUrl = Values::NONE, $waitMethod = Values::NONE, $earlyMedia = Values::NONE, $maxParticipants = Values::NONE, $conferenceRecord = Values::NONE, $conferenceTrim = Values::NONE, $conferenceStatusCallback = Values::NONE, $conferenceStatusCallbackMethod = Values::NONE, $conferenceStatusCallbackEvent = Values::NONE) {
return new CreateParticipantOptions($statusCallback, $statusCallbackMethod, $statusCallbackEvent, $timeout, $record, $muted, $beep, $startConferenceOnEnter, $endConferenceOnExit, $waitUrl, $waitMethod, $earlyMedia, $maxParticipants, $conferenceRecord, $conferenceTrim, $conferenceStatusCallback, $conferenceStatusCallbackMethod, $conferenceStatusCallbackEvent);
public static function create($statusCallback = Values::NONE, $statusCallbackMethod = Values::NONE, $statusCallbackEvent = Values::NONE, $timeout = Values::NONE, $record = Values::NONE, $muted = Values::NONE, $beep = Values::NONE, $startConferenceOnEnter = Values::NONE, $endConferenceOnExit = Values::NONE, $waitUrl = Values::NONE, $waitMethod = Values::NONE, $earlyMedia = Values::NONE, $maxParticipants = Values::NONE, $conferenceRecord = Values::NONE, $conferenceTrim = Values::NONE, $conferenceStatusCallback = Values::NONE, $conferenceStatusCallbackMethod = Values::NONE, $conferenceStatusCallbackEvent = Values::NONE, $recordingChannels = Values::NONE, $recordingStatusCallback = Values::NONE, $recordingStatusCallbackMethod = Values::NONE, $sipAuthUsername = Values::NONE, $sipAuthPassword = Values::NONE, $region = Values::NONE, $conferenceRecordingStatusCallback = Values::NONE, $conferenceRecordingStatusCallbackMethod = Values::NONE) {
return new CreateParticipantOptions($statusCallback, $statusCallbackMethod, $statusCallbackEvent, $timeout, $record, $muted, $beep, $startConferenceOnEnter, $endConferenceOnExit, $waitUrl, $waitMethod, $earlyMedia, $maxParticipants, $conferenceRecord, $conferenceTrim, $conferenceStatusCallback, $conferenceStatusCallbackMethod, $conferenceStatusCallbackEvent, $recordingChannels, $recordingStatusCallback, $recordingStatusCallbackMethod, $sipAuthUsername, $sipAuthPassword, $region, $conferenceRecordingStatusCallback, $conferenceRecordingStatusCallbackMethod);
}

/**
Expand Down Expand Up @@ -157,8 +168,19 @@ class CreateParticipantOptions extends Options {
* conference_status_callback_method
* @param string $conferenceStatusCallbackEvent The
* conference_status_callback_event
*/
public function __construct($statusCallback = Values::NONE, $statusCallbackMethod = Values::NONE, $statusCallbackEvent = Values::NONE, $timeout = Values::NONE, $record = Values::NONE, $muted = Values::NONE, $beep = Values::NONE, $startConferenceOnEnter = Values::NONE, $endConferenceOnExit = Values::NONE, $waitUrl = Values::NONE, $waitMethod = Values::NONE, $earlyMedia = Values::NONE, $maxParticipants = Values::NONE, $conferenceRecord = Values::NONE, $conferenceTrim = Values::NONE, $conferenceStatusCallback = Values::NONE, $conferenceStatusCallbackMethod = Values::NONE, $conferenceStatusCallbackEvent = Values::NONE) {
* @param string $recordingChannels The recording_channels
* @param string $recordingStatusCallback The recording_status_callback
* @param string $recordingStatusCallbackMethod The
* recording_status_callback_method
* @param string $sipAuthUsername The sip_auth_username
* @param string $sipAuthPassword The sip_auth_password
* @param string $region The region
* @param string $conferenceRecordingStatusCallback The
* conference_recording_status_callback
* @param string $conferenceRecordingStatusCallbackMethod The
* conference_recording_status_callback_method
*/
public function __construct($statusCallback = Values::NONE, $statusCallbackMethod = Values::NONE, $statusCallbackEvent = Values::NONE, $timeout = Values::NONE, $record = Values::NONE, $muted = Values::NONE, $beep = Values::NONE, $startConferenceOnEnter = Values::NONE, $endConferenceOnExit = Values::NONE, $waitUrl = Values::NONE, $waitMethod = Values::NONE, $earlyMedia = Values::NONE, $maxParticipants = Values::NONE, $conferenceRecord = Values::NONE, $conferenceTrim = Values::NONE, $conferenceStatusCallback = Values::NONE, $conferenceStatusCallbackMethod = Values::NONE, $conferenceStatusCallbackEvent = Values::NONE, $recordingChannels = Values::NONE, $recordingStatusCallback = Values::NONE, $recordingStatusCallbackMethod = Values::NONE, $sipAuthUsername = Values::NONE, $sipAuthPassword = Values::NONE, $region = Values::NONE, $conferenceRecordingStatusCallback = Values::NONE, $conferenceRecordingStatusCallbackMethod = Values::NONE) {
$this->options['statusCallback'] = $statusCallback;
$this->options['statusCallbackMethod'] = $statusCallbackMethod;
$this->options['statusCallbackEvent'] = $statusCallbackEvent;
Expand All @@ -177,6 +199,14 @@ public function __construct($statusCallback = Values::NONE, $statusCallbackMetho
$this->options['conferenceStatusCallback'] = $conferenceStatusCallback;
$this->options['conferenceStatusCallbackMethod'] = $conferenceStatusCallbackMethod;
$this->options['conferenceStatusCallbackEvent'] = $conferenceStatusCallbackEvent;
$this->options['recordingChannels'] = $recordingChannels;
$this->options['recordingStatusCallback'] = $recordingStatusCallback;
$this->options['recordingStatusCallbackMethod'] = $recordingStatusCallbackMethod;
$this->options['sipAuthUsername'] = $sipAuthUsername;
$this->options['sipAuthPassword'] = $sipAuthPassword;
$this->options['region'] = $region;
$this->options['conferenceRecordingStatusCallback'] = $conferenceRecordingStatusCallback;
$this->options['conferenceRecordingStatusCallbackMethod'] = $conferenceRecordingStatusCallbackMethod;
}

/**
Expand Down Expand Up @@ -379,6 +409,97 @@ public function setConferenceStatusCallbackEvent($conferenceStatusCallbackEvent)
return $this;
}

/**
* The recording_channels
*
* @param string $recordingChannels The recording_channels
* @return $this Fluent Builder
*/
public function setRecordingChannels($recordingChannels) {
$this->options['recordingChannels'] = $recordingChannels;
return $this;
}

/**
* The recording_status_callback
*
* @param string $recordingStatusCallback The recording_status_callback
* @return $this Fluent Builder
*/
public function setRecordingStatusCallback($recordingStatusCallback) {
$this->options['recordingStatusCallback'] = $recordingStatusCallback;
return $this;
}

/**
* The recording_status_callback_method
*
* @param string $recordingStatusCallbackMethod The
* recording_status_callback_method
* @return $this Fluent Builder
*/
public function setRecordingStatusCallbackMethod($recordingStatusCallbackMethod) {
$this->options['recordingStatusCallbackMethod'] = $recordingStatusCallbackMethod;
return $this;
}

/**
* The sip_auth_username
*
* @param string $sipAuthUsername The sip_auth_username
* @return $this Fluent Builder
*/
public function setSipAuthUsername($sipAuthUsername) {
$this->options['sipAuthUsername'] = $sipAuthUsername;
return $this;
}

/**
* The sip_auth_password
*
* @param string $sipAuthPassword The sip_auth_password
* @return $this Fluent Builder
*/
public function setSipAuthPassword($sipAuthPassword) {
$this->options['sipAuthPassword'] = $sipAuthPassword;
return $this;
}

/**
* The region
*
* @param string $region The region
* @return $this Fluent Builder
*/
public function setRegion($region) {
$this->options['region'] = $region;
return $this;
}

/**
* The conference_recording_status_callback
*
* @param string $conferenceRecordingStatusCallback The
* conference_recording_status_callback
* @return $this Fluent Builder
*/
public function setConferenceRecordingStatusCallback($conferenceRecordingStatusCallback) {
$this->options['conferenceRecordingStatusCallback'] = $conferenceRecordingStatusCallback;
return $this;
}

/**
* The conference_recording_status_callback_method
*
* @param string $conferenceRecordingStatusCallbackMethod The
* conference_recording_status_callback_method
* @return $this Fluent Builder
*/
public function setConferenceRecordingStatusCallbackMethod($conferenceRecordingStatusCallbackMethod) {
$this->options['conferenceRecordingStatusCallbackMethod'] = $conferenceRecordingStatusCallbackMethod;
return $this;
}

/**
* Provide a friendly representation
*
Expand Down
37 changes: 25 additions & 12 deletions Twilio/Rest/Chat.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,19 @@
use Twilio\Domain;
use Twilio\Exceptions\TwilioException;
use Twilio\Rest\Chat\V1;
use Twilio\Rest\Chat\V2;

/**
* @property \Twilio\Rest\Chat\V1 v1
* @property \Twilio\Rest\Chat\V1\CredentialList credentials
* @property \Twilio\Rest\Chat\V1\ServiceList services
* @method \Twilio\Rest\Chat\V1\CredentialContext credentials(string $sid)
* @method \Twilio\Rest\Chat\V1\ServiceContext services(string $sid)
* @property \Twilio\Rest\Chat\V2 v2
* @property \Twilio\Rest\Chat\V2\CredentialList credentials
* @property \Twilio\Rest\Chat\V2\ServiceList services
* @method \Twilio\Rest\Chat\V2\CredentialContext credentials(string $sid)
* @method \Twilio\Rest\Chat\V2\ServiceContext services(string $sid)
*/
class Chat extends Domain {
protected $_v1 = null;
protected $_v2 = null;

/**
* Construct the Chat Domain
Expand All @@ -46,6 +49,16 @@ protected function getV1() {
return $this->_v1;
}

/**
* @return \Twilio\Rest\Chat\V2 Version v2 of chat
*/
protected function getV2() {
if (!$this->_v2) {
$this->_v2 = new V2($this);
}
return $this->_v2;
}

/**
* Magic getter to lazy load version
*
Expand Down Expand Up @@ -80,33 +93,33 @@ public function __call($name, $arguments) {
}

/**
* @return \Twilio\Rest\Chat\V1\CredentialList
* @return \Twilio\Rest\Chat\V2\CredentialList
*/
protected function getCredentials() {
return $this->v1->credentials;
return $this->v2->credentials;
}

/**
* @param string $sid The sid
* @return \Twilio\Rest\Chat\V1\CredentialContext
* @return \Twilio\Rest\Chat\V2\CredentialContext
*/
protected function contextCredentials($sid) {
return $this->v1->credentials($sid);
return $this->v2->credentials($sid);
}

/**
* @return \Twilio\Rest\Chat\V1\ServiceList
* @return \Twilio\Rest\Chat\V2\ServiceList
*/
protected function getServices() {
return $this->v1->services;
return $this->v2->services;
}

/**
* @param string $sid The sid
* @return \Twilio\Rest\Chat\V1\ServiceContext
* @return \Twilio\Rest\Chat\V2\ServiceContext
*/
protected function contextServices($sid) {
return $this->v1->services($sid);
return $this->v2->services($sid);
}

/**
Expand Down
100 changes: 100 additions & 0 deletions Twilio/Rest/Chat/V2.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?php

/**
* This code was generated by
* \ / _ _ _| _ _
* | (_)\/(_)(_|\/| |(/_ v1.0.0
* / /
*/

namespace Twilio\Rest\Chat;

use Twilio\Domain;
use Twilio\Exceptions\TwilioException;
use Twilio\Rest\Chat\V2\CredentialList;
use Twilio\Rest\Chat\V2\ServiceList;
use Twilio\Version;

/**
* @property \Twilio\Rest\Chat\V2\CredentialList credentials
* @property \Twilio\Rest\Chat\V2\ServiceList services
* @method \Twilio\Rest\Chat\V2\CredentialContext credentials(string $sid)
* @method \Twilio\Rest\Chat\V2\ServiceContext services(string $sid)
*/
class V2 extends Version {
protected $_credentials = null;
protected $_services = null;

/**
* Construct the V2 version of Chat
*
* @param \Twilio\Domain $domain Domain that contains the version
* @return \Twilio\Rest\Chat\V2 V2 version of Chat
*/
public function __construct(Domain $domain) {
parent::__construct($domain);
$this->version = 'v2';
}

/**
* @return \Twilio\Rest\Chat\V2\CredentialList
*/
protected function getCredentials() {
if (!$this->_credentials) {
$this->_credentials = new CredentialList($this);
}
return $this->_credentials;
}

/**
* @return \Twilio\Rest\Chat\V2\ServiceList
*/
protected function getServices() {
if (!$this->_services) {
$this->_services = new ServiceList($this);
}
return $this->_services;
}

/**
* Magic getter to lazy load root resources
*
* @param string $name Resource to return
* @return \Twilio\ListResource The requested resource
* @throws \Twilio\Exceptions\TwilioException For unknown resource
*/
public function __get($name) {
$method = 'get' . ucfirst($name);
if (method_exists($this, $method)) {
return $this->$method();
}

throw new TwilioException('Unknown resource ' . $name);
}

/**
* Magic caller to get resource contexts
*
* @param string $name Resource to return
* @param array $arguments Context parameters
* @return \Twilio\InstanceContext The requested resource context
* @throws \Twilio\Exceptions\TwilioException For unknown resource
*/
public function __call($name, $arguments) {
$property = $this->$name;
if (method_exists($property, 'getContext')) {
return call_user_func_array(array($property, 'getContext'), $arguments);
}

throw new TwilioException('Resource does not have a context');
}

/**
* Provide a friendly representation
*
* @return string Machine friendly representation
*/
public function __toString() {
return '[Twilio.Chat.V2]';
}
}
Loading

0 comments on commit ef5a12c

Please sign in to comment.