diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-24 11:15:51 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-22 20:16:50 +0200 |
commit | db4d63fc1ae513335b751beb8f89e1eed61871c2 (patch) | |
tree | c1406cef26fa9d8e0498f889588f17d403a5ba91 /.travis.yml | |
parent | b10a422e1f24d57c0cc616f5f06f35676335187e (diff) | |
download | wallabag-db4d63fc1ae513335b751beb8f89e1eed61871c2.tar.gz wallabag-db4d63fc1ae513335b751beb8f89e1eed61871c2.tar.zst wallabag-db4d63fc1ae513335b751beb8f89e1eed61871c2.zip |
Upgrade PHPUnit to version 5
- Fix deprecated getMock
- Use PHPUnit 4 for PHP 5.5 build
Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2201
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index dd8815c1..69b4f919 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -55,6 +55,7 @@ branches: | |||
55 | before_script: | 55 | before_script: |
56 | - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; | 56 | - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; |
57 | - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; | 57 | - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; |
58 | - if [ "$TRAVIS_PHP_VERSION" = "5.5" ]; then composer require "phpunit/phpunit:4.*" --no-update; fi; | ||
58 | - composer self-update --no-progress | 59 | - composer self-update --no-progress |
59 | - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; | 60 | - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; |
60 | 61 | ||