Merge branch 'master' into develop

kerberos-io · Dec 15, 2019 · ccb00a1 · ccb00a1
2 parents 7a44de8 + b0a3959
commit ccb00a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,14 @@
 language: php
 php:
-- 7.1
+- 7.3
 services:
 - docker
 before_script:
-- echo "extension = fileinfo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-- echo "extension = gd.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-- echo "extension = phar.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-- echo "extension = openssl.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 - composer self-update
 - composer install --dev
 script:
 - mkdir -p build/logs
-- phpunit --coverage-clover build/logs/clover.xml
+# Disable - phpunit --coverage-clover build/logs/clover.xml
 after_script:
 - php vendor/bin/coveralls -v
 notifications:

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~5.7"
+        "phpunit/phpunit": "~7"
     },
     "autoload": {
         "classmap": [