Merge branch '5.7' into 6.2

sebastianbergmann · Jul 30, 2017 · a46132a · a46132a
2 parents 293c1d7 + a12edbc
commit a46132a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ before_install:
   - 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:

diff --git 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
@@ -19,6 +19,7 @@
     "support": {
         "issues": "https://github.com/sebastianbergmann/phpunit/issues"
     },
+    "prefer-stable": true,
     "require": {
         "php": "^7.0",
         "ext-dom": "*",