Merge pull request #201 from aiham/use-guzzle-6

Upgrade to Guzzle 6

Author: aiham

composer.json

@@ -29,9 +29,9 @@
     },
     "require": {
         "php": ">=5.6.0",
-        "guzzle/guzzle": "~3.7",
         "johnstevenson/json-works": "~1.1",
-        "firebase/php-jwt": "^5.0"
+        "firebase/php-jwt": "^5.0",
+        "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.7",

sample/Archiving/README.md

@@ -98,7 +98,7 @@ is sent to the <http://localhost:8080/stop/:archiveId> URL where `:archiveId` re
 client receives in the 'archiveStarted' event. The route handler for this request is shown below:
 
 ```php
-$app->get('/stop/:archiveId', function($archiveId) use ($app) {
+$app->get('/stop/:archiveId', function ($archiveId) use ($app) {
     $archive = $app->opentok->stopArchive($archiveId);
     $app->response->headers->set('Content-Type', 'application/json');
     echo $archive->toJson();
@@ -168,7 +168,7 @@ $app->get('/history', function () use ($app) {
 
     $archives = $app->opentok->listArchives($offset, 5);
 
-    $toArray = function($archive) {
+    $toArray = function ($archive) {
       return $archive->toArray();
     };
 
@@ -214,7 +214,7 @@ from the URL. Lastly, we send a redirect response back to the browser so the dow
 The code for the delete route handler is shown below:
 
 ```php
-$app->get('/delete/:archiveId', function($archiveId) use ($app) {
+$app->get('/delete/:archiveId', function ($archiveId) use ($app) {
     $app->opentok->deleteArchive($archiveId);
     $app->redirect('/history');
 });

sample/Archiving/web/index.php

@@ -33,7 +33,7 @@
 ));
 
 // Intialize a cache, store it in the app container
-$app->container->singleton('cache', function() {
+$app->container->singleton('cache', function () {
     return new Cache;
 });
 
@@ -45,7 +45,7 @@
 $app->apiKey = getenv('API_KEY');
 
 // If a sessionId has already been created, retrieve it from the cache
-$sessionId = $app->cache->getOrCreate('sessionId', array(), function() use ($app) {
+$sessionId = $app->cache->getOrCreate('sessionId', array(), function () use ($app) {
     // If the sessionId hasn't been created, create it now and store it
     $session = $app->opentok->createSession(array(
       'mediaMode' => MediaMode::ROUTED
@@ -94,7 +94,7 @@
 
     $archives = $app->opentok->listArchives($offset, 5);
 
-    $toArray = function($archive) {
+    $toArray = function ($archive) {
       return $archive->toArray();
     };
 
@@ -123,13 +123,13 @@
     echo $archive->toJson();
 });
 
-$app->get('/stop/:archiveId', function($archiveId) use ($app) {
+$app->get('/stop/:archiveId', function ($archiveId) use ($app) {
     $archive = $app->opentok->stopArchive($archiveId);
     $app->response->headers->set('Content-Type', 'application/json');
     echo $archive->toJson();
 });
 
-$app->get('/delete/:archiveId', function($archiveId) use ($app) {
+$app->get('/delete/:archiveId', function ($archiveId) use ($app) {
     $app->opentok->deleteArchive($archiveId);
     $app->redirect('/history');
 });

sample/HelloWorld/README.md

@@ -80,7 +80,7 @@ stored in the cache for later use.
 
 ```php
 // If a sessionId has already been created, retrieve it from the cache
-$sessionId = $app->cache->getOrCreate('sessionId', array(), function() use ($app) {
+$sessionId = $app->cache->getOrCreate('sessionId', array(), function () use ($app) {
     // If the sessionId hasn't been created, create it now and store it
     $session = $app->opentok->createSession();
     return $session->getSessionId();

sample/HelloWorld/web/index.php

@@ -29,7 +29,7 @@
 ));
 
 // Intialize a cache, store it in the app container
-$app->container->singleton('cache', function() {
+$app->container->singleton('cache', function () {
     return new Cache;
 });
 
@@ -44,7 +44,7 @@
 $app->get('/', function () use ($app) {
 
     // If a sessionId has already been created, retrieve it from the cache
-    $sessionId = $app->cache->getOrCreate('sessionId', array(), function() use ($app) {
+    $sessionId = $app->cache->getOrCreate('sessionId', array(), function () use ($app) {
         // If the sessionId hasn't been created, create it now and store it
         $session = $app->opentok->createSession();
         return $session->getSessionId();

sample/SipCall/web/index.php

@@ -34,7 +34,7 @@
 ));
 
 // Intialize a cache, store it in the app container
-$app->container->singleton('cache', function() {
+$app->container->singleton('cache', function () {
     return new Cache;
 });
 
@@ -56,7 +56,7 @@
 // Configure routes
 $app->get('/', function () use ($app) {
     // If a sessionId has already been created, retrieve it from the cache
-    $sessionId = $app->cache->getOrCreate('sessionId', array(), function() use ($app) {
+    $sessionId = $app->cache->getOrCreate('sessionId', array(), function () use ($app) {
         // If the sessionId hasn't been created, create it now and store it
         $session = $app->opentok->createSession(array('mediaMode' => MediaMode::ROUTED));
         return $session->getSessionId();

src/OpenTok/Broadcast.php

@@ -15,7 +15,8 @@ class Broadcast {
     private $isStopped = false;
     private $client;
 
-    public function __construct($broadcastData, $options = array()) {
+    public function __construct($broadcastData, $options = array())
+    {
         // unpack optional arguments (merging with default values) into named variables
         $defaults = array(
             'apiKey' => null,

src/OpenTok/Layout.php

@@ -79,7 +79,8 @@ private function __construct($type, $stylesheet = null)
         $this->stylesheet = $stylesheet;
     }
 
-    public function jsonSerialize() {
+    public function jsonSerialize()
+    {
         $data = array(
             'type' => $this->type
         );

src/OpenTok/OpenTok.php

@@ -50,7 +50,9 @@ public function __construct($apiKey, $apiSecret, $options = array())
         Validators::validateClient($client);
 
         $this->client = isset($client) ? $client : new Client();
-        $this->client->configure($apiKey, $apiSecret, $apiUrl);
+        if (!$this->client->isConfigured()) {
+            $this->client->configure($apiKey, $apiSecret, $apiUrl);
+        }
         $this->apiKey = $apiKey;
         $this->apiSecret = $apiSecret;
     }
@@ -282,7 +284,7 @@ public function startArchive($sessionId, $options=array())
     {
         // support for deprecated method signature, remove in v3.0.0 (not before)
         if (!is_array($options)) {
-          $options = array('name' => $options);
+            $options = array('name' => $options);
         }
 
         // unpack optional arguments (merging with default values) into named variables

src/OpenTok/Util/BasicEnum.php

@@ -8,7 +8,8 @@
 abstract class BasicEnum {
     private static $constCacheArray = null;
 
-    private static function getConstants() {
+    private static function getConstants()
+    {
         if (self::$constCacheArray === null) self::$constCacheArray = array();
 
         $calledClass = get_called_class();
@@ -20,7 +21,8 @@ private static function getConstants() {
         return self::$constCacheArray[$calledClass];
     }
 
-    public static function isValidName($name, $strict = false) {
+    public static function isValidName($name, $strict = false)
+    {
         $constants = self::getConstants();
 
         if ($strict) {
@@ -31,7 +33,8 @@ public static function isValidName($name, $strict = false) {
         return in_array(strtolower($name), $keys);
     }
 
-    public static function isValidValue($value) {
+    public static function isValidValue($value)
+    {
         $values = array_values(self::getConstants());
         return in_array($value, $values, $strict = true);
     }