Merge branch 'master' into Taracque-master

Author: aiham

.travis.yml

@@ -1,10 +1,14 @@
+dist: trusty
+sudo: required
 language: php
-php:
-- '5.6'
-- '5.5'
-- '5.4'
-- '5.3'
-- 'hhvm'
+matrix:
+  include:
+  - php: 5.3
+    dist: precise
+  - php: 5.4
+  - php: 5.5
+  - php: 5.6
+  - php: hhvm
 before_script:
 - travis_retry composer install
 script:

README.md

@@ -16,7 +16,7 @@ Add this package (`opentok/opentok`) to your `composer.json` file, or just run t
 command line:
 
 ```
-$ ./composer.phar require opentok/opentok 2.4.x
+$ ./composer.phar require opentok/opentok 2.5.x
 ```
 
 ## Manually:

composer.json

@@ -31,11 +31,11 @@
         "php": ">=5.0.0",
         "guzzle/guzzle": "~3.7",
         "aoberoi/json-works": "~1.0",
-        "firebase/php-jwt": "^3.0"
+        "firebase/php-jwt": "^4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.1",
-        "phing/phing": "dev-master"
+        "phing/phing": "~2.15.2"
     },
     "autoload": {
         "psr-4": {

sample/Archiving/web/js/host.js

@@ -1,17 +1,27 @@
-var session = OT.initSession(sessionId),
+var session = OT.initSession(apiKey, sessionId),
     publisher = OT.initPublisher('publisher'),
     archiveID = null;
 
-session.connect(apiKey, token, function(error) {
-  if(error) {
-    console.error(error.message);
-    return;
+session.connect(token, function(error) {
+  if (error) {
+    console.error('Failed to connect', error);
+  } else {
+    session.publish(publisher, function(error) {
+      if (error) {
+        console.error('Failed to publish', error);
+      }
+    });
   }
-  session.publish(publisher);
 });
 
 session.on('streamCreated', function(event) {
-  session.subscribe(event.stream, 'subscribers', { insertMode: 'append' });
+  session.subscribe(event.stream, 'subscribers', {
+    insertMode: 'append'
+  }, function(error) {
+    if (error) {
+      console.error('Failed to subscribe', error);
+    }
+  });
 });
 
 session.on('archiveStarted', function(event) {
@@ -31,7 +41,7 @@ session.on('archiveStopped', function(event) {
 });
 
 $(document).ready(function() {
-  $('.start').click(function (event) {
+  $('.start').click(function(event) {
     var options = $('.archive-options').serialize();
     disableForm();
     $.post('/start', options).fail(enableForm);

sample/Archiving/web/js/participant.js

@@ -1,14 +1,24 @@
-var session = OT.initSession(sessionId),
+var session = OT.initSession(apiKey, sessionId),
     publisher = OT.initPublisher('publisher');
 
-session.connect(apiKey, token, function(error) {
-  if(error) {
-    console.error(error.message);
-    return;
+session.connect(token, function(error) {
+  if (error) {
+    console.error('Failed to connect', error);
+  } else {
+    session.publish(publisher, function(error) {
+      if (error) {
+        console.error('Failed to publish', error);
+      }
+    });
   }
-  session.publish(publisher);
 });
 
 session.on('streamCreated', function(event) {
-  session.subscribe(event.stream, 'subscribers', { insertMode : 'append' });
+  session.subscribe(event.stream, 'subscribers', {
+    insertMode : 'append'
+  }, function(error) {
+    if (error) {
+      console.error('Failed to subscribe', error);
+    }
+  });
 });

sample/HelloWorld/web/js/helloworld.js

@@ -1,22 +1,32 @@
 // Initialize an OpenTok Session object.
-var session = OT.initSession(sessionId);
+var session = OT.initSession(apiKey, sessionId);
 
 // Initialize a Publisher, and place it into the 'publisher' DOM element.
-var publisher = OT.initPublisher(apiKey, 'publisher');
+var publisher = OT.initPublisher('publisher');
 
 session.on('streamCreated', function(event) {
   // Called when another client publishes a stream.
   // Subscribe to the stream that caused this event.
-  session.subscribe(event.stream, 'subscribers', { insertMode: 'append' });
+  session.subscribe(event.stream, 'subscribers', {
+    insertMode: 'append'
+  }, function(error) {
+    if (error) {
+      console.error('Failed to subscribe', error);
+    }
+  });
 });
 
 // Connect to the session using your OpenTok API key and the client's token for the session
-session.connect(apiKey, token, function(error) {
+session.connect(token, function(error) {
   if (error) {
-    console.error(error);
+    console.error('Failed to connect', error);
   } else {
     // Publish a stream, using the Publisher we initialzed earlier.
     // This triggers a streamCreated event on other clients.
-    session.publish(publisher);
+    session.publish(publisher, function(error) {
+      if (error) {
+        console.error('Failed to publish', error);
+      }
+    });
   }
 });

sample/SipCall/templates/index.php

@@ -6,7 +6,7 @@
     <link rel='stylesheet' href='/stylesheets/style.css' />
     <link rel='stylesheet' href='/stylesheets/pattern.css' />
     <script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
-    <script src="https://static.opentok.com/v2/js/opentok.js"></script>
+    <script src="https://static.opentok.com/v2/js/opentok.min.js"></script>
     <script>
       var sessionId = "<?php echo $sessionId ?>";
       var token = "<?php echo $token ?>";

sample/SipCall/web/js/index.js

@@ -1,31 +1,44 @@
-var session = OT.initSession(sessionId);
-session.on("streamCreated", function (event) {
+var session = OT.initSession(apiKey, sessionId);
+session.on('streamCreated', function(event) {
   var tokenData = event.stream.connection.data;
-  if (tokenData && tokenData.includes("sip=true")) {
-    var element = "sipPublisherContainer";
+  if (tokenData && tokenData.includes('sip=true')) {
+    var element = 'sipPublisherContainer';
   } else {
-    var element = "webrtcPublisherContainer";
+    var element = 'webrtcPublisherContainer';
   }
-  session.subscribe(event.stream, element, { insertMode: "append" });
+  session.subscribe(event.stream, element, {
+    insertMode: 'append'
+  }, function(error) {
+    if (error) {
+      console.error('Failed to subscribe', error);
+    }
+  });
 })
-.connect(apiKey, token, function (err) {
-  if (err) return;
-  session.publish("selfPublisherContainer", {
-    insertMode: "append",
-    height: "120px",
-    width: "160px"
+.connect(token, function(error) {
+  if (error) {
+    console.error('Failed to connect', error);
+    return;
+  }
+  session.publish('selfPublisherContainer', {
+    insertMode: 'append',
+    height: '120px',
+    width: '160px'
+  }, function(error) {
+    if (error) {
+      console.error('Failed to publish', error);
+    }
   });
 });
-$('#startSip').click(function (event) {
+$('#startSip').click(function(event) {
   $.post('/sip/start', {sessionId: sessionId, apiKey: apiKey})
-  .fail(function () {
+  .fail(function() {
     console.log('Failed to start SIP call - sample app server returned error.');
   });
 });
-$('#stopSip').click(function (event) {
-  OT.subscribers.where().forEach(function (subscriber) {
+$('#stopSip').click(function(event) {
+  OT.subscribers.where().forEach(function(subscriber) {
     var connection = subscriber.stream.connection;
-    if (connection.data && connection.data.includes("sip=true")) {
+    if (connection.data && connection.data.includes('sip=true')) {
       session.forceDisconnect(connection.connectionId);
     }
   });

src/OpenTok/Exception/AuthenticationException.php

@@ -6,7 +6,7 @@
 /**
  * Defines the exception thrown when you use an invalid API or secret.
  */
-class AuthenticationException extends OpenTok\Exception\DomainException implements \OpenTok\Exception\Exception
+class AuthenticationException extends \OpenTok\Exception\DomainException implements \OpenTok\Exception\Exception
 {
     public function __construct($apiKey, $apiSecret, $code = 0, $previous)
     {

src/OpenTok/Util/Client.php

@@ -22,7 +22,7 @@
 
 // TODO: build this dynamically
 /** @internal */
-define('OPENTOK_SDK_VERSION', '2.4.1-alpha.1');
+define('OPENTOK_SDK_VERSION', '2.5.0');
 /** @internal */
 define('OPENTOK_SDK_USER_AGENT', 'OpenTok-PHP-SDK/' . OPENTOK_SDK_VERSION);
 
@@ -129,7 +129,7 @@ public function deleteArchive($archiveId)
         }
         return true;
     }
-    
+
     public function forceDisconnect($sessionId,$connectionId)
     {
         $request = $this->delete('/v2/project/'.$this->apiKey.'/session/'.$sessionId.'/connection/'.$connectionId);