Merge pull request #805 from bantu/travis-php-7.0-2.0

Backport to 2.0: Add PHP7 to Travis CI.

* bantu/travis-php-7.0-2.0:
  Backport to 2.0: Add PHP7 to Travis CI.
This commit is contained in:
Andreas Fischer 2015-09-02 20:37:56 +02:00
commit 79e90801bc
2 changed files with 8 additions and 2 deletions

View File

@ -7,6 +7,7 @@ php:
- 5.5.9
- 5.5
- 5.6
- 7.0
- hhvm
env:
@ -21,7 +22,7 @@ install:
- sudo apt-get install parallel
- eval `ssh-agent -s`
- travis/setup-secure-shell.sh
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/install-php-extensions.sh; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' -a '$TRAVIS_PHP_VERSION' != '7.0' ]; then travis/install-php-extensions.sh; fi"
- travis/setup-composer.sh
script:
@ -30,3 +31,8 @@ script:
after_success:
- sh -c "if $TRAVIS_SECURE_ENV_VARS; then travis/upload-code-coverage-html.sh; fi"
matrix:
allow_failures:
- php: 7.0
fast_finish: true

View File

@ -20,7 +20,7 @@ then
PHPUNIT_ARGS="$PHPUNIT_ARGS -d zend.enable_gc=0"
fi
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' -o "$TRAVIS_PHP_VERSION" = '7.0' ]
then
find tests -type f -name "*Test.php" | \
parallel --gnu --keep-order \