Skip to content

Commit 65b376d

Browse files
dragonmantankdragonmantank
authored
Merge pull request #275 from opentok/4.6.0-release
Updated version to 4.6.0 for release
2 parents f1d0c23 + 4a4debc commit 65b376d

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Add this package (`opentok/opentok`) to your `composer.json` file, or just run t
2222
command line:
2323

2424
```
25-
$ ./composer.phar require opentok/opentok 4.4.x
25+
$ ./composer.phar require opentok/opentok ^4.0
2626
```
2727

2828
## Usage

‎src/OpenTok/Util/Client.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
// TODO: build this dynamically
3535
/** @internal */
36-
define('OPENTOK_SDK_VERSION', '4.5.0');
36+
define('OPENTOK_SDK_VERSION', '4.6.0');
3737
/** @internal */
3838
define('OPENTOK_SDK_USER_AGENT', 'OpenTok-PHP-SDK/' . OPENTOK_SDK_VERSION);
3939

‎tests/OpenTokTest/ArchiveTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function testStopsArchive()
156156
// TODO: test the dynamically built User Agent string
157157
$userAgent = $request->getHeaderLine('User-Agent');
158158
$this->assertNotEmpty($userAgent);
159-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
159+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
160160

161161
// TODO: test the properties of the actual archive object
162162
$this->assertEquals('stopped', $this->archive->status);
@@ -195,7 +195,7 @@ public function testDeletesArchive()
195195
// TODO: test the dynamically built User Agent string
196196
$userAgent = $request->getHeaderLine('User-Agent');
197197
$this->assertNotEmpty($userAgent);
198-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
198+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
199199

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

‎tests/OpenTokTest/OpenTokTest.php‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function testCreatesDefaultSession()
127127
// TODO: test the dynamically built User Agent string
128128
$userAgent = $request->getHeaderLine('User-Agent');
129129
$this->assertNotEmpty($userAgent);
130-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
130+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
131131

132132
$p2p_preference = $this->getPostField($request, 'p2p.preference');
133133
$this->assertEquals('enabled', $p2p_preference);
@@ -187,7 +187,7 @@ public function testCreatesMediaRoutedAndLocationSession()
187187
// TODO: test the dynamically built User Agent string
188188
$userAgent = $request->getHeaderLine('User-Agent');
189189
$this->assertNotEmpty($userAgent);
190-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
190+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
191191

192192
$location = $this->getPostField($request, 'location');
193193
$this->assertEquals('12.34.56.78', $location);
@@ -235,7 +235,7 @@ public function testCreatesMediaRelayedSession()
235235
// TODO: test the dynamically built User Agent string
236236
$userAgent = $request->getHeaderLine('User-Agent');
237237
$this->assertNotEmpty($userAgent);
238-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
238+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
239239

240240
$p2p_preference = $this->getPostField($request, 'p2p.preference');
241241
$this->assertEquals('enabled', $p2p_preference);
@@ -280,7 +280,7 @@ public function testCreatesAutoArchivedSession()
280280
// TODO: test the dynamically built User Agent string
281281
$userAgent = $request->getHeaderLine('User-Agent');
282282
$this->assertNotEmpty($userAgent);
283-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
283+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
284284

285285
$archiveMode = $this->getPostField($request, 'archiveMode');
286286
$this->assertEquals('always', $archiveMode);
@@ -518,7 +518,7 @@ public function testStartsArchive()
518518
// TODO: test the dynamically built User Agent string
519519
$userAgent = $request->getHeaderLine('User-Agent');
520520
$this->assertNotEmpty($userAgent);
521-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
521+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
522522

523523
$this->assertInstanceOf('OpenTok\Archive', $archive);
524524
$this->assertEquals(0, $archive->duration);
@@ -568,7 +568,7 @@ public function testStartsArchiveNamed()
568568
// TODO: test the dynamically built User Agent string
569569
$userAgent = $request->getHeaderLine('User-Agent');
570570
$this->assertNotEmpty($userAgent);
571-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
571+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
572572

573573
$body = json_decode($request->getBody());
574574
$this->assertEquals($sessionId, $body->sessionId);
@@ -616,7 +616,7 @@ public function testStartsArchiveNamedDeprecated()
616616
// TODO: test the dynamically built User Agent string
617617
$userAgent = $request->getHeaderLine('User-Agent');
618618
$this->assertNotEmpty($userAgent);
619-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
619+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
620620

621621
$body = json_decode($request->getBody());
622622
$this->assertEquals($sessionId, $body->sessionId);
@@ -663,7 +663,7 @@ public function testStartsArchiveAudioOnly()
663663
// TODO: test the dynamically built User Agent string
664664
$userAgent = $request->getHeaderLine('User-Agent');
665665
$this->assertNotEmpty($userAgent);
666-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
666+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
667667

668668
$body = json_decode($request->getBody());
669669
$this->assertEquals($sessionId, $body->sessionId);
@@ -713,7 +713,7 @@ public function testStartsArchiveIndividualOutput()
713713
// TODO: test the dynamically built User Agent string
714714
$userAgent = $request->getHeaderLine('User-Agent');
715715
$this->assertNotEmpty($userAgent);
716-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
716+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
717717

718718
$body = json_decode($request->getBody());
719719
$this->assertEquals($sessionId, $body->sessionId);
@@ -762,7 +762,7 @@ public function testStartsArchiveResolutionSD()
762762
// TODO: test the dynamically built User Agent string
763763
$userAgent = $request->getHeaderLine('User-Agent');
764764
$this->assertNotEmpty($userAgent);
765-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
765+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
766766

767767
$body = json_decode($request->getBody());
768768
$this->assertEquals($sessionId, $body->sessionId);
@@ -810,7 +810,7 @@ public function testStartsArchiveResolutionHD()
810810
// TODO: test the dynamically built User Agent string
811811
$userAgent = $request->getHeaderLine('User-Agent');
812812
$this->assertNotEmpty($userAgent);
813-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
813+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
814814

815815
$body = json_decode($request->getBody());
816816
$this->assertEquals($sessionId, $body->sessionId);
@@ -854,7 +854,7 @@ public function testStopsArchive()
854854
// TODO: test the dynamically built User Agent string
855855
$userAgent = $request->getHeaderLine('User-Agent');
856856
$this->assertNotEmpty($userAgent);
857-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
857+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
858858

859859
$this->assertInstanceOf('OpenTok\Archive', $archive);
860860
// TODO: test the properties of the actual archive object
@@ -893,7 +893,7 @@ public function testGetsArchive()
893893
// TODO: test the dynamically built User Agent string
894894
$userAgent = $request->getHeaderLine('User-Agent');
895895
$this->assertNotEmpty($userAgent);
896-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
896+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
897897

898898
$this->assertInstanceOf('OpenTok\Archive', $archive);
899899
// TODO: test the properties of the actual archive object
@@ -930,7 +930,7 @@ public function testDeletesArchive()
930930
// TODO: test the dynamically built User Agent string
931931
$userAgent = $request->getHeaderLine('User-Agent');
932932
$this->assertNotEmpty($userAgent);
933-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
933+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
934934

935935
$this->assertTrue($success);
936936
// TODO: test the properties of the actual archive object
@@ -965,7 +965,7 @@ public function testListsArchives()
965965
// TODO: test the dynamically built User Agent string
966966
$userAgent = $request->getHeaderLine('User-Agent');
967967
$this->assertNotEmpty($userAgent);
968-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
968+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
969969

970970
$this->assertInstanceOf('OpenTok\ArchiveList', $archiveList);
971971
// TODO: test the properties of the actual archiveList object and its contained archive
@@ -1001,7 +1001,7 @@ public function testListsArchivesWithOffsetAndCount()
10011001
// TODO: test the dynamically built User Agent string
10021002
$userAgent = $request->getHeaderLine('User-Agent');
10031003
$this->assertNotEmpty($userAgent);
1004-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1004+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
10051005

10061006
$this->assertInstanceOf('OpenTok\ArchiveList', $archiveList);
10071007
$this->assertEquals(1, $archiveList->totalCount());
@@ -1042,7 +1042,7 @@ public function testListsArchivesWithSessionId()
10421042
// TODO: test the dynamically built User Agent string
10431043
$userAgent = $request->getHeaderLine('User-Agent');
10441044
$this->assertNotEmpty($userAgent);
1045-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1045+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
10461046

10471047
$this->assertInstanceOf('OpenTok\ArchiveList', $archiveList);
10481048
$this->assertEquals(2, $archiveList->totalCount());
@@ -1126,7 +1126,7 @@ public function testForceDisconnect()
11261126
// TODO: test the dynamically built User Agent string
11271127
$userAgent = $request->getHeaderLine('User-Agent');
11281128
$this->assertNotEmpty($userAgent);
1129-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1129+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
11301130

11311131
$this->assertTrue($success);
11321132
}
@@ -1187,7 +1187,7 @@ public function testStartsBroadcast()
11871187
// TODO: test the dynamically built User Agent string
11881188
$userAgent = $request->getHeaderLine('User-Agent');
11891189
$this->assertNotEmpty($userAgent);
1190-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1190+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
11911191

11921192
$this->assertInstanceOf('OpenTok\Broadcast', $broadcast);
11931193
$this->assertInternalType('string', $broadcast->id);
@@ -1243,7 +1243,7 @@ public function testStartBroadcastWithOptions()
12431243
// TODO: test the dynamically built User Agent string
12441244
$userAgent = $request->getHeaderLine('User-Agent');
12451245
$this->assertNotEmpty($userAgent);
1246-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1246+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
12471247

12481248
$this->assertInstanceOf('OpenTok\Broadcast', $broadcast);
12491249
$this->assertInternalType('string', $broadcast->id);
@@ -1290,7 +1290,7 @@ public function testStopsBroadcast()
12901290
// TODO: test the dynamically built User Agent string
12911291
$userAgent = $request->getHeaderLine('User-Agent');
12921292
$this->assertNotEmpty($userAgent);
1293-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1293+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
12941294

12951295
$this->assertInstanceOf('OpenTok\Broadcast', $broadcast);
12961296
$this->assertTrue($broadcast->isStopped);
@@ -1327,7 +1327,7 @@ public function testGetsBroadcast()
13271327
// TODO: test the dynamically built User Agent string
13281328
$userAgent = $request->getHeaderLine('User-Agent');
13291329
$this->assertNotEmpty($userAgent);
1330-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1330+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
13311331

13321332
$this->assertInstanceOf('OpenTok\Broadcast', $broadcast);
13331333
}
@@ -1371,7 +1371,7 @@ public function testUpdatesBroadcastLayoutWithPredefined()
13711371
// TODO: test the dynamically built User Agent string
13721372
$userAgent = $request->getHeaderLine('User-Agent');
13731373
$this->assertNotEmpty($userAgent);
1374-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1374+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
13751375
}
13761376

13771377
public function testUpdatesBroadcastLayoutWithCustom()
@@ -1417,7 +1417,7 @@ public function testUpdatesBroadcastLayoutWithCustom()
14171417
// TODO: test the dynamically built User Agent string
14181418
$userAgent = $request->getHeaderLine('User-Agent');
14191419
$this->assertNotEmpty($userAgent);
1420-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1420+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
14211421
}
14221422

14231423
public function testUpdatesStreamLayoutClassList()
@@ -1462,7 +1462,7 @@ public function testUpdatesStreamLayoutClassList()
14621462
// TODO: test the dynamically built User Agent string
14631463
$userAgent = $request->getHeaderLine('User-Agent');
14641464
$this->assertNotEmpty($userAgent);
1465-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1465+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
14661466
}
14671467

14681468
public function testGetStream()
@@ -1501,7 +1501,7 @@ public function testGetStream()
15011501

15021502
$userAgent = $request->getHeaderLine('User-Agent');
15031503
$this->assertNotEmpty($userAgent);
1504-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1504+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
15051505
}
15061506

15071507
public function testSipCall()
@@ -1666,7 +1666,7 @@ public function testSignalData()
16661666
// TODO: test the dynamically built User Agent string
16671667
$userAgent = $request->getHeaderLine('User-Agent');
16681668
$this->assertNotEmpty($userAgent);
1669-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1669+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
16701670

16711671
$body = json_decode($request->getBody());
16721672
$this->assertEquals('apple', $body->data);
@@ -1708,7 +1708,7 @@ public function testSignalWithConnectionId()
17081708
// TODO: test the dynamically built User Agent string
17091709
$userAgent = $request->getHeaderLine('User-Agent');
17101710
$this->assertNotEmpty($userAgent);
1711-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1711+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
17121712

17131713
$body = json_decode($request->getBody());
17141714
$this->assertEquals('random message', $body->data);
@@ -1819,7 +1819,7 @@ public function testListStreams()
18191819
// TODO: test the dynamically built User Agent string
18201820
$userAgent = $request->getHeaderLine('User-Agent');
18211821
$this->assertNotEmpty($userAgent);
1822-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1822+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
18231823

18241824
$this->assertInstanceOf('OpenTok\StreamList', $streamList);
18251825

@@ -1863,7 +1863,7 @@ public function testsSetArchiveLayoutWithPredefined()
18631863
// TODO: test the dynamically built User Agent string
18641864
$userAgent = $request->getHeaderLine('User-Agent');
18651865
$this->assertNotEmpty($userAgent);
1866-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1866+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
18671867
}
18681868

18691869
public function testsSetArchiveLayoutWithCustom()
@@ -1909,7 +1909,7 @@ public function testsSetArchiveLayoutWithCustom()
19091909
// TODO: test the dynamically built User Agent string
19101910
$userAgent = $request->getHeaderLine('User-Agent');
19111911
$this->assertNotEmpty($userAgent);
1912-
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.5.0', $userAgent);
1912+
$this->assertStringStartsWith('OpenTok-PHP-SDK/4.6.0', $userAgent);
19131913
}
19141914

19151915
/**

0 commit comments

Comments
 (0)