From 0c399150a3e6349f0d1985c025bd099e3bb15206 Mon Sep 17 00:00:00 2001
From: Vincent Klaiber <vinkla@users.noreply.github.com>
Date: Mon, 2 Oct 2017 23:11:06 +0200
Subject: [PATCH] Update travis and phpunit (#489)

---
 .travis.yml   | 30 ++++++++++++++++--------------
 composer.json |  3 +--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7fb9c9a..05ebb2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,30 @@
 language: php
 
 php:
- - '7.0'
+  - 7.0
+  - 7.1
+  - 7.2
 
 services:
- - docker
+  - docker
 
 cache:
   directories:
-   - $HOME/.composer/cache
+    - $HOME/.composer/cache
 
 install:
- - composer install
- - composer run-script parse-stubs
+  - composer install --prefer-dist --no-interaction
+  - composer run-script parse-stubs
 
 script:
- - vendor/bin/phpcs -n
- - vendor/bin/phpunit --coverage-clover=coverage.xml
+  - vendor/bin/phpcs -n
+  - vendor/bin/phpunit --coverage-clover=coverage.xml
 
 after_success:
- - bash <(curl -s https://codecov.io/bash)
- - |
-   if [[ $TRAVIS_TAG == v* ]]; then
-     docker build -t felixfbecker/php-language-server:${TRAVIS_TAG:1} .
-     docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-     docker push felixfbecker/php-language-server:${TRAVIS_TAG:1}
-   fi
+  - bash <(curl -s https://codecov.io/bash)
+  - |
+    if [[ $TRAVIS_TAG == v* ]]; then
+      docker build -t felixfbecker/php-language-server:${TRAVIS_TAG:1} .
+      docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+      docker push felixfbecker/php-language-server:${TRAVIS_TAG:1}
+    fi
diff --git a/composer.json b/composer.json
index d28ef31..c5f6722 100644
--- a/composer.json
+++ b/composer.json
@@ -35,8 +35,7 @@
         "webmozart/path-util": "^2.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.5",
-        "phpunit/php-code-coverage": "^4.0"
+        "phpunit/phpunit": "^6.3"
     },
     "autoload": {
         "psr-4": {