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

Commit 88776b4

Browse files
committed
Merge branch 'hotfix/242-php-7.2-support'
Close #242
2 parents 1f0fb2b + c542302 commit 88776b4

11 files changed

Lines changed: 457 additions & 275 deletions

.travis.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ language: php
55
cache:
66
directories:
77
- $HOME/.composer/cache
8-
- vendor
98

109
env:
1110
global:
12-
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
11+
- COMPOSER_ARGS="--no-interaction"
1312

1413
matrix:
1514
fast_finish: true
@@ -20,6 +19,7 @@ matrix:
2019
- php: 5.6
2120
env:
2221
- DEPS=locked
22+
- LEGACY_DEPS="phpunit/phpunit"
2323
- php: 5.6
2424
env:
2525
- DEPS=latest
@@ -30,18 +30,38 @@ matrix:
3030
env:
3131
- DEPS=locked
3232
- CS_CHECK=true
33+
- LEGACY_DEPS="phpunit/phpunit"
3334
- php: 7
3435
env:
3536
- DEPS=latest
37+
- php: 7.1
38+
env:
39+
- DEPS=lowest
40+
- php: 7.1
41+
env:
42+
- DEPS=locked
43+
- php: 7.1
44+
env:
45+
- DEPS=latest
46+
- php: 7.2
47+
env:
48+
- DEPS=lowest
49+
- php: 7.2
50+
env:
51+
- DEPS=locked
52+
- php: 7.2
53+
env:
54+
- DEPS=latest
3655

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

4059
install:
60+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
61+
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update --with-dependencies $COMPOSER_ARGS $LEGACY_DEPS ; fi
4162
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
4263
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
43-
- travis_retry composer install $COMPOSER_ARGS
44-
- composer show
64+
- stty cols 120 && composer show
4565

4666
script:
4767
- composer test

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file, in reverse
66

77
### Added
88

9-
- Nothing.
9+
- [#242](https://github.com/zendframework/zend-developer-tools/pull/242) adds support for PHP 7.1 and 7.2.
1010

1111
### Changed
1212

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"zendframework/zend-view": "^2.6"
4242
},
4343
"require-dev": {
44-
"phpunit/phpunit": "^4.8 || ^5.0",
44+
"phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1",
4545
"squizlabs/php_codesniffer": "~2.3.1"
4646
},
4747
"suggest": {

0 commit comments

Comments
 (0)