Merge branch 'fix-mute-participants'

twilio · Jul 23, 2012 · f02e033 · f02e033
2 parents ab14675 + 6720b2f
commit f02e033
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Services/Twilio/ListResource.php b/Services/Twilio/ListResource.php
@@ -49,10 +49,10 @@ public function get($sid)
      * @return Services_Twilio_InstanceResource An instance with properties 
      *      initialized to the values in the params array.
      */
-    public function getObjectFromJson($params)
+    public function getObjectFromJson($params, $idParam = "sid")
     {
-        if (isset($params->sid)) {
+        if (isset($params->{$idParam})) {
-            $uri = $this->uri . "/" . $params->sid;
+            $uri = $this->uri . "/" . $params->{$idParam};
         } else {
             $uri = $this->uri;
         }

diff --git a/Services/Twilio/Rest/Participants.php b/Services/Twilio/Rest/Participants.php
@@ -3,4 +3,8 @@
 class Services_Twilio_Rest_Participants
     extends Services_Twilio_ListResource
 {
+    /* Participants are identified by CallSid, not like PI123 */
+    public function getObjectFromJson($params, $idParam = "sid") {
+        return parent::getObjectFromJson($params, "call_sid");
+    }
 }
diff --git a/tests/TwilioTest.php b/tests/TwilioTest.php
@@ -268,7 +268,7 @@ function testUnmute() {
                 '/2010-04-01/Accounts/AC123/Conferences/CF123/Participants.json?Page=0&PageSize=10')
                 ->andReturn(array(200, array('Content-Type' => 'application/json'),
                     json_encode(array(
-                        'participants' => array(array('sid' => 'CA123'))
+                        'participants' => array(array('call_sid' => 'CA123'))
                     ))
                 ));
         $http->shouldReceive('post')->once()