diff options
author | matt <matt@twilio.com> | 2016-10-12 10:29:21 -0700 |
---|---|---|
committer | matt <matt@twilio.com> | 2016-10-12 10:29:21 -0700 |
commit | 5c7edd02d6ba3c9f1ca3b46349b639115867cd27 (patch) | |
tree | d9db4d6d379fb58cc9f9504583dda42bd3dec8b0 | |
parent | 0d24c55cc35f5a558bd2ce109df5218e6b089c08 (diff) | |
parent | 354b5859cc7386642b8842a8b9e3dee01e957235 (diff) | |
download | twilio-php-origin/alpha.zip twilio-php-origin/alpha.tar.gz twilio-php-origin/alpha.tar.bz2 |
Merge branch 'master' into alpha5.4.2-alpha1origin/alpha
# Conflicts:
# Twilio/VersionInfo.php
-rw-r--r-- | CHANGES.md | 7 | ||||
-rw-r--r-- | Twilio/InstanceResource.php | 4 | ||||
-rw-r--r-- | Twilio/VersionInfo.php | 2 |
3 files changed, 12 insertions, 1 deletions
@@ -1,6 +1,13 @@ twilio-php Changelog ==================== +[2016-10-12] Version 5.4.2 +-------------------------- + + - Add `InstanceResource::toArray()` + +Thanks to @johnpaulmedina for this suggestion. + [2016-09-19] Version 5.4.1 -------------------------- diff --git a/Twilio/InstanceResource.php b/Twilio/InstanceResource.php index 8100d4d..2b802b2 100644 --- a/Twilio/InstanceResource.php +++ b/Twilio/InstanceResource.php @@ -14,6 +14,10 @@ class InstanceResource { $this->version = $version; } + public function toArray() { + return $this->properties; + } + public function __toString() { return '[InstanceResource]'; } diff --git a/Twilio/VersionInfo.php b/Twilio/VersionInfo.php index b99260a..12ca87d 100644 --- a/Twilio/VersionInfo.php +++ b/Twilio/VersionInfo.php @@ -7,7 +7,7 @@ namespace Twilio; class VersionInfo { const MAJOR = 5; const MINOR = 4; - const PATCH = '1-alpha1'; + const PATCH = '2-alpha1'; public static function string() { return implode('.', array(self::MAJOR, self::MINOR, self::PATCH)); |