Merge pull request #323 from opentok/dev

Dev

Author: SecondeJK

src/OpenTok/SipCall.php

@@ -17,9 +17,6 @@
 * The ID of the stream connected to the OpenTok session streaming the audio received from
 * the SIP call.
 *
-* @property bool $observeForceMute
-* Whether the SIP call honors
-* <a href="https://tokbox.com/developer/guides/moderation/#force_mute">force mute moderation</a>.
 */
 class SipCall
 {
@@ -32,7 +29,6 @@ public function __construct($sipCallData)
         $this->data['id'] = $sipCallData['id'];
         $this->data['connectionId'] = $sipCallData['connectionId'];
         $this->data['streamId'] = $sipCallData['streamId'];
-        $this->data['observeForceMute'] = $sipCallData['observeForceMute'];
     }
 
     /**
@@ -45,7 +41,6 @@ public function __get($name)
             case 'id':
             case 'connectionId':
             case 'streamId':
-            case 'observeForceMute':
                 return $this->data[$name];
             default:
                 return null;

tests/OpenTokTest/OpenTokTest.php

@@ -9,8 +9,6 @@
 use OpenTok\MediaMode;
 use ArgumentCountError;
 use DomainException;
-use Exception;
-use GuzzleHttp\Exception\GuzzleException;
 use OpenTok\OutputMode;
 use OpenTok\ArchiveMode;
 use OpenTok\StreamMode;
@@ -19,12 +17,7 @@
 use GuzzleHttp\HandlerStack;
 use PHPUnit\Framework\TestCase;
 use GuzzleHttp\Handler\MockHandler;
-use InvalidArgumentException as GlobalInvalidArgumentException;
-use OpenTok\Exception\AuthenticationException;
-use OpenTok\Exception\DomainException as ExceptionDomainException;
 use OpenTok\Exception\InvalidArgumentException;
-use RuntimeException;
-use OpenTok\Exception\UnexpectedValueException;
 
 define('OPENTOK_DEBUG', true);
 
@@ -2237,7 +2230,6 @@ public function testSipCallVideo(): void
         $this->assertNotNull($sipCall->id);
         $this->assertNotNull($sipCall->connectionId);
         $this->assertNotNull($sipCall->streamId);
-        $this->assertEquals(false, $sipCall->observeForceMute);
 
         $this->assertCount(1, $this->historyContainer);
         $request = $this->historyContainer[0]['request'];
@@ -2271,7 +2263,6 @@ public function testSipCallVideoWithObserveForceMute(): void
         $this->assertNotNull($sipCall->id);
         $this->assertNotNull($sipCall->connectionId);
         $this->assertNotNull($sipCall->streamId);
-        $this->assertEquals(true, $sipCall->observeForceMute);
 
         $this->assertCount(1, $this->historyContainer);
         $request = $this->historyContainer[0]['request'];

tests/OpenTokTest/SipCallTest.php

@@ -0,0 +1,24 @@
+<?php
+namespace OpenTokTest;
+
+use OpenTok\SipCall;
+use PHPUnit\Framework\TestCase;
+
+class SipCallTest extends TestCase
+{
+    public function testSipCallAttributes(): void
+    {
+        $sipCallData = [
+            'id' => '1_MX4xMjM0NTY3OH4',
+            'connectionId' => 'VGh1IEZlYiAyNyAwNDozODozMSBQU1QgMjAxNH4wLjI0NDgyMjI',
+            'streamId' => '0123456789abcdef0123456789abcdef0123456789'
+        ];
+
+        $sipCall = new SipCall($sipCallData);
+
+        $this->assertEquals('1_MX4xMjM0NTY3OH4', $sipCall->id);
+        $this->assertEquals('VGh1IEZlYiAyNyAwNDozODozMSBQU1QgMjAxNH4wLjI0NDgyMjI', $sipCall->connectionId);
+        $this->assertEquals('0123456789abcdef0123456789abcdef0123456789', $sipCall->streamId);
+        $this->assertNull($sipCall->observeForceMute);
+    }
+}

tests/mock/v2/project/APIKEY/dial

@@ -1,6 +1,5 @@
 {
   "id" : "1bae377f-d620-4e58-86c0-5a37364eec0c",
   "connectionId" : "da9cb410-e29b-4c2d-ab9e-fe65bf83fcaf",
-  "streamId" : "e6f13213-22cb-45de-b71d-af7cef329954",
-  "observeForceMute" : false
+  "streamId" : "e6f13213-22cb-45de-b71d-af7cef329954"
 }

tests/mock/v2/project/APIKEY/dialForceMute

@@ -1,6 +1,5 @@
 {
   "id" : "1bae377f-d620-4e58-86c0-5a37364eec0c",
   "connectionId" : "da9cb410-e29b-4c2d-ab9e-fe65bf83fcaf",
-  "streamId" : "e6f13213-22cb-45de-b71d-af7cef329954",
-  "observeForceMute" : true
+  "streamId" : "e6f13213-22cb-45de-b71d-af7cef329954"
 }