Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Require PHP 7.2 builds to pass
Browse files Browse the repository at this point in the history
Updates travis configuration to require PHP 7.2 builds, as well as to
use php-coveralls/php-coveralls, and to assign LEGACY_DEPS per
environment.

Removes upload-coverage script.

Bumps zend-mvc version to one known to work with PHP 7.2.
  • Loading branch information
weierophinney committed May 3, 2018
1 parent 276e3eb commit eba6897
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ cache:
env:
global:
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="satooshi/php-coveralls"
- LEGACY_DEPS="phpunit/phpunit"
- COVERAGE_DEPS="php-coveralls/php-coveralls"

matrix:
include:
Expand All @@ -21,6 +20,7 @@ matrix:
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- TEST_COVERAGE=true
- php: 5.6
env:
Expand All @@ -31,6 +31,7 @@ matrix:
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- CS_CHECK=true
- php: 7
env:
Expand All @@ -53,16 +54,13 @@ matrix:
- php: 7.2
env:
- DEPS=latest
allow_failures:
- php: 7.2

before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- travis_retry composer self-update

install:
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update $COMPOSER_ARGS --prefer-lowest --prefer-stable ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
Expand All @@ -73,7 +71,7 @@ script:
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi

after_script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/php-coveralls ; fi

notifications:
email: false
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"zendframework/zend-filter": "^2.7.1",
"zendframework/zend-http": "^2.5.4",
"zendframework/zend-hydrator": "^1.1 || ^2.2.1",
"zendframework/zend-mvc": "^2.7.9 || ^3.0.2",
"zendframework/zend-mvc": "^2.7.15 || ^3.0.2",
"zendframework/zend-paginator": "^2.7",
"zendframework/zend-uri": "^2.5.2",
"zendframework/zend-view": "^2.8.1",
Expand All @@ -61,7 +61,6 @@
"@cs-check",
"@test"
],
"upload-coverage": "coveralls -v",
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit eba6897

Please sign in to comment.