diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f95acce3..128121be 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -24,11 +24,13 @@ Closes #{put_issue_number_here} diff --git a/.travis.yml b/.travis.yml index c587c5a5..5de86722 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ env: - SYMFONY_DEPRECATIONS_HELPER=weak_vendors - TARGET=test - UPSTREAM_URL=https://github.com/sonata-project/SonataNewsBundle.git + - PHPUNIT_VERSION=5.7 matrix: fast_finish: true diff --git a/.travis/install_test.sh b/.travis/install_test.sh index 07243c7b..a0335009 100755 --- a/.travis/install_test.sh +++ b/.travis/install_test.sh @@ -3,12 +3,6 @@ set -ev mkdir --parents "${HOME}/bin" -# PHPUnit install -if [ "${TRAVIS_BRANCH}" = 'master' ]; then - PHPUNIT_VERSION=7 -else - PHPUNIT_VERSION=5.7 -fi wget "https://phar.phpunit.de/phpunit-${PHPUNIT_VERSION}.phar" --output-document="${HOME}/bin/phpunit" chmod u+x "${HOME}/bin/phpunit"