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

Commit 2993f22

Browse files
committed
Merge branch 'hotfix/documentation'
Close #11 Close #12 Close #13 Close #14 Close #15 Close #16 Fixes #6 Fixes #7 Fixes #8 Fixes #9 Fixes #10
2 parents 83ea758 + ee0e997 commit 2993f22

14 files changed

+990
-864
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
.*.sw*
77
.*.un~
88
nbproject
9+
doc/html/
910
tmp/
11+
zf-mkdoc-theme/
1012

1113
clover.xml
1214
composer.lock

.travis.yml

+17-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,22 @@ language: php
44

55
branches:
66
except:
7-
- /^release-.*$/
7+
- /^release-\d+\.\d+\.\d+.*$/
88
- /^ghgfk-.*$/
99

1010
cache:
1111
directories:
1212
- $HOME/.composer/cache
13+
- $HOME/.local
14+
- zf-mkdoc-theme
15+
16+
env:
17+
global:
18+
- SITE_URL: https://zendframework.github.io/zend-xmlrpc
19+
- GH_USER_NAME: "Matthew Weier O'Phinney"
20+
- GH_USER_EMAIL: [email protected]
21+
- GH_REF: github.com/zendframework/zend-xmlrpc.git
22+
- 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="
1323

1424
matrix:
1525
fast_finish: true
@@ -20,6 +30,8 @@ matrix:
2030
- php: 5.6
2131
env:
2232
- EXECUTE_TEST_COVERALLS=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"
2335
- php: 7
2436
- php: hhvm
2537
allow_failures:
@@ -42,6 +54,10 @@ script:
4254
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
4355
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
4456
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi
57+
- 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
58+
59+
after_success:
60+
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
4561

4662
after_script:
4763
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; fi

CHANGELOG.md

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file, in reverse chronological order by release.
4+
5+
## 2.5.2 - 2016-04-21
6+
7+
### Added
8+
9+
- [#11](https://github.com/zendframework/zend-xmlrpc/pull/11),
10+
[#12](https://github.com/zendframework/zend-xmlrpc/pull/12),
11+
[#13](https://github.com/zendframework/zend-xmlrpc/pull/13),
12+
[#14](https://github.com/zendframework/zend-xmlrpc/pull/14),
13+
[#15](https://github.com/zendframework/zend-xmlrpc/pull/15), and
14+
[#16](https://github.com/zendframework/zend-xmlrpc/pull/16)
15+
added and prepared the documentation for publication at
16+
https://zendframework.github.io/zend-xmlrpc/
17+
18+
### Deprecated
19+
20+
- Nothing.
21+
22+
### Removed
23+
24+
- Nothing.
25+
26+
### Fixed
27+
28+
- Nothing.

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ processed and returned.”
1111
`Zend\XmlRpc` provides support for both consuming remote XML-RPC services and
1212
building new XML-RPC servers.
1313

14-
1514
- File issues at https://github.com/zendframework/zend-xmlrpc/issues
16-
- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-xmlrpc
15+
- Documentation is at https://zendframework.github.io/zend-xmlrpc/

0 commit comments

Comments
 (0)