From 2dd0ac514a3926d712672ad010b06dd11ee1d0bf Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Sun, 30 Jul 2017 10:12:19 +0200
Subject: [PATCH 1/2] We also need --prefer-stable with --prefer-lowest

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c6bedfd7c7e..ec1e670abd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,14 @@ env:
     - DEPENDENCIES="high"
     - DEPENDENCIES="low"
   global:
-    - DEFAULT_COMPOSER_FLAGS="--no-interaction --no-ansi --no-progress --no-suggest"
+    - DEFAULT_COMPOSER_FLAGS="--no-interaction --no-ansi --no-progress --no-suggest --prefer-stable"
 
 before_install:
   - composer self-update
   - composer clear-cache
 
 install:
-  - if [[ "$DEPENDENCIES" = 'high' ]]; then travis_retry composer update $DEFAULT_COMPOSER_FLAGS --prefer-stable; fi
+  - if [[ "$DEPENDENCIES" = 'high' ]]; then travis_retry composer update $DEFAULT_COMPOSER_FLAGS; fi
   - if [[ "$DEPENDENCIES" = 'low' ]]; then travis_retry composer update $DEFAULT_COMPOSER_FLAGS --prefer-lowest; fi
 
 before_script:

From a12edbc808e6e9fa69ce35a1b156e7701d9c5af5 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Sun, 30 Jul 2017 10:14:43 +0200
Subject: [PATCH 2/2] Move configuration for preference of stable packages to
 composer.json

---
 .travis.yml   | 2 +-
 build.xml     | 1 -
 composer.json | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec1e670abd7..b34a5f2a021 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ env:
     - DEPENDENCIES="high"
     - DEPENDENCIES="low"
   global:
-    - DEFAULT_COMPOSER_FLAGS="--no-interaction --no-ansi --no-progress --no-suggest --prefer-stable"
+    - DEFAULT_COMPOSER_FLAGS="--no-interaction --no-ansi --no-progress --no-suggest"
 
 before_install:
   - composer self-update
diff --git a/build.xml b/build.xml
index 6532ea8b2e8..224904b406f 100644
--- a/build.xml
+++ b/build.xml
@@ -48,7 +48,6 @@
             <arg value="--no-progress"/>
             <arg value="--no-ansi"/>
             <arg value="--no-suggest"/>
-            <arg value="--prefer-stable"/>
         </exec>
     </target>
 
diff --git a/composer.json b/composer.json
index 1726365bf4c..d0555853c1d 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
     "support": {
         "issues": "https://github.com/sebastianbergmann/phpunit/issues"
     },
+    "prefer-stable": true,
     "require": {
         "php": "^5.6 || ^7.0",
         "phpunit/php-file-iterator": "~1.4",