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

Commit 1c6659e

Browse files
weierophinneyweierophinney
committed
Merge pull request #26 from webimpress/php-7.2-qa-tools
PHP 7.2 + QA Tools (follow up #15, #16, #17, #22) Conflicts: CHANGELOG.md
2 parents 6a70504 + 1f54295 commit 1c6659e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1119
-789
lines changed

‎.gitattributes

+10-8
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

+7-16
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-
vendor/
12-
zf-mkdoc-theme/
13-
14-
clover.xml
15-
coveralls-upload.json
16-
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

+29-40
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,24 @@ 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-
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
19-
- SITE_URL=https://zendframework.github.io/zend-server
20-
- GH_USER_NAME="Matthew Weier O'Phinney"
21-
- [email protected]
22-
- GH_REF=github.com/zendframework/zend-server.git
23-
- secure: "mC9p7uCm+nD72XFKyMxK9AprWHl6xzq1iuz5Hg9AUpGxHskemnBugCWaet8YsZpIsEBlT6BWH0xzT3AB5RMYdLJS0ctV5xCEd2FccPPvEGdxmrGQZl+vIf60xOv8O+zy37gXOH5tmce+KMpGOsZ4Zz+4RKU5F3Lz2/AmrBUdKvA+k/ZGoHWQfTfBugi5ej0hU+yzsmk6qbw7Q9ViuuLY3OsTTnLQKXGDk+7pvYBpfMpSOHZ5GL14ZYxC56k2PCjcKZIaev4Py8IqFJVXdnMxrqGWnt8bWxQkQaKLwZGtw3a8BVbgChixGNvdiZXd3EmK16xpNHhhGV75VVx6EBgEU7lfsv/2bAy/1KCUt79vLXB3awoex9+Yeof3fxNpldVNHb9x5XwxykRP1AXVkB6SSDrRovgtjqmCYN/97KMXwfLx6xD1OtIfztfIYQHd5WpU8ddLf2ObSsdzM8bTbcEuD9TUwwSeLYgRLzL4LjboRqR1bCtJ60VQge6Tpj8n0lMAnGnhvZoszQfO1YreHAeLeDMMmG+eCYx0RzLmwsac5jGB3OjcHde3NpxsCtX4Xcb91G3e+ZT1R1CaFA+en8rNqOdfWIJljyiIa5yC9ddt/DzruPQdoCBKLdcEhrUPTlzY74rnaR4VMuha19nG6PW+FqkqtFTuuaLTrtzdpldVv+o="
11+
- COMPOSER_ARGS="--no-interaction"
12+
- COVERAGE_DEPS="php-coveralls/php-coveralls"
2413

2514
matrix:
26-
fast_finish: true
2715
include:
2816
- php: 5.6
2917
env:
3018
- DEPS=lowest
3119
- php: 5.6
3220
env:
3321
- DEPS=locked
34-
- 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"
22+
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
3723
- php: 5.6
3824
env:
3925
- DEPS=latest
@@ -43,45 +29,48 @@ matrix:
4329
- php: 7
4430
env:
4531
- DEPS=locked
46-
- CS_CHECK=true
32+
- LEGACY_DEPS="phpunit/phpunit zendframework/zend-code"
4733
- php: 7
4834
env:
4935
- DEPS=latest
50-
- php: hhvm
36+
- php: 7.1
5137
env:
5238
- DEPS=lowest
53-
- php: hhvm
39+
- php: 7.1
5440
env:
5541
- DEPS=locked
56-
- php: hhvm
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
5754
env:
5855
- DEPS=latest
59-
allow_failures:
60-
- php: hhvm
61-
62-
notifications:
63-
irc: "irc.freenode.org#zftalk.dev"
64-
email: false
6556

6657
before_install:
67-
- travis_retry composer self-update
68-
- if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
58+
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
6959

7060
install:
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
7163
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
7264
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
73-
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
74-
- travis_retry composer install $COMPOSER_ARGS
75-
- composer show
65+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
66+
- stty cols 120 && composer show
7667

7768
script:
78-
- if [[ $TEST_COVERAGE == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
79-
- if [[ $TEST_COVERAGE != 'true' ]]; then ./vendor/bin/phpunit ; fi
80-
- if [[ $CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; 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
69+
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
70+
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
8571

8672
after_script:
87-
- if [[ $TEST_COVERAGE == 'true' ]]; then ./vendor/bin/coveralls ; fi
73+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
74+
75+
notifications:
76+
email: false

‎CHANGELOG.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file, in reverse
66

77
### Added
88

9+
- [#26](https://github.com/zendframework/zend-server/pull/26) adds support for PHP 7.1 and 7.2.
10+
911
- [#19](https://github.com/zendframework/zend-server/pull/19) adds the ability to register any PHP callable with `Zend\Server\Method\Callback`.
1012

1113
### Changed
@@ -18,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
1820

1921
### Removed
2022

21-
- Nothing.
23+
- [#26](https://github.com/zendframework/zend-server/pull/26) removes support for HHVM.
2224

2325
### Fixed
2426

‎LICENSE.md

+6-7
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# zend-server
22

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

66
The zend-server family of classes provides functionality for the various server
77
classes, including `Zend\XmlRpc\Server` and `Zend\Json\Server`.
@@ -10,4 +10,4 @@ all server classes should implement this interface in order to provide a standar
1010
server API.
1111

1212
- File issues at https://github.com/zendframework/zend-server/issues
13-
- Documentation is at https://zendframework.github.io/zend-server/
13+
- Documentation is at https://docs.zendframework.com/zend-server/

‎composer.json

+33-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
{
22
"name": "zendframework/zend-server",
3-
"description": " ",
3+
"description": "Create Reflection-based RPC servers",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"server"
89
],
9-
"homepage": "https://github.com/zendframework/zend-server",
10-
"extra": {
11-
"branch-alias": {
12-
"dev-master": "2.7-dev",
13-
"dev-develop": "2.8-dev"
14-
}
10+
"support": {
11+
"docs": "https://docs.zendframework.com/zend-server/",
12+
"issues": "https://github.com/zendframework/zend-server/issues",
13+
"source": "https://github.com/zendframework/zend-server",
14+
"rss": "https://github.com/zendframework/zend-server/releases.atom",
15+
"chat": "https://zendframework-slack.herokuapp.com",
16+
"forum": "https://discourse.zendframework.com/c/questions/components"
1517
},
1618
"require": {
1719
"php": "^5.6 || ^7.0",
18-
"zendframework/zend-stdlib": "^2.5 || ^3.0",
19-
"zendframework/zend-code": "^2.5 || ^3.0"
20+
"zendframework/zend-code": "^2.5 || ^3.0",
21+
"zendframework/zend-stdlib": "^2.5 || ^3.0"
2022
},
2123
"require-dev": {
22-
"phpunit/phpUnit": "^4.8",
23-
"squizlabs/php_codesniffer": "^2.3.1"
24+
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
25+
"zendframework/zend-coding-standard": "~1.0.0"
2426
},
2527
"autoload": {
2628
"psr-4": {
@@ -34,5 +36,24 @@
3436
"files": [
3537
"test/TestAsset/reflectionTestFunction.php"
3638
]
39+
},
40+
"config": {
41+
"sort-packages": true
42+
},
43+
"extra": {
44+
"branch-alias": {
45+
"dev-master": "2.7.x-dev",
46+
"dev-develop": "2.8.x-dev"
47+
}
48+
},
49+
"scripts": {
50+
"check": [
51+
"@cs-check",
52+
"@test"
53+
],
54+
"cs-check": "phpcs",
55+
"cs-fix": "phpcbf",
56+
"test": "phpunit --colors=always",
57+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
3758
}
3859
}

0 commit comments

Comments
 (0)