Test phpunit 6.4.1 (reverted from commit f60d8a763c)

This commit is contained in:
Uwe Tews
2017-10-09 16:45:24 +02:00
parent 7e84d34363
commit 157f51086c

View File

@@ -28,9 +28,16 @@ install:
script: script:
- cd smarty-phpunit - cd smarty-phpunit
<<<<<<< HEAD
- if [[ $TRAVIS_PHP_VERSION = 7.* || $TRAVIS_PHP_VERSION = nightly ]]; then
./vendor/bin/phpunit
else
phpunit ./
=======
- if [[ $TRAVIS_PHP_VERSION = 7.1 || $TRAVIS_PHP_VERSION = nightly ]]; then - if [[ $TRAVIS_PHP_VERSION = 7.1 || $TRAVIS_PHP_VERSION = nightly ]]; then
$COMPOSER_BIN_DIR/phpunit ./; $COMPOSER_BIN_DIR/phpunit ./;
else else
phpunit ./; phpunit ./;
>>>>>>> parent of e9e97cc... Use phpunit 6.4.1 for PHP 7.1
fi fi