mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-04 10:24:26 +02:00
Test phpunit 6.4.1 (reverted from commit f60d8a763c
)
This commit is contained in:
@@ -28,9 +28,16 @@ install:
|
||||
|
||||
script:
|
||||
- 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
|
||||
$COMPOSER_BIN_DIR/phpunit ./;
|
||||
else
|
||||
phpunit ./;
|
||||
>>>>>>> parent of e9e97cc... Use phpunit 6.4.1 for PHP 7.1
|
||||
fi
|
||||
|
||||
|
Reference in New Issue
Block a user