Merge branch 'develop' of https://github.com/Gipetto/twilio-php into …

…sean_changes
twilio · Oct 21, 2011 · 2d0cb26 · 2d0cb26
2 parents ef92db4 + 8965e75
commit 2d0cb26
Show file tree

Hide file tree

Showing 11 changed files with 265 additions and 59 deletions.
diff --git a/Services/Twilio/Rest/Account.php b/Services/Twilio/Rest/Account.php
@@ -16,7 +16,9 @@ protected function init()
             'outgoing_callerids',
             'recordings',
             'sms_messages',
-            'transcriptions'
+            'transcriptions',
+            'connect_apps',
+            'authorized_connect_apps'
         );
 
         $this->sandbox = new Services_Twilio_Rest_Sandbox(

diff --git a/Services/Twilio/Rest/AuthorizedConnectApp.php b/Services/Twilio/Rest/AuthorizedConnectApp.php
@@ -0,0 +1,6 @@
+<?php
+
+class Services_Twilio_Rest_AuthorizedConnectApp
+    extends Services_Twilio_InstanceResource
+{
+}
diff --git a/Services/Twilio/Rest/AuthorizedConnectApps.php b/Services/Twilio/Rest/AuthorizedConnectApps.php
@@ -0,0 +1,10 @@
+<?php
+
+class Services_Twilio_Rest_AuthorizedConnectApps
+    extends Services_Twilio_ListResource
+{
+   public function create($name, array $params = array())
+    {
+        throw new BadMethodCallException('Not allowed');        
+    }
+}
diff --git a/Services/Twilio/Rest/Call.php b/Services/Twilio/Rest/Call.php
@@ -8,6 +8,10 @@ public function hangup()
         $this->update('Status', 'completed');
     }
 
+    public function route($url) {
+        $this->update('Url', $url);
+    }
+
     protected function init()
     {
         $this->setupSubresources(

diff --git a/Services/Twilio/Rest/ConnectApp.php b/Services/Twilio/Rest/ConnectApp.php
@@ -0,0 +1,6 @@
+<?php
+
+class Services_Twilio_Rest_ConnectApp
+    extends Services_Twilio_InstanceResource
+{
+}
diff --git a/Services/Twilio/Rest/ConnectApps.php b/Services/Twilio/Rest/ConnectApps.php
@@ -0,0 +1,10 @@
+<?php
+
+class Services_Twilio_Rest_ConnectApps
+    extends Services_Twilio_ListResource
+{
+    public function create($name, array $params = array())
+    {
+        throw new BadMethodCallException('Not allowed');        
+    }
+}
diff --git a/Services/Twilio/Twiml.php b/Services/Twilio/Twiml.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Excepttion class for Services_Twilio_Twiml.
+ * Exception class for Services_Twilio_Twiml.
  */
 class Services_Twilio_TwimlException extends Exception {}
 

diff --git a/docs/api/rest.rst b/docs/api/rest.rst
@@ -459,7 +459,7 @@ PhoneNumber
 
 .. php:class:: Services_Twilio_Rest_IncomingPhoneNumber
 
-   For more information, see the `IncomingPhoneNumber Instance Resource <http://www.twilio.com/docs/api/rest/incoming-phone-number#instance>`_ documentation.
+   For more information, see the `IncomingPhoneNumber Instance Resource <http://www.twilio.com/docs/api/rest/incoming-phone-numbers#instance>`_ documentation.
 
    .. php:attr:: sid
 

diff --git a/docs/usage/rest/applications.rst b/docs/usage/rest/applications.rst
@@ -6,31 +6,31 @@ Creating Applications
 ==============================
 
 .. code-block:: php
-	
-	$client = new Services_Twilio('AC123', '123');
-	$application = $client->account->applications->create('Application Friendly Name', 
-	  array(
-	    'FriendlyName' => 'My Application Name',
-	    'VoiceUrl' => 'http://foo.com/voice/url',
-	    'VoiceFallbackUrl' => 'http://foo.com/voice/fallback/url',
-	    'VoiceMethod' => 'POST',
-	    'SmsUrl' => 'http://foo.com/sms/url',
-	    'SmsFallbackUrl' => 'http://foo.com/sms/fallback/url',
-	    'SmsMethod' => 'POST'
-	  )
-	);
-
-	
+    
+    $client = new Services_Twilio('AC123', '123');
+    $application = $client->account->applications->create('Application Friendly Name', 
+      array(
+        'FriendlyName' => 'My Application Name',
+        'VoiceUrl' => 'http://foo.com/voice/url',
+        'VoiceFallbackUrl' => 'http://foo.com/voice/fallback/url',
+        'VoiceMethod' => 'POST',
+        'SmsUrl' => 'http://foo.com/sms/url',
+        'SmsFallbackUrl' => 'http://foo.com/sms/fallback/url',
+        'SmsMethod' => 'POST'
+      )
+    );
+
+    
 Updating An Application
 ==============================
 
 .. code-block:: php
 
-	$client = new Services_Twilio('AC123', '123');
-	$application = $client->account->applications->get('AP123');
-	$application->update(array(
-	  'VoiceUrl' => 'http://foo.com/new/voice/url'
-	)); 
+    $client = new Services_Twilio('AC123', '123');
+    $application = $client->account->applications->get('AP123');
+    $application->update(array(
+      'VoiceUrl' => 'http://foo.com/new/voice/url'
+    )); 
 
 
 Finding an Application by Name
@@ -40,11 +40,11 @@ Find an :class:`Application` by its name (full name match).
 
 .. code-block:: php
 
-	$client = new Services_Twilio('AC123', '123');
-	$application = false;
-	$params = array(
-	    'FriendlyName' => 'My Application Name'
-	  );
-	foreach($client->account->applications->getIterator(0, 1, $params) as $_application) {
-	  $application = $_application;
-	}
+    $client = new Services_Twilio('AC123', '123');
+    $application = false;
+    $params = array(
+        'FriendlyName' => 'My Application Name'
+      );
+    foreach($client->account->applications->getIterator(0, 1, $params) as $_application) {
+      $application = $_application;
+    }