Merge branch 'master' into master

Author: aiham

src/OpenTok/OpenTok.php

@@ -386,6 +386,14 @@ public function listArchives($offset=0, $count=null)
         return new ArchiveList($archiveListData, array( 'client' => $this->client ));
     }
 
+    public function forceDisconnect($sessionId, $connectionId)
+    {
+        Validators::validateSessionId($sessionId);
+        Validators::validateConnectionId($connectionId);
+
+        return $this->client->forceDisconnect($sessionId, $connectionId);
+    }
+
     public function startBroadcast($sessionId, $options=array())
     {
         // unpack optional arguments (merging with default values) into named variables

src/OpenTok/Util/Client.php

@@ -131,6 +131,19 @@ public function deleteArchive($archiveId)
         return true;
     }
 
+    public function forceDisconnect($sessionId,$connectionId)
+    {
+        $request = $this->delete('/v2/project/'.$this->apiKey.'/session/'.$sessionId.'/connection/'.$connectionId);
+        $request->setHeader('Content-Type', 'application/json');
+        try {
+            $request->send()->json();
+        } catch (\Exception $e) {
+            $this->handleException($e);
+            return false;
+        }
+        return true;
+    }
+
     public function listArchives($offset, $count)
     {
         $request = $this->get('/v2/project/'.$this->apiKey.'/archive');

src/OpenTok/Util/Validators.php

@@ -62,6 +62,14 @@ public static function validateSessionId($sessionId)
             );
         }
     }
+    public static function validateConnectionId($connectionId)
+    {
+        if(!is_string($connectionId) || empty($connectionId)){
+            throw new InvalidArgumentException(
+                'Null or empty connection ID is not valid: '.print_r($connectionId, true)
+            );
+        }
+    }
     public static function validateRole($role)
     {
         if (!Role::isValidValue($role)) {

tests/OpenTok/OpenTokTest.php

@@ -833,6 +833,50 @@ public function testGetsExpiredArchive()
         $this->assertEquals("expired", $archive->status);
     }
 
+	public function testForceDisconnect()
+	{
+        // Arrange
+        $mock = new MockPlugin();
+        $response = MockPlugin::getMockFile(
+            self::$mockBasePath . 'v2/project/APIKEY/session/SESSIONID/connection/CONNECTIONID/delete'
+        );
+        $mock->addResponse($response);
+        $this->client->addSubscriber($mock);
+
+        // This sessionId was generated using a different apiKey, but this method doesn't do any
+        // decoding to check, so its fine.
+        $sessionId = '2_MX44NTQ1MTF-flR1ZSBOb3YgMTIgMDk6NDA6NTkgUFNUIDIwMTN-MC43NjU0Nzh-';
+
+        $connectionId = '063e72a4-64b4-43c8-9da5-eca071daab89';
+
+        // Act
+        $success = $this->opentok->forceDisconnect($sessionId, $connectionId);
+
+        // Assert
+        $requests = $mock->getReceivedRequests();
+        $this->assertCount(1, $requests);
+
+        $request = $requests[0];
+        $this->assertEquals('DELETE', strtoupper($request->getMethod()));
+        $this->assertEquals('/v2/project/'.$this->API_KEY.'/session/'.$sessionId.'/connection/'.$connectionId, $request->getPath());
+        $this->assertEquals('api.opentok.com', $request->getHost());
+        $this->assertEquals('https', $request->getScheme());
+
+        $contentType = $request->getHeader('Content-Type');
+        $this->assertNotEmpty($contentType);
+        $this->assertEquals('application/json', $contentType);
+
+        $authString = $request->getHeader('X-OPENTOK-AUTH');
+        $this->assertEquals(true, TestHelpers::validateOpenTokAuthHeader($this->API_KEY, $this->API_SECRET, $authString));
+
+        // TODO: test the dynamically built User Agent string
+        $userAgent = $request->getHeader('User-Agent');
+        $this->assertNotEmpty($userAgent);
+        $this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
+
+        $this->assertTrue($success);
+    }
+
     public function testStartsBroadcast()
     {
         // Arrange

tests/mock/v2/project/APIKEY/session/SESSIONID/connection/CONNECTIONID/delete

@@ -0,0 +1,4 @@
+HTTP/1.1 204 No Content
+Server: nginx 
+Date: Sun, 09 Mar 2014 20:14:41 GMT 
+Connection: keep-alive