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

Commit

Permalink
Update to allow usage of zend-expressive-helpers 4.0
Browse files Browse the repository at this point in the history
Consumed API is identical, so we can allow that version as well.

Adds additional Travis jobs to test against helpers 2.2 and 3.0.1 on
each PHP version.
  • Loading branch information
weierophinney committed Mar 14, 2017
1 parent 73eae9a commit f3901eb
Show file tree
Hide file tree
Showing 3 changed files with 173 additions and 93 deletions.
33 changes: 33 additions & 0 deletions .travis.yml
Expand Up @@ -23,6 +23,14 @@ matrix:
env:
- DEPS=locked
- TEST_COVERAGE=true
- php: 5.6
env:
- DEPS=locked
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2"
- php: 5.6
env:
- DEPS=locked
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
- php: 5.6
env:
- DEPS=latest
Expand All @@ -33,6 +41,14 @@ matrix:
env:
- DEPS=locked
- CS_CHECK=true
- php: 7
env:
- DEPS=locked
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2"
- php: 7
env:
- DEPS=locked
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
- php: 7
env:
- DEPS=latest
Expand All @@ -42,6 +58,14 @@ matrix:
- php: 7.1
env:
- DEPS=locked
- php: 7.1
env:
- DEPS=locked
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2"
- php: 7.1
env:
- DEPS=locked
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
- php: 7.1
env:
- DEPS=latest
Expand All @@ -51,6 +75,14 @@ matrix:
- php: hhvm
env:
- DEPS=locked
- php: hhvm
env:
- DEPS=locked
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2"
- php: hhvm
env:
- DEPS=locked
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
- php: hhvm
env:
- DEPS=latest
Expand All @@ -66,6 +98,7 @@ install:
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; 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 --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $HELPER_DEPS != '' ]]; then travis_retry composer require $COMPOSER_ARGS --update-with-dependencies $HELPER_DEPS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
- composer show

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -21,7 +21,7 @@
"php": "^5.6 || ^7.0",
"container-interop/container-interop": "^1.2",
"twig/twig": "^1.32 || ^2.1",
"zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1",
"zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1 || ^4.0",
"zendframework/zend-expressive-router": "^1.3.2 || ^2.1",
"zendframework/zend-expressive-template": "^1.0.4"
},
Expand Down

0 comments on commit f3901eb

Please sign in to comment.