Thanks to visit codestin.com
Credit goes to github.com

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

Commit 1f9a6c3

Browse files
weierophinneyweierophinney
committed
Merging develop to master in preparation for 3.1.0 release
2 parents 3509fd7 + daf98d9 commit 1f9a6c3

35 files changed

+2446
-255
lines changed

‎.coveralls.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
coverage_clover: clover.xml
22
json_path: coveralls-upload.json
3-
src_dir: src

‎.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-
phpcs.xml 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 & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +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-
vendor/
12-
zf-mkdoc-theme/
13-
14-
clover.xml
15-
composer.lock
16-
coveralls-upload.json
17-
phpunit.xml
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: 50 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,75 @@ sudo: false
22

33
language: php
44

5-
branches:
6-
except:
7-
- /^release-.*$/
8-
- /^ghgfk-.*$/
9-
105
cache:
116
directories:
127
- $HOME/.composer/cache
13-
- $HOME/.local
14-
- zf-mkdoc-theme
158

169
env:
1710
global:
18-
- SITE_URL=https://zendframework.github.io/zend-json-server
19-
- GH_USER_NAME="Matthew Weier O'Phinney"
20-
- [email protected]
21-
- GH_REF=github.com/zendframework/zend-json-server.git
22-
- secure: "HY4Zd9s8DQ1Qp2Ru2RwnTY67CxQ0ckdpBlt02QXvIKh8HMjwb5EochsQv0uj1Q2c5WigBLIHKN3Tv4WoCkSncDBsPR242vC02X9v78ZOZRirsicw/PES4cQ67/qT+biFXeM3wW9ME4DbSAcV5esL934wN99fCfNoPGkCLpL7LoNFUKf7medLJ72xulNP7mXpQOQCPBuB9ZixtItCO/DW9XouZ32ckoPjJiM6FSPszVbMyItK2+rNWjQ9BsxIGQsdPoX+jths8oHrTJJ5jabFNh527Az+n3kPhHLXy1CpU8CMSXSXEFOLxeJfMgVw4XbsKFarKqVcRvsSVPo4M6NFHUNX7SmT9p0DxfMDbc2avhp8CfSuvn675wKLwg3P2htwB41eB6XkOwwE0PTcsDBCbk0Y2JHyEp5KTTbwUSSUNU3ISpGUO+KBU82dyeiTb/YPBmA5yFE9UgxGDcI7UqReqQNamNFkI2ns4OjCwIH0X1fzIb2OAA7wvOGKib9N/FP9dz+gXJ59cH0YRAeA4Kob0N3WqjMHF4noiBCkGiCUIUHr2Bi9ceZnf4qDEKxbp3MFN7nKdfgiJQ1aU9ZLvjqhYCsW/8mx+7KNtjRF5tUtMQDrsJXt34pIoPmj0IudJQQx98xAPpWpZx7Czbrd53dkwEzqdcTHDMS3bfuqIKcrp60="
11+
- COMPOSER_ARGS="--no-interaction"
12+
- COVERAGE_DEPS="php-coveralls/php-coveralls"
2313

2414
matrix:
25-
fast_finish: true
2615
include:
27-
- php: 5.5
16+
- php: 5.6
17+
env:
18+
- DEPS=lowest
19+
- php: 5.6
2820
env:
29-
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
30-
- PATH="$HOME/.local/bin:$PATH"
21+
- DEPS=locked
22+
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
3123
- php: 5.6
3224
env:
33-
- EXECUTE_TEST_COVERALLS=true
25+
- DEPS=latest
3426
- php: 7
3527
env:
36-
- EXECUTE_CS_CHECK=true
37-
- php: hhvm
38-
allow_failures:
39-
- php: hhvm
40-
41-
notifications:
42-
irc: "irc.freenode.org#zftalk.dev"
43-
email: false
28+
- DEPS=lowest
29+
- php: 7
30+
env:
31+
- DEPS=locked
32+
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
33+
- php: 7
34+
env:
35+
- DEPS=latest
36+
- php: 7.1
37+
env:
38+
- DEPS=lowest
39+
- php: 7.1
40+
env:
41+
- DEPS=locked
42+
- CS_CHECK=true
43+
- TEST_COVERAGE=true
44+
- php: 7.1
45+
env:
46+
- DEPS=latest
47+
- php: 7.2
48+
env:
49+
- DEPS=lowest
50+
- php: 7.2
51+
env:
52+
- DEPS=locked
53+
- php: 7.2
54+
env:
55+
- DEPS=latest
4456

