smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 18:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix PHPunit tests for PHP7 https://github.com/smarty-php/smarty/pull/532

Browse Source
This commit is contained in:
uwetews
2019-02-28 05:59:23 +01:00
parent 70fc2fd276
commit f93f95787f
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@@ -7,10 +7,21 @@ dist: trusty
matrix: matrix:
include: include:
- php: 5.3
dist: precise
- php: 5.4
- php: 5.5
- php: 5.6
- php: 7.0 - php: 7.0
- php: 7.1 - php: 7.1
- php: 7.2 - php: 7.2
- php: 7.3
- php: 7.4snapshot
- php: nightly
fast_finish: true fast_finish: true
allow_failures:
- php: 7.4snapshot
- php: nightly
services: services:
- memcached - 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.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.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: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 - mysql -e "create database IF NOT EXISTS test;" -uroot
before_install: before_install:
@@ -32,10 +43,9 @@ install:
script: script:
- cd smarty-phpunit - cd smarty-phpunit
- if [[ $TRAVIS_PHP_VERSION = 7.* ]]; then - if [[ $TRAVIS_PHP_VERSION0:2 = "7." ]]; then
../vendor/bin/phpunit ./; ../vendor/bin/phpunit ./;
else else
phpunit ./; phpunit ./;
fi fi

3
composer.json
View File

@@ -38,8 +38,5 @@
"branch-alias": { "branch-alias": {
"dev-master": "3.1.x-dev" "dev-master": "3.1.x-dev"
} }
},
"require-dev": {
"smarty/smarty-dev": "~3.1@dev"
} }
} }