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

Commit

Permalink
Merge branch 'versions/1.3.0'
Browse files Browse the repository at this point in the history
Close #23
  • Loading branch information
weierophinney committed Aug 24, 2017
2 parents 30e6320 + d4b73f6 commit 9213c09
Show file tree
Hide file tree
Showing 9 changed files with 379 additions and 215 deletions.
27 changes: 19 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ cache:

env:
global:
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
- COMPOSER_ARGS="--no-interaction"
- LEGACY_DEPS="phpunit/phpunit"

matrix:
fast_finish: true
Expand All @@ -33,31 +34,41 @@ matrix:
- php: 7
env:
- DEPS=latest
- php: hhvm
- php: 7.1
env:
- DEPS=lowest
- php: hhvm
- php: 7.1
env:
- DEPS=locked
- php: hhvm
- php: 7.1
env:
- DEPS=latest
- php: 7.2
env:
- DEPS=lowest
- php: 7.2
env:
- DEPS=locked
- php: 7.2
env:
- DEPS=latest
allow_failures:
- php: hhvm
- php: 7.2

notifications:
irc: "irc.freenode.org#apigility-dev"
email: false

before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- if [[ $TEST_COVERAGE != 'true' && ! $TRAVIS_PHP_VERSION =~ ^7.2 ]]; 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 [[ $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
- travis_retry composer install $COMPOSER_ARGS
- composer show
- stty cols 120 && composer show

script:
- composer test
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ All notable changes to this project will be documented in this file, in reverse
- [#22](https://github.com/zfcampus/zf-configuration/pull/22) adds support for
zend-config v3 releases.

- [#23](https://github.com/zfcampus/zf-configuration/pull/23) adds support for
PHP 7.1 and the upcoming 7.2 release.

### Deprecated

- Nothing.

### Removed

- Nothing.
- [#23](https://github.com/zfcampus/zf-configuration/pull/23) removes support
for HHVM.

### Fixed

Expand Down
13 changes: 8 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@
"source": "https://github.com/zfcampus/zf-configuration",
"issues": "https://github.com/zfcampus/zf-configuration/issues"
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "1.2-dev",
"dev-develop": "1.3-dev"
"dev-master": "1.3-dev",
"dev-develop": "1.4-dev"
},
"zf": {
"module": "ZF\\Configuration"
Expand All @@ -33,9 +36,9 @@
"zendframework/zend-stdlib": "^2.7.7 || ^3.0.1"
},
"require-dev": {
"phpunit/phpunit": "^4.8 || ^5.5",
"squizlabs/php_codesniffer": "^2.6.2",
"container-interop/container-interop": "^1.1"
"container-interop/container-interop": "^1.1",
"phpunit/phpunit": "^5.7.15 || ^6.0.8",
"zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 9213c09

Please sign in to comment.