From d5832f9c1a5ae8261da9a5aba1b0def0cc38da89 Mon Sep 17 00:00:00 2001
From: Dariusz Ruminski <keradus@gmail.com>
Date: Thu, 16 Jun 2016 00:07:24 +0200
Subject: [PATCH 1/3] Rely on own phpunit, not one from CI service

---
 .travis.yml   | 3 +++
 composer.json | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4e538cdbcda..3600d1a7380 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,12 +21,15 @@ cache:
         - $HOME/.composer/cache
 
 before_install:
+    - mv $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini $HOME/xdebug.ini || return 0
     - 'if [ "$SYMFONY_VERSION" != "" ]; then sed -i "s/\"symfony\/\([^\"]*\)\": \"[^\"]*\"/\"symfony\/\1\": \"$SYMFONY_VERSION\"/g" composer.json; fi'
 
 install:
+    - travis_retry composer global require hirak/prestissimo
     - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction
 
 script:
+    - cp $HOME/xdebug.ini $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini || return 0
     - phpunit --verbose --coverage-clover build/logs/clover.xml
     - phpenv config-rm xdebug.ini || return 0
     - php php-cs-fixer --diff --dry-run -v fix
diff --git a/composer.json b/composer.json
index bf85ea07b6e..d30110b86b1 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,8 @@
         "sebastian/diff": "~1.1"
     },
     "require-dev": {
-        "satooshi/php-coveralls": "0.7.*@dev"
+        "phpunit/phpunit": "@stable",
+        "satooshi/php-coveralls": "^0.7.1"
     },
     "autoload": {
         "psr-4": { "Symfony\\CS\\": "Symfony/CS/" }

From 509c4dc3164d768948a2a8bce556c863b4343e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20Rumi=C5=84ski?= <dariusz.ruminski@gmail.com>
Date: Thu, 16 Jun 2016 01:08:04 +0200
Subject: [PATCH 2/3] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3600d1a7380..31983fc0826 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ install:
 
 script:
     - cp $HOME/xdebug.ini $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini || return 0
-    - phpunit --verbose --coverage-clover build/logs/clover.xml
+    - vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml
     - phpenv config-rm xdebug.ini || return 0
     - php php-cs-fixer --diff --dry-run -v fix
 

From 236dc72d48d8824697525fe47f3c9588a2c921ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20Rumi=C5=84ski?= <dariusz.ruminski@gmail.com>
Date: Thu, 16 Jun 2016 12:12:23 +0200
Subject: [PATCH 3/3] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d30110b86b1..699cc8d1ae1 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "sebastian/diff": "~1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "@stable",
+        "phpunit/phpunit": "^4.5|^5",
         "satooshi/php-coveralls": "^0.7.1"
     },
     "autoload": {