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

Commit e4bc6e5

Browse files
committed
Updates supported PHP and PHPUnit versions
- Updates to PHP 5.6+, adds support for 7.1 and 7.2, and removes support for HHVM. - Updates to PHPUnit 5.7/6.0.
1 parent 7d9f719 commit e4bc6e5

File tree

4 files changed

+538
-179
lines changed

4 files changed

+538
-179
lines changed

.travis.yml

Lines changed: 47 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,52 +10,75 @@ branches:
1010
cache:
1111
directories:
1212
- $HOME/.composer/cache
13-
- $HOME/.local
14-
- zf-mkdoc-theme
1513

1614
env:
1715
global:
18-
- SITE_URL=https://zendframework.github.io/zend-json-server
19-
- GH_USER_NAME="Matthew Weier O'Phinney"
20-
21-
- GH_REF=github.com/zendframework/zend-json-server.git
22-
- secure: "KvztcHanoXLkqi+yL3o5el7ypu/jcyHqKy0VtOKGB483sg2wn6wJyAuVLBJscmzgazjPzQa57MBe9an7OOpuoJNPtE5m9huk41KByK2ibzMnC4F7D8lox5CUoV0jRaohYQmpZitbj/BKPlFbYaT42d+/R2o9CEQUJ4T3nYltzAydvB3T1CJE1u7HtZ8mB/Kgkfjqcyx+/bnmvmeGlwop4rDxHmEmrfApdWSUMSKUKjJqUlZt0ASpa2fJy3HL4don6WV1ufPcKVI7bQN1dkn+zZhW5zQ7PRg0hMEMxEMC8MLyLZvDXxL4rUmt2i3I0NtK6E357QdoX13NQKJZiH47jFpJA3DFQl2vE7Vu3kEkMqsrM2fbp9xTCyN9Gg5ZHueUd+iUxVCTy5Twlqt8MqBd2Z4tbljOsgBQkRuKxRg+JkNcWGM5RIWhA169nGY25867Bah/hh25blpsj77RVsvJdeUzAqCHWm5ey+2rNcUWbJXUK2nQdlonCLNsP0LweA5344GFFw+U+93btEw/5mpADbjhaYuZKXhMOcnqJgTGghxkp0cnExb7w5p6KxAsQ+E/C5X7RDwwhaTb6LUuKrTgar4/3RVUIqujdVVUntB1161S6Qnut1TqdaRHbgGOBSlCNWAB960icfdNbN+y4mtJZf9AVgvkoN8QGlncVPF+6GI="
16+
- COMPOSER_ARGS="--no-interaction"
17+
- COVERAGE_DEPS="satooshi/php-coveralls"
18+
- LEGACY_DEPS="phpunit/phpunit"
2319

2420
matrix:
2521
fast_finish: true
2622
include:
27-
- php: 5.5
23+
- php: 5.6
2824
env:
29-
- CS_CHECK=true
25+
- DEPS=lowest
3026
- php: 5.6
3127
env:
28+
- DEPS=locked
3229
- TEST_COVERAGE=true
33-
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
34-
- PATH="$HOME/.local/bin:$PATH"
30+
- php: 5.6
31+
env:
32+
- DEPS=latest
33+
- php: 7
34+
env:
35+
- DEPS=lowest
3536
- php: 7
36-
- php: hhvm
37+
env:
38+
- DEPS=locked
39+
- CS_CHECK=true
40+
- php: 7
41+
env:
42+
- DEPS=latest
43+
- php: 7.1
44+
env:
45+
- DEPS=lowest
46+
- php: 7.1
47+
env:
48+
- DEPS=locked
49+
- php: 7.1
50+
env:
51+
- DEPS=latest
52+
- php: 7.2
53+
env:
54+
- DEPS=lowest
55+
- php: 7.2
56+
env:
57+
- DEPS=locked
58+
- php: 7.2
59+
env:
60+
- DEPS=latest
3761
allow_failures:
38-
- php: hhvm
39-
40-
notifications:
41-
irc: "irc.freenode.org#zftalk.dev"
42-
email: false
62+
- php: 7.2
4363

4464
before_install:
45-
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
65+
- if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
4666
- travis_retry composer self-update
47-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
4867

4968
install:
50-
- travis_retry composer install --no-interaction --ignore-platform-reqs
69+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
70+
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
71+
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
72+
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
73+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
74+
- stty cols 120 && composer show
5175

5276
script:
5377
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
5478
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
55-
- if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
56-
57-
after_success:
58-
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
5979

6080
after_script:
6181
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
82+
83+
notifications:
84+
email: false

composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,22 @@
88
"xml"
99
],
1010
"homepage": "https://github.com/zendframework/zend-xml2json",
11+
"config": {
12+
"sort-packages": true
13+
},
1114
"extra": {
1215
"branch-alias": {
1316
"dev-master": "3.0-dev",
1417
"dev-develop": "3.1-dev"
1518
}
1619
},
1720
"require": {
18-
"php": "^5.5 || ^7.0",
21+
"php": "^5.6 || ^7.0",
1922
"zendframework/zend-json": "^2.6.1 || ^3.0",
2023
"zendframework/zendxml": "^1.0.2"
2124
},
2225
"require-dev": {
23-
"phpunit/PHPUnit": "~4.0",
26+
"phpunit/phpunit": "^5.7.22 || ^6.4.1",
2427
"zendframework/zend-coding-standard": "~1.0.0"
2528
},
2629
"autoload": {

0 commit comments

Comments
 (0)