4557
before_install:
46-
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
47-
- travis_retry composer self-update
48-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
58+
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
4959

5060
install:
51-
- travis_retry composer install --no-interaction --ignore-platform-reqs
61+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
62+
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
63+
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
64+
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
65+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
66+
- stty cols 120 && composer show
5267

5368
script:
54-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer test-coverage ; fi
55-
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then composer test ; fi
56-
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs-check ; 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
69+
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
70+
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
6171

6272
after_script:
63-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer upload-coverage ; fi
73+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
74+
75+
notifications:
76+
email: false

‎CHANGELOG.md‎

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

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

5-
## 3.0.1 - TBD
5+
## 3.1.0 - TBD
66

77
### Added
88

9-
- Nothing.
9+
- [#13](https://github.com/zendframework/zend-json-server/pull/13) adds support for PHP 7.1 and 7.2.
1010

1111
### Changed
1212

@@ -19,7 +19,9 @@ All notable changes to this project will be documented in this file, in reverse
1919

2020
### Removed
2121

22-
- Nothing.
22+
- [#13](https://github.com/zendframework/zend-json-server/pull/13) removes support for PHP 5.5.
23+
24+
- [#13](https://github.com/zendframework/zend-json-server/pull/13) removes support for HHVM.
2325

2426
### Fixed
2527

‎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,9 +1,9 @@
11
# zend-json-server
22

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

66
Provides a JSON-RPC server implementation.
77

88
- File issues at https://github.com/zendframework/zend-json-server/issues
9-
- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-json-server
9+
- Documentation is at https://docs.zendframework.com/zend-json-server/

‎composer.json‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,60 @@
33
"description": "Zend Json-Server is a JSON-RPC server implementation.",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"json",
89
"server",
910
"json-server"
1011
],
11-
"homepage": "https://github.com/zendframework/zend-json-server",
12-
"extra": {
13-
"branch-alias": {
14-
"dev-master": "3.0-dev",
15-
"dev-develop": "3.1-dev"
16-
}
12+
"support": {
13+
"docs": "https://docs.zendframework.com/zend-json-server/",
14+
"issues": "https://github.com/zendframework/zend-json-server/issues",
15+
"source": "https://github.com/zendframework/zend-json-server",
16+
"rss": "https://github.com/zendframework/zend-json-server/releases.atom",
17+
"chat": "https://zendframework-slack.herokuapp.com",
18+
"forum": "https://discourse.zendframework.com/c/questions/components"
1719
},
1820
"require": {
19-
"php": "^5.5 || ^7.0",
21+
"php": "^5.6 || ^7.0",
22+
"zendframework/zend-http": "^2.7",
2023
"zendframework/zend-json": "^2.6.1 || ^3.0",
21-
"zendframework/zend-http": "^2.5.4",
22-
"zendframework/zend-server": "^2.6.1"
24+
"zendframework/zend-server": "^2.7"
2325
},
2426
"require-dev": {
25-
"squizlabs/php_codesniffer": "^2.3",
26-
"phpunit/PHPUnit": "~4.0"
27+
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
28+
"zendframework/zend-coding-standard": "~1.0.0"
2729
},
2830
"autoload": {
2931
"psr-4": {
3032
"Zend\\Json\\Server\\": "src/"
3133
}
3234
},
3335
"autoload-dev": {
34-
"psr-4": {
35-
"ZendTest\\Json\\Server\\": "test/"
36-
},
3736
"files": [
3837
"test/TestAsset/FooFunc.php"
39-
]
38+
],
39+
"psr-4": {
40+
"ZendTest\\Json\\Server\\": "test/"
41+
}
42+
},
43+
"config": {
44+
"sort-packages": true
45+
},
46+
"extra": {
47+
"branch-alias": {
48+
"dev-master": "3.0.x-dev",
49+
"dev-develop": "3.1.x-dev"
50+
}
4051
},
4152
"scripts": {
4253
"check": [
4354
"@cs-check",
4455
"@test"
4556
],
46-
"upload-coverage": "coveralls",
4757
"cs-check": "phpcs",
48-
"cs-fix": "phpcbf fix -v",
49-
"test": "phpunit",
50-
"test-coverage": "phpunit --coverage-clover clover.xml"
58+
"cs-fix": "phpcbf",
59+
"test": "phpunit --colors=always",
60+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
5161
}
5262
}

0 commit comments

Comments
 (0)