From c3f84247851eb1393a5f087a9d2df646b6465cb7 Mon Sep 17 00:00:00 2001
From: Niklas Keller <me@kelunik.com>
Date: Thu, 15 Dec 2016 10:35:24 +0100
Subject: [PATCH] Fix tests

---
 .travis.yml   | 8 +++-----
 composer.json | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9858c83..bd73fcc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,10 @@ cache:
     - vendor
 
 install:
-  - phpenv config-rm xdebug.ini
-  - composer self-update
+  - phpenv config-rm xdebug.ini || true
   - composer config --global discard-changes true
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.5" ]]; then composer require --dev --no-update phpunit/phpunit ^4; fi
-  - composer require satooshi/php-coveralls dev-master --dev --no-update
-  - composer update --ignore-platform-reqs
+  - composer install
+  - composer require satooshi/php-coveralls dev-master --dev
   - composer show --installed
 
 script:
diff --git a/composer.json b/composer.json
index 132e585..a86fe67 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "symfony/yaml": "^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5",
+        "phpunit/phpunit": "^4|^5",
         "friendsofphp/php-cs-fixer": "^1.9",
         "macfja/phar-builder": "^0.2.5"
     },