diff options
| author | Brent Shaffer <betterbrent@google.com> | 2017-06-21 11:26:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 11:26:30 -0700 |
| commit | 0f8f85aa4396de6a18791a561e2a626fb782399a (patch) | |
| tree | fbf2061d3b7a20bde5bcdbd4582eb8344cea350a | |
| parent | 2261c1cf90148c10ef265dddbbf2e9b2662feb1d (diff) | |
| download | php-jwt-0f8f85aa4396de6a18791a561e2a626fb782399a.zip php-jwt-0f8f85aa4396de6a18791a561e2a626fb782399a.tar.gz php-jwt-0f8f85aa4396de6a18791a561e2a626fb782399a.tar.bz2 | |
Fixes travis, adds PHP 7.1, and removes HHVM (#160)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | composer.lock | 19 |
4 files changed, 8 insertions, 26 deletions
@@ -2,3 +2,4 @@ vendor phpunit.phar phpunit.phar.asc composer.phar +composer.lock diff --git a/.travis.yml b/.travis.yml index 96a0f19..89131cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,9 @@ php: - 5.5 - 5.6 - 7.0 - - hhvm + - 7.1 sudo: false -before_script: - - wget -nc http://getcomposer.org/composer.phar - - php composer.phar install - -script: phpunit --configuration phpunit.xml.dist +before_script: composer install +script: phpunit diff --git a/composer.json b/composer.json index 1a5e93b..4244f13 100644 --- a/composer.json +++ b/composer.json @@ -23,5 +23,8 @@ "Firebase\\JWT\\": "src" } }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "require-dev": { + "phpunit/phpunit": " 4.8.35" + } } diff --git a/composer.lock b/composer.lock deleted file mode 100644 index 5518ae4..0000000 --- a/composer.lock +++ /dev/null @@ -1,19 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], - "hash": "60a5df5d283a7ae9000173248eba8909", - "packages": [], - "packages-dev": [], - "aliases": [], - "minimum-stability": "dev", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": ">=5.2.0" - }, - "platform-dev": [] -} |