From c9f0de05f41b9e52798b268ab1e625fac3b8578c Mon Sep 17 00:00:00 2001 From: uwetews Date: Thu, 28 Feb 2019 07:42:20 +0100 Subject: [PATCH] Fix PHPunit tests for PHP7 https://github.com/smarty-php/smarty/pull/532 --- .travis.yml | 16 +--------------- composer.json | 3 +++ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05f4fa50..44fb4eb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,6 @@ 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 @@ -28,10 +23,6 @@ services: - mysql 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:0:2 = "7." ]]; then composer require phpunit/phpunit 6.4.1; fi - mysql -e "create database IF NOT EXISTS test;" -uroot before_install: @@ -43,9 +34,4 @@ install: script: - cd smarty-phpunit - - if [[ $TRAVIS_PHP_VERSION0:2 = "7." ]]; then - ../vendor/bin/phpunit ./; - else - phpunit ./; - fi - + - ../vendor/bin/phpunit ./ diff --git a/composer.json b/composer.json index 2cfaa12e..28c392c9 100644 --- a/composer.json +++ b/composer.json @@ -38,5 +38,8 @@ "branch-alias": { "dev-master": "3.1.x-dev" } + }, + "require-dev": { + "phpunit/phpunit": "6.4.1" } }