Skip to content

Commit ebf9129

Browse files
aihamaiham
authored
Merge pull request #188 from opentok/dev
Release v2.5.1
2 parents 3557fac + bd7ce03 commit ebf9129

File tree

3 files changed

+35
-26
lines changed

3 files changed

+35
-26
lines changed

‎src/OpenTok/Util/Client.php‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
// TODO: build this dynamically
2525
/** @internal */
26-
define('OPENTOK_SDK_VERSION', '2.5.0');
26+
define('OPENTOK_SDK_VERSION', '2.5.1');
2727
/** @internal */
2828
define('OPENTOK_SDK_USER_AGENT', 'OpenTok-PHP-SDK/' . OPENTOK_SDK_VERSION);
2929

@@ -123,7 +123,10 @@ public function deleteArchive($archiveId)
123123
$request = $this->delete('/v2/project/'.$this->apiKey.'/archive/'.$archiveId);
124124
$request->setHeader('Content-Type', 'application/json');
125125
try {
126-
$request->send()->json();
126+
$response = $request->send();
127+
if ($response->getStatusCode() != 204) {
128+
$response->json();
129+
}
127130
} catch (\Exception $e) {
128131
$this->handleException($e);
129132
return false;
@@ -136,7 +139,10 @@ public function forceDisconnect($sessionId,$connectionId)
136139
$request = $this->delete('/v2/project/'.$this->apiKey.'/session/'.$sessionId.'/connection/'.$connectionId);
137140
$request->setHeader('Content-Type', 'application/json');
138141
try {
139-
$request->send()->json();
142+
$response = $request->send();
143+
if ($response->getStatusCode() != 204) {
144+
$response->json();
145+
}
140146
} catch (\Exception $e) {
141147
$this->handleException($e);
142148
return false;
@@ -229,7 +235,10 @@ public function updateStream($sessionId, $streamId, $properties)
229235
$request->setBody(json_encode($properties));
230236
$request->setHeader('Content-Type', 'application/json');
231237
try {
232-
$request->send()->json();
238+
$response = $request->send();
239+
if ($response->getStatusCode() != 204) {
240+
$response->json();
241+
}
233242
} catch (\Exception $e) {
234243
$this->handleException($e);
235244
}

‎tests/OpenTok/ArchiveTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function testStopsArchive()
112112
// TODO: test the dynamically built User Agent string
113113
$userAgent = $request->getHeader('User-Agent');
114114
$this->assertNotEmpty($userAgent);
115-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
115+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
116116

117117
// TODO: test the properties of the actual archive object
118118
$this->assertEquals('stopped', $this->archive->status);
@@ -154,7 +154,7 @@ public function testDeletesArchive()
154154
// TODO: test the dynamically built User Agent string
155155
$userAgent = $request->getHeader('User-Agent');
156156
$this->assertNotEmpty($userAgent);
157-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
157+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
158158

159159
$this->assertTrue($success);
160160
// TODO: assert that all properties of the archive object were cleared

‎tests/OpenTok/OpenTokTest.php‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function testCreatesDefaultSession()
9494
// TODO: test the dynamically built User Agent string
9595
$userAgent = $request->getHeader('User-Agent');
9696
$this->assertNotEmpty($userAgent);
97-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
97+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
9898

9999
$p2p_preference = $request->getPostField('p2p.preference');
100100
$this->assertEquals('enabled', $p2p_preference);
@@ -140,7 +140,7 @@ public function testCreatesMediaRoutedAndLocationSession()
140140
// TODO: test the dynamically built User Agent string
141141
$userAgent = $request->getHeader('User-Agent');
142142
$this->assertNotEmpty($userAgent);
143-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
143+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
144144

145145
$location = $request->getPostField('location');
146146
$this->assertEquals('12.34.56.78', $location);
@@ -188,7 +188,7 @@ public function testCreatesMediaRelayedSession()
188188
// TODO: test the dynamically built User Agent string
189189
$userAgent = $request->getHeader('User-Agent');
190190
$this->assertNotEmpty($userAgent);
191-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
191+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
192192

193193
$p2p_preference = $request->getPostField('p2p.preference');
194194
$this->assertEquals('enabled', $p2p_preference);
@@ -233,7 +233,7 @@ public function testCreatesAutoArchivedSession()
233233
// TODO: test the dynamically built User Agent string
234234
$userAgent = $request->getHeader('User-Agent');
235235
$this->assertNotEmpty($userAgent);
236-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
236+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
237237

238238
$archiveMode = $request->getPostField('archiveMode');
239239
$this->assertEquals('always', $archiveMode);
@@ -429,7 +429,7 @@ public function testStartsArchive()
429429
// TODO: test the dynamically built User Agent string
430430
$userAgent = $request->getHeader('User-Agent');
431431
$this->assertNotEmpty($userAgent);
432-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
432+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
433433

434434
$this->assertInstanceOf('OpenTok\Archive', $archive);
435435
$this->assertEquals(0, $archive->duration);
@@ -479,7 +479,7 @@ public function testStartsArchiveNamed()
479479
// TODO: test the dynamically built User Agent string
480480
$userAgent = $request->getHeader('User-Agent');
481481
$this->assertNotEmpty($userAgent);
482-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
482+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
483483

484484
$body = json_decode($request->getBody());
485485
$this->assertEquals($sessionId, $body->sessionId);
@@ -527,7 +527,7 @@ public function testStartsArchiveNamedDeprecated()
527527
// TODO: test the dynamically built User Agent string
528528
$userAgent = $request->getHeader('User-Agent');
529529
$this->assertNotEmpty($userAgent);
530-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
530+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
531531

532532
$body = json_decode($request->getBody());
533533
$this->assertEquals($sessionId, $body->sessionId);
@@ -574,7 +574,7 @@ public function testStartsArchiveAudioOnly()
574574
// TODO: test the dynamically built User Agent string
575575
$userAgent = $request->getHeader('User-Agent');
576576
$this->assertNotEmpty($userAgent);
577-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
577+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
578578

579579
$body = json_decode($request->getBody());
580580
$this->assertEquals($sessionId, $body->sessionId);
@@ -624,7 +624,7 @@ public function testStartsArchiveIndividualOutput()
624624
// TODO: test the dynamically built User Agent string
625625
$userAgent = $request->getHeader('User-Agent');
626626
$this->assertNotEmpty($userAgent);
627-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
627+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
628628

629629
$body = json_decode($request->getBody());
630630
$this->assertEquals($sessionId, $body->sessionId);
@@ -669,7 +669,7 @@ public function testStopsArchive()
669669
// TODO: test the dynamically built User Agent string
670670
$userAgent = $request->getHeader('User-Agent');
671671
$this->assertNotEmpty($userAgent);
672-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
672+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
673673

674674
$this->assertInstanceOf('OpenTok\Archive', $archive);
675675
// TODO: test the properties of the actual archive object
@@ -708,7 +708,7 @@ public function testGetsArchive()
708708
// TODO: test the dynamically built User Agent string
709709
$userAgent = $request->getHeader('User-Agent');
710710
$this->assertNotEmpty($userAgent);
711-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
711+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
712712

713713
$this->assertInstanceOf('OpenTok\Archive', $archive);
714714
// TODO: test the properties of the actual archive object
@@ -749,7 +749,7 @@ public function testDeletesArchive()
749749
// TODO: test the dynamically built User Agent string
750750
$userAgent = $request->getHeader('User-Agent');
751751
$this->assertNotEmpty($userAgent);
752-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
752+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
753753

754754
$this->assertTrue($success);
755755
// TODO: test the properties of the actual archive object
@@ -784,7 +784,7 @@ public function testListsArchives()
784784
// TODO: test the dynamically built User Agent string
785785
$userAgent = $request->getHeader('User-Agent');
786786
$this->assertNotEmpty($userAgent);
787-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
787+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
788788

789789
$this->assertInstanceOf('OpenTok\ArchiveList', $archiveList);
790790
// TODO: test the properties of the actual archiveList object and its contained archive
@@ -872,7 +872,7 @@ public function testForceDisconnect()
872872
// TODO: test the dynamically built User Agent string
873873
$userAgent = $request->getHeader('User-Agent');
874874
$this->assertNotEmpty($userAgent);
875-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
875+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
876876

877877
$this->assertTrue($success);
878878
}
@@ -914,7 +914,7 @@ public function testStartsBroadcast()
914914
// TODO: test the dynamically built User Agent string
915915
$userAgent = $request->getHeader('User-Agent');
916916
$this->assertNotEmpty($userAgent);
917-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
917+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
918918

919919
$this->assertInstanceOf('OpenTok\Broadcast', $broadcast);
920920
$this->assertInternalType('string', $broadcast->id);
@@ -959,7 +959,7 @@ public function testStopsBroadcast()
959959
// TODO: test the dynamically built User Agent string
960960
$userAgent = $request->getHeader('User-Agent');
961961
$this->assertNotEmpty($userAgent);
962-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
962+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
963963

964964
$this->assertInstanceOf('OpenTok\Broadcast', $broadcast);
965965
$this->assertTrue($broadcast->isStopped);
@@ -996,7 +996,7 @@ public function testGetsBroadcast()
996996
// TODO: test the dynamically built User Agent string
997997
$userAgent = $request->getHeader('User-Agent');
998998
$this->assertNotEmpty($userAgent);
999-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
999+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
10001000

10011001
$this->assertInstanceOf('OpenTok\Broadcast', $broadcast);
10021002
}
@@ -1040,7 +1040,7 @@ public function testUpdatesBroadcastLayoutWithPredefined()
10401040
// TODO: test the dynamically built User Agent string
10411041
$userAgent = $request->getHeader('User-Agent');
10421042
$this->assertNotEmpty($userAgent);
1043-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
1043+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
10441044
}
10451045

10461046
public function testUpdatesBroadcastLayoutWithCustom()
@@ -1086,7 +1086,7 @@ public function testUpdatesBroadcastLayoutWithCustom()
10861086
// TODO: test the dynamically built User Agent string
10871087
$userAgent = $request->getHeader('User-Agent');
10881088
$this->assertNotEmpty($userAgent);
1089-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
1089+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
10901090
}
10911091

10921092
public function testUpdatesStreamLayoutClassList()
@@ -1131,7 +1131,7 @@ public function testUpdatesStreamLayoutClassList()
11311131
// TODO: test the dynamically built User Agent string
11321132
$userAgent = $request->getHeader('User-Agent');
11331133
$this->assertNotEmpty($userAgent);
1134-
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.0', $userAgent->__toString());
1134+
$this->assertStringStartsWith('OpenTok-PHP-SDK/2.5.1', $userAgent->__toString());
11351135
}
11361136

11371137

0 commit comments

Comments
 (0)