diff options
| author | uwetews <uwe.tews@googlemail.com> | 2019-02-28 05:59:23 +0100 |
|---|---|---|
| committer | uwetews <uwe.tews@googlemail.com> | 2019-02-28 05:59:23 +0100 |
| commit | f93f95787f10a32a6852537533e85975b189ffb7 (patch) | |
| tree | 504776d11cfe3f6c8b15e6392feaf97f1a1fe6e9 | |
| parent | 70fc2fd2760faaaadc8eb62a7d67f15c9c5768e9 (diff) | |
| download | smarty-f93f95787f10a32a6852537533e85975b189ffb7.tar.gz smarty-f93f95787f10a32a6852537533e85975b189ffb7.tar.bz2 smarty-f93f95787f10a32a6852537533e85975b189ffb7.zip | |
Fix PHPunit tests for PHP7 https://github.com/smarty-php/smarty/pull/532
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | composer.json | 3 |
2 files changed, 13 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index d377c501..05f4fa50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,21 @@ dist: trusty matrix: include: + - php: 5.3 + dist: precise + - php: 5.4 + - php: 5.5 + - php: 5.6 - php: 7.0 - php: 7.1 - php: 7.2 + - php: 7.3 + - php: 7.4snapshot + - php: nightly fast_finish: true + allow_failures: + - php: 7.4snapshot + - php: nightly services: - memcached @@ -20,7 +31,7 @@ before_script: - if [ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]; then travis_retry composer --prefer-source --dev install; fi - if [ ${TRAVIS_PHP_VERSION:0:3} <= "5.6" ]; then phpenv config-add travis.ini; fi - if [ ${TRAVIS_PHP_VERSION:0:3} >= "5.3" ]; then phpenv config-add error_reporting.ini; fi - - if [[ $TRAVIS_PHP_VERSION = 7.* ]]; then composer require phpunit/phpunit 6.4.1; fi + - if [[ $TRAVIS_PHP_VERSION:0:2 = "7." ]]; then composer require phpunit/phpunit 6.4.1; fi - mysql -e "create database IF NOT EXISTS test;" -uroot before_install: @@ -32,10 +43,9 @@ install: script: - cd smarty-phpunit - - if [[ $TRAVIS_PHP_VERSION = 7.* ]]; then + - if [[ $TRAVIS_PHP_VERSION0:2 = "7." ]]; then ../vendor/bin/phpunit ./; else phpunit ./; fi - diff --git a/composer.json b/composer.json index 75f36850..2cfaa12e 100644 --- a/composer.json +++ b/composer.json @@ -38,8 +38,5 @@ "branch-alias": { "dev-master": "3.1.x-dev" } - }, - "require-dev": { - "smarty/smarty-dev": "~3.1@dev" } } |