Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Apr 28, 2020. It is now read-only.

Commit62d5fc7

Browse files
committed
Merging develop to master in preparation for 2.6.0 release
2 parents1b5fc1a +1c69323 commit62d5fc7

File tree

5 files changed

+1882
-12
lines changed

5 files changed

+1882
-12
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ tmp/
1111
zf-mkdoc-theme/
1212

1313
clover.xml
14-
composer.lock
1514
coveralls-upload.json
1615
phpunit.xml
1716
vendor

‎.travis.yml‎

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,47 @@ cache:
1515

1616
env:
1717
global:
18-
-SITE_URL:https://zendframework.github.io/zend-xmlrpc
19-
-GH_USER_NAME:"Matthew Weier O'Phinney"
20-
-GH_USER_EMAIL:matthew@weierophinney.net
21-
-GH_REF:github.com/zendframework/zend-xmlrpc.git
18+
-COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
19+
-SITE_URL=https://zendframework.github.io/zend-xmlrpc
20+
-GH_USER_NAME="Matthew Weier O'Phinney"
21+
-GH_USER_EMAIL=matthew@weierophinney.net
22+
-GH_REF=github.com/zendframework/zend-xmlrpc.git
2223
-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="
2324

2425
matrix:
2526
fast_finish:true
2627
include:
27-
-php:5.5
28+
-php:5.6
2829
env:
29-
-CS_CHECK=true
30+
-DEPS=lowest
3031
-php:5.6
3132
env:
33+
-DEPS=locked
3234
-TEST_COVERAGE=true
3335
-DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
3436
-PATH="$HOME/.local/bin:$PATH"
37+
-php:5.6
38+
env:
39+
-DEPS=latest
3540
-php:7
41+
env:
42+
-DEPS=lowest
43+
-php:7
44+
env:
45+
-DEPS=locked
46+
-CS_CHECK=true
47+
-php:7
48+
env:
49+
-DEPS=latest
50+
-php:hhvm
51+
env:
52+
-DEPS=lowest
3653
-php:hhvm
54+
env:
55+
-DEPS=locked
56+
-php:hhvm
57+
env:
58+
-DEPS=latest
3759
allow_failures:
3860
-php:hhvm
3961

@@ -46,8 +68,11 @@ before_install:
4668
-travis_retry composer self-update
4769

4870
install:
49-
-if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
50-
-travis_retry composer install --no-interaction --ignore-platform-reqs
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 composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
74+
-travis_retry composer install $COMPOSER_ARGS
75+
-composer show
5176

5277
script:
5378
-if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@
22

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

5+
##2.6.0 - TBD
6+
7+
###Added
8+
9+
-[#19](https://github.com/zendframework/zend-xmlrpc/pull/19) adds support for
10+
zend-math v3.
11+
12+
###Deprecated
13+
14+
- Nothing.
15+
16+
###Removed
17+
18+
- Nothing.
19+
20+
###Fixed
21+
22+
- Nothing.
23+
524
##2.5.3 - TBD
625

726
###Added

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
]
2222
},
2323
"require": {
24-
"php":"^5.5 || ^7.0",
24+
"php":"^5.6 || ^7.0",
2525
"zendframework/zend-http":"^2.5.4",
26-
"zendframework/zend-math":"^2.7",
27-
"zendframework/zend-server":"^2.6.1",
26+
"zendframework/zend-math":"^2.7 || ^3.0",
27+
"zendframework/zend-server":"^2.7",
2828
"zendframework/zend-stdlib":"^2.7 || ^3.0",
2929
"zendframework/zendxml":"^1.0.2"
3030
},

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp