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

Commit 1d520aa

Browse files
committed
Merge branch 'hotfix/qa-tooling'
Close #31 Close #33 Close #34 Close #35 Close #36
2 parents 66330a4 + 26c6b2e commit 1d520aa

20 files changed

+277
-277
lines changed

.gitattributes

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
/test export-ignore
2-
/vendor export-ignore
3-
.coveralls.yml export-ignore
4-
.gitattributes export-ignore
5-
.gitignore export-ignore
6-
.travis.yml export-ignore
7-
.php_cs export-ignore
8-
phpunit.xml.dist export-ignore
1+
/.coveralls.yml export-ignore
2+
/.gitattributes export-ignore
3+
/.gitignore export-ignore
4+
/.travis.yml export-ignore
5+
/composer.lock export-ignore
6+
/docs/ export-ignore
7+
/mkdocs.yml export-ignore
8+
/phpcs.xml export-ignore
9+
/phpunit.xml.dist export-ignore
10+
/test/ export-ignore

.gitignore

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
.buildpath
2-
.DS_Store
3-
.idea
4-
.project
5-
.settings/
6-
.*.sw*
7-
.*.un~
8-
nbproject
9-
doc/html/
10-
tmp/
11-
zf-mkdoc-theme/
12-
13-
clover.xml
14-
coveralls-upload.json
15-
phpunit.xml
16-
vendor
1+
/clover.xml
2+
/coveralls-upload.json
3+
/docs/html/
4+
/phpunit.xml
5+
/vendor/
6+
/zf-mkdoc-theme.tgz
7+
/zf-mkdoc-theme/

.travis.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@ sudo: false
22

33
language: php
44

5-
branches:
6-
except:
7-
- /^release-\d+\.\d+\.\d+.*$/
8-
- /^ghgfk-.*$/
9-
105
cache:
116
directories:
127
- $HOME/.composer/cache
138

149
env:
1510
global:
1611
- COMPOSER_ARGS="--no-interaction"
12+
- COVERAGE_DEPS="php-coveralls/php-coveralls"
1713

1814
matrix:
1915
include:
@@ -27,14 +23,12 @@ matrix:
2723
- php: 5.6
2824
env:
2925
- DEPS=latest
30-
- TEST_COVERAGE=true
3126
- php: 7
3227
env:
3328
- DEPS=lowest
3429
- php: 7
3530
env:
3631
- DEPS=locked
37-
- CS_CHECK=true
3832
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
3933
- php: 7
4034
env:
@@ -45,6 +39,8 @@ matrix:
4539
- php: 7.1
4640
env:
4741
- DEPS=locked
42+
- CS_CHECK=true
43+
- TEST_COVERAGE=true
4844
- php: 7.1
4945
env:
5046
- DEPS=latest
@@ -69,9 +65,6 @@ matrix:
6965
allow_failures:
7066
- php: hhvm
7167

72-
notifications:
73-
email: false
74-
7568
before_install:
7669
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
7770

@@ -80,12 +73,15 @@ install:
8073
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
8174
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
8275
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
83-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev $COMPOSER_ARGS php-coveralls/php-coveralls:^2.0 ; fi
76+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
8477
- stty cols 120 && composer show
8578

8679
script:
8780
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
8881
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
8982

9083
after_script:
91-
- if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/php-coveralls -v ; fi
84+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
85+
86+
notifications:
87+
email: false

CHANGELOG.md

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

6161
### Fixed
6262

63-
- [#27](https://github.com/zendframework/zend-xmlrpc/pull/19) fixed a memory leak
63+
- [#27](https://github.com/zendframework/zend-xmlrpc/pull/27) fixed a memory leak
6464
caused by repetitive addition of `Accept` and `Content-Type` headers on subsequent
6565
HTTP requests produced by the `Zend\XmlRpc\Client`.
6666

LICENSE.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
2-
1+
Copyright (c) 2005-2018, Zend Technologies USA, Inc.
32
All rights reserved.
43

54
Redistribution and use in source and binary forms, with or without modification,
65
are permitted provided that the following conditions are met:
76

8-
- Redistributions of source code must retain the above copyright notice,
9-
this list of conditions and the following disclaimer.
7+
- Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
109

11-
- Redistributions in binary form must reproduce the above copyright notice,
12-
this list of conditions and the following disclaimer in the documentation
13-
and/or other materials provided with the distribution.
10+
- Redistributions in binary form must reproduce the above copyright notice, this
11+
list of conditions and the following disclaimer in the documentation and/or
12+
other materials provided with the distribution.
1413

1514
- Neither the name of Zend Technologies USA, Inc. nor the names of its
1615
contributors may be used to endorse or promote products derived from this

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# zend-xmlrpc
22

33
[![Build Status](https://secure.travis-ci.org/zendframework/zend-xmlrpc.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-xmlrpc)
4-
[![Coverage Status](https://coveralls.io/repos/zendframework/zend-xmlrpc/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-xmlrpc?branch=master)
4+
[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-xmlrpc/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-xmlrpc?branch=master)
55

66
From its home page, XML-RPC is described as a ”...remote procedure calling using
77
HTTP as the transport and XML as the encoding. XML-RPC is designed to be as
@@ -12,4 +12,4 @@ processed and returned.”
1212
building new XML-RPC servers.
1313

1414
- File issues at https://github.com/zendframework/zend-xmlrpc/issues
15-
- Documentation is at https://zendframework.github.io/zend-xmlrpc/
15+
- Documentation is at https://docs.zendframework.com/zend-xmlrpc/

composer.json

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
{
22
"name": "zendframework/zend-xmlrpc",
3-
"description": " ",
3+
"description": "Fully-featured XML-RPC server and client implementations",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"xmlrpc"
89
],
9-
"homepage": "https://github.com/zendframework/zend-xmlrpc",
10-
"autoload": {
11-
"psr-4": {
12-
"Zend\\XmlRpc\\": "src/"
13-
}
14-
},
15-
"autoload-dev": {
16-
"psr-4": {
17-
"ZendTest\\XmlRpc\\": "test/"
18-
},
19-
"files": [
20-
"test/autoload.php",
21-
"test/TestAsset/functions.php"
22-
]
10+
"support": {
11+
"docs": "https://docs.zendframework.com/zend-xmlrpc/",
12+
"issues": "https://github.com/zendframework/zend-xmlrpc/issues",
13+
"source": "https://github.com/zendframework/zend-xmlrpc",
14+
"rss": "https://github.com/zendframework/zend-xmlrpc/releases.atom",
15+
"chat": "https://zendframework-slack.herokuapp.com",
16+
"forum": "https://discourse.zendframework.com/c/questions/components"
2317
},
2418
"require": {
2519
"php": "^5.6 || ^7.0",
@@ -30,14 +24,29 @@
3024
"zendframework/zendxml": "^1.0.2"
3125
},
3226
"require-dev": {
33-
"phpunit/PHPUnit": "^5.7.25 || ^6.4.4",
27+
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
3428
"zendframework/zend-coding-standard": "~1.0.0"
3529
},
3630
"suggest": {
3731
"zendframework/zend-cache": "To support Zend\\XmlRpc\\Server\\Cache usage"
3832
},
39-
"minimum-stability": "dev",
40-
"prefer-stable": true,
33+
"autoload": {
34+
"psr-4": {
35+
"Zend\\XmlRpc\\": "src/"
36+
}
37+
},
38+
"autoload-dev": {
39+
"psr-4": {
40+
"ZendTest\\XmlRpc\\": "test/"
41+
},
42+
"files": [
43+
"test/autoload.php",
44+
"test/TestAsset/functions.php"
45+
]
46+
},
47+
"config": {
48+
"sort-packages": true
49+
},
4150
"extra": {
4251
"branch-alias": {
4352
"dev-master": "2.6.x-dev",
@@ -49,10 +58,9 @@
4958
"@cs-check",
5059
"@test"
5160
],
52-
"upload-coverage": "coveralls -v",
5361
"cs-check": "phpcs",
5462
"cs-fix": "phpcbf",
55-
"test": "phpunit",
56-
"test-coverage": "phpunit --coverage-clover clover.xml"
63+
"test": "phpunit --colors=always",
64+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
5765
}
5866
}

0 commit comments

Comments
 (0)