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

Commit ee9274e

Browse files
committed
Merge branch 'hotfix/29-php-7.2-support'
Close #29 Close #30 Fixes #28
2 parents b41116f + de4364a commit ee9274e

33 files changed

+860
-490
lines changed

.travis.yml

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

1614
env:
1715
global:
1816
- COMPOSER_ARGS="--no-interaction"
19-
- SITE_URL=https://zendframework.github.io/zend-xmlrpc
20-
- GH_USER_NAME="Matthew Weier O'Phinney"
21-
22-
- GH_REF=github.com/zendframework/zend-xmlrpc.git
23-
- secure: "tE/9gTe0U+QN1mlCC7Wr70RaOHn3Mtn8ZZTjN0LuhDhXTe3Hs197DNNv3vxNSXRavIRuLi1mIEiEu1uzV4qlnUx01Uj+G+jCshYLrZIQ8TxVJEXB1r1tFrNosg4s1hpxDQn7O5O0VzOEB8G01PobCUmPNTDPGi77xj8HyE+SCLQPnnNPwp4gJtifS+bBOmAe//A0aOA14ArzJLi4xfEKCC2yoSUawob8xX9LbMfLwq8/IEPYtLqN9rvk5qpc2/uhb7Hrqk7Nq8Xt6Gv2ixgDkfYup7BswAamtT5M4m02mXBneYqC2OYDeuStv8kkaIIjTCKxOOPzseRgHJgXLxnRNbJjG7fLaTpWYtl4ZqevGZlp+GrRGHMsQO4wxXMAM0U476nLzNlQDw3xEH9dKpf/QRM1bsP2b45fxHRklRjek+KXIF0bE7q5+jkOeHzg/z05CF6EMSjZuuI+qoUrdZub/R6pTxwhqBzDzUxZjTY3gj5+qlTlvn/B18tCXNsHjsFX75Boy1ST45ai/6ow1veyaWk9H/wIJEqEk54gWDsonpwpGgQjQcoZ58QRi9SKxv0hBFB+No+k2fFnQc0pvTJKa/3Pk+k2I77BvaqtZxC6eqXHKOiDvaR/ywBAIPLBEHL7Fm4Xeu80voNAPlcRV+5qD7ptPaV6gxqeNm1rM81SZHA="
2417

2518
matrix:
2619
fast_finish: true
@@ -32,8 +25,7 @@ matrix:
3225
env:
3326
- DEPS=locked
3427
- TEST_COVERAGE=true
35-
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
36-
- PATH="$HOME/.local/bin:$PATH"
28+
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
3729
- php: 5.6
3830
env:
3931
- DEPS=latest
@@ -44,9 +36,28 @@ matrix:
4436
env:
4537
- DEPS=locked
4638
- CS_CHECK=true
39+
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
4740
- php: 7
4841
env:
4942
- 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
5061
- php: hhvm
5162
env:
5263
- DEPS=lowest
@@ -60,28 +71,23 @@ matrix:
6071
- php: hhvm
6172

6273
notifications:
63-
irc: "irc.freenode.org#zftalk.dev"
6474
email: false
6575

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

7079
install:
80+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
81+
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
7182
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
7283
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
73-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
74-
- travis_retry composer install $COMPOSER_ARGS
75-
- composer show
84+
- if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev $COMPOSER_ARGS php-coveralls/php-coveralls:^2.0 ; fi
85+
- stty cols 120 && composer show
7686

7787
script:
7888
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi
7989
- if [[ $TEST_COVERAGE != 'true' ]]; then composer test ; fi
8090
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
81-
- 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
82-
83-
after_success:
84-
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
8591

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

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5-
## 2.6.2 - TBD
5+
## 2.6.2 - 2018-01-25
66

77
### Added
88

9-
- Nothing.
9+
- [#29](https://github.com/zendframework/zend-xmlrpc/pull/29) adds support for
10+
PHP 7.2, by replacing deprecated `list`/`each` syntax with a functional
11+
equivalent.
1012

1113
### Deprecated
1214

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"ZendTest\\XmlRpc\\": "test/"
1818
},
1919
"files": [
20+
"test/autoload.php",
2021
"test/TestAsset/functions.php"
2122
]
2223
},
@@ -29,8 +30,8 @@
2930
"zendframework/zendxml": "^1.0.2"
3031
},
3132
"require-dev": {
32-
"phpunit/PHPUnit": "^4.8",
33-
"squizlabs/php_codesniffer": "^2.3.1"
33+
"phpunit/PHPUnit": "^5.7.25 || ^6.4.4",
34+
"zendframework/zend-coding-standard": "~1.0.0"
3435
},
3536
"suggest": {
3637
"zendframework/zend-cache": "To support Zend\\XmlRpc\\Server\\Cache usage"

0 commit comments

Comments
 (0)