Merge branch 'master' into dev

Author: Manik Sachdeva

README.md

@@ -413,6 +413,59 @@ $opentok->dial($sessionId, $token, $sipUri, $options);
 For more information, see the [OpenTok SIP Interconnect developer
 guide](https://tokbox.com/developer/guides/sip/).
 
+## Force Disconnect
+
+Your application server can disconnect a client from an OpenTok session by calling the `forceDisconnect($sessionId, $connectionId)` 
+method of the `OpenTok\OpenTok` class.
+
+```php
+use OpenTok\OpenTok;
+
+// Force disconnect a client connection
+$opentok->forceDisconnect($sessionId, $connectionId);
+```
+## Sending Signals
+
+Once a Session is created, you can send signals to everyone in the session or to a specific connection.
+You can send a signal by calling the `signal($sessionId, $payload, $connectionId)` method of the
+`OpenTok\OpenTok` class.
+
+The `$sessionId` parameter is the session ID of the session.
+
+The `$payload` parameter is an associative array used to set the
+following:
+
+* `data` (string) -- The data string for the signal. You can send a maximum of 8kB.
+
+* `type` (string) -- — (Optional) The type string for the signal. You can send a maximum of 128 characters, and only the following characters are allowed: A-Z, a-z, numbers (0-9), '-', '_', and '~'.
+
+The `$connectionId` parameter is an optional string used to specify the connection ID of
+a client connected to the session. If you specify this value, the signal is sent to
+the specified client. Otherwise, the signal is sent to all clients connected to the session.
+
+
+```php
+use OpenTok\OpenTok;
+
+// Send a signal to a specific client
+$signalPayload = array(
+    'data' => 'some signal message',
+    'type' => 'signal type'
+);
+$connectionId = 'da9cb410-e29b-4c2d-ab9e-fe65bf83fcaf';
+$opentok->signal($sessionId, $signalPayload, $connectionId);
+
+// Send a signal to everyone in the session
+$signalPayload = array(
+    'data' => 'some signal message',
+    'type' => 'signal type'
+);
+$opentok->signal($sessionId, $signalPayload);
+```
+
+For more information, see the [OpenTok signaling developer
+guide](https://tokbox.com/developer/guides/signaling/).
+
 ## Samples
 
 There are three sample applications included in this repository. To get going as fast as possible, clone the whole

src/OpenTok/Exception/ForceDisconnectConnectionException.php

@@ -9,6 +9,7 @@
 class ForceDisconnectConnectionException extends \OpenTok\Exception\DomainException implements \OpenTok\Exception\ForceDisconnectException
 {
   /** @ignore */
+
   public function __construct($message, $code)
   {
       parent::__construct($message, $code);

src/OpenTok/Exception/ForceDisconnectUnexpectedValueException.php

@@ -9,6 +9,7 @@
 class ForceDisconnectUnexpectedValueException extends \OpenTok\Exception\UnexpectedValueException implements \OpenTok\Exception\ForceDisconnectException
 {
   /** @ignore */
+
   public function __construct($message, $code)
   {
       parent::__construct($message, $code);

src/OpenTok/Exception/SignalConnectionException.php

@@ -9,6 +9,7 @@
 class SignalConnectionException extends \OpenTok\Exception\DomainException implements \OpenTok\Exception\SignalException
 {
   /** @ignore */
+
   public function __construct($message, $code)
   {
       parent::__construct($message, $code);

src/OpenTok/Exception/SignalUnexpectedValueException.php

@@ -9,6 +9,7 @@
 class SignalUnexpectedValueException extends \OpenTok\Exception\UnexpectedValueException implements \OpenTok\Exception\SignalException
 {
   /** @ignore */
+
   public function __construct($message, $code)
   {
       parent::__construct($message, $code);

src/OpenTok/OpenTok.php

@@ -634,7 +634,7 @@ public function updateStream($sessionId, $streamId, $properties = array())
      * Gets an Stream object, providing information on a given stream.
      * 
      * @param String $sessionId The session ID for the OpenTok session containing the stream.
-     *
+     * 
      * @param String $streamId The stream ID.
      *
      * @return Stream The Stream object.
@@ -652,14 +652,14 @@ public function getStream($sessionId, $streamId)
     }
 
     /**
-     * Returns a StreamList object for the given session.
+     * Returns a StreamList Object for the given session ID.
      * 
      * @param String $sessionId The session ID.
      *
-     * @return StreamList A StreamList object. Call the
-     * <a href="StreamList.html#method_getItems">OpenTok->getItems()</a> method of
-     * the StreamList object to return an array of Stream objects.
+     * @return StreamList A StreamList object. Call the items() method of the StreamList object
+     * to return an array of Stream objects.     
      */
+
     public function listStreams($sessionId)
     {
         Validators::validateSessionIdBelongsToKey($sessionId, $this->apiKey);

src/OpenTok/Stream.php

@@ -20,12 +20,11 @@
 * @property String $videoType
 * The type of video in the stream, which is set to either "camera" or "screen".
 */
+
 class Stream {
 
-  /** @ignore */
     private $data;
 
-    /** @ignore */
     public function __construct($streamData)
     {
 

src/OpenTok/Util/Client.php

@@ -38,7 +38,7 @@
 
 // TODO: build this dynamically
 /** @internal */
-define('OPENTOK_SDK_VERSION', '4.1.2-alpha.1');
+define('OPENTOK_SDK_VERSION', '4.2.1-alpha.1');
 /** @internal */
 define('OPENTOK_SDK_USER_AGENT', 'OpenTok-PHP-SDK/' . OPENTOK_SDK_VERSION);
 
@@ -462,6 +462,7 @@ public function setStreamClassLists($sessionId, $payload)
         }
     }
 
+
     public function dial($sessionId, $token, $sipUri, $options)
     {
         $body = array(

tests/OpenTok/ArchiveTest.php

@@ -156,7 +156,7 @@ public function testStopsArchive()
         // TODO: test the dynamically built User Agent string
         $userAgent = $request->getHeaderLine('User-Agent');
         $this->assertNotEmpty($userAgent);
-        $this->assertStringStartsWith('OpenTok-PHP-SDK/4.1.2-alpha.1', $userAgent);
+        $this->assertStringStartsWith('OpenTok-PHP-SDK/4.2.1-alpha.1', $userAgent);
 
         // TODO: test the properties of the actual archive object
         $this->assertEquals('stopped', $this->archive->status);
@@ -195,7 +195,7 @@ public function testDeletesArchive()
         // TODO: test the dynamically built User Agent string
         $userAgent = $request->getHeaderLine('User-Agent');
         $this->assertNotEmpty($userAgent);
-        $this->assertStringStartsWith('OpenTok-PHP-SDK/4.1.2-alpha.1', $userAgent);
+        $this->assertStringStartsWith('OpenTok-PHP-SDK/4.2.1-alpha.1', $userAgent);
 
         $this->assertTrue($success);
         // TODO: assert that all properties of the archive object were cleared