Merge pull request #1358 from mtmail/travis-php-7dot1

travis-CI: use PHP 7.1

diff --git a/.travis.yml b/.travis.yml
index fe4e0cbd09b00738d57173ce1a45c271a89dc0e8..259b9d5b95d3f6578f8b660d173025234e635bd1 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ git:
 env:
   - TEST_SUITE=tests
   - TEST_SUITE=monaco
+before_install:
+  - phpenv global 7.1
 install:
   - vagrant/install-on-travis-ci.sh
 before_script:
@@ -19,7 +21,7 @@ script:
   - cd $TRAVIS_BUILD_DIR/
   - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 . ; fi
   - cd $TRAVIS_BUILD_DIR/test/php
-  - if [[ $TEST_SUITE == "tests" ]]; then phpunit ./ ; fi
+  - if [[ $TEST_SUITE == "tests" ]]; then /usr/bin/phpunit ./ ; fi
   - cd $TRAVIS_BUILD_DIR/test/bdd
   - # behave --format=progress3 api
   - if [[ $TEST_SUITE == "tests" ]]; then behave -DREMOVE_TEMPLATE=1 --format=progress3 db ; fi

diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index fa2a43e0e9a24ef643813c45281c13e59701a2d0..229a7ef1de807fa2765bf134b2abbe262731ff1d 100755 (executable)
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/install-on-travis-ci.sh
@@ -26,6 +26,9 @@ pip3 install --quiet behave nose pytidylib psycopg2-binary
 composer global require "squizlabs/php_codesniffer=*"
 sudo ln -s /home/travis/.config/composer/vendor/bin/phpcs /usr/bin/
 
+composer global require "phpunit/phpunit=7.*"
+sudo ln -s /home/travis/.config/composer/vendor/bin/phpunit /usr/bin/
+
 sudo -u postgres createuser -S www-data
 
 # Make sure that system servers can read from the home directory: