Skip to content

Commit fb2924a

Browse files
authored
Merge pull request #189 from aiham/fix/full-php7-support
Full PHP 7 support
2 parents 0623186 + 57c6885 commit fb2924a

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

.travis.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
dist: trusty
22
sudo: required
33
language: php
4-
matrix:
5-
include:
6-
- php: 5.3
7-
dist: precise
8-
- php: 5.4
9-
- php: 5.5
10-
- php: 5.6
11-
- php: hhvm
4+
php:
5+
- 5.6
6+
- 7.0
7+
- 7.1
8+
- hhvm
129
before_script:
1310
- travis_retry composer install
1411
script:

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,9 @@ Reference documentation is available at
211211
You need an OpenTok API key and API secret, which you can obtain by logging into your
212212
[TokBox account](https://tokbox.com/account).
213213

214-
The OpenTok PHP SDK requires PHP 5.3 or greater.
214+
The OpenTok PHP SDK requires PHP 5.6+ or PHP 7+
215+
216+
For PHP 5.5 and lower please use PHP SDK v2.5
215217

216218
# Release Notes
217219

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
"issues": "https://github.com/opentok/Opentok-PHP-SDK/issues"
2929
},
3030
"require": {
31-
"php": ">=5.0.0",
31+
"php": ">=5.6.0",
3232
"guzzle/guzzle": "~3.7",
33-
"aoberoi/json-works": "~1.0",
34-
"firebase/php-jwt": "^4.0"
33+
"johnstevenson/json-works": "~1.1",
34+
"firebase/php-jwt": "^5.0"
3535
},
3636
"require-dev": {
37-
"phpunit/phpunit": "~4.1",
38-
"phing/phing": "~2.15.2"
37+
"phpunit/phpunit": "~5.7",
38+
"phing/phing": "~2.16.0"
3939
},
4040
"autoload": {
4141
"psr-4": {

tests/OpenTok/OpenTokTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ public function testCanBeInitialized()
5454
$this->assertInstanceOf('OpenTok\OpenTok', $this->opentok);
5555
}
5656

57-
/**
58-
* @expectedException PHPUnit_Framework_Error_Warning
59-
*/
6057
public function testFailsOnInvalidInitialization()
6158
{
59+
if (class_exists('ArgumentCountError')) {
60+
$this->expectException(ArgumentCountError::class);
61+
} else {
62+
$this->expectException(PHPUnit_Framework_Error_Warning::class);
63+
}
6264
// Arrange
6365
$opentok = new OpenTok();
6466
// Act

0 commit comments

Comments
 (0)