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

Commit 2d0f369

Browse files
committed
Merge branch 'feature/modernize-package'
Close #89
2 parents d27aa06 + 07a84bc commit 2d0f369

File tree

117 files changed

+4023
-2710
lines changed

Some content is hidden

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

117 files changed

+4023
-2710
lines changed

.coveralls.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
coverage_clover: clover.xml
2+
json_path: coveralls-upload.json

.gitattributes

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

.gitignore

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
.buildpath
2-
.DS_Store
3-
.idea
4-
.project
5-
.settings/
6-
.*.sw*
7-
.*.un~
8-
build/
9-
nbproject
10-
tmp/
11-
vendor/
12-
composer.phar
13-
php-cs-fixer.phar
1+
/clover.xml
2+
/coveralls-upload.json
3+
/docs/html/
4+
/phpunit.xml
5+
/vendor/

.travis.yml

Lines changed: 65 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,80 @@
1+
sudo: false
2+
13
language: php
24

5+
cache:
6+
directories:
7+
- $HOME/.composer/cache
8+
39
services:
410
- redis-server
511
- rabbitmq
612

7-
sudo: false
8-
9-
cache:
10-
directories:
11-
- $HOME/.composer/cache
13+
env:
14+
global:
15+
- COMPOSER_ARGS="--no-interaction"
16+
- COVERAGE_DEPS="php-coveralls/php-coveralls"
1217

13-
php:
14-
- 5.6
15-
- 7.0
16-
- 7.1
17-
- 7.2
18+
matrix:
19+
include:
20+
- php: 5.6
21+
env:
22+
- DEPS=lowest
23+
- php: 5.6
24+
env:
25+
- DEPS=locked
26+
- LEGACY_DEPS="phpunit/phpunit"
27+
- php: 5.6
28+
env:
29+
- DEPS=latest
30+
- php: 7
31+
env:
32+
- DEPS=lowest
33+
- php: 7
34+
env:
35+
- DEPS=locked
36+
- LEGACY_DEPS="phpunit/phpunit"
37+
- php: 7
38+
env:
39+
- DEPS=latest
40+
- php: 7.1
41+
env:
42+
- DEPS=lowest
43+
- php: 7.1
44+
env:
45+
- DEPS=locked
46+
- CS_CHECK=true
47+
- TEST_COVERAGE=true
48+
- php: 7.1
49+
env:
50+
- DEPS=latest
51+
- php: 7.2
52+
env:
53+
- DEPS=lowest
54+
- php: 7.2
55+
env:
56+
- DEPS=locked
57+
- php: 7.2
58+
env:
59+
- DEPS=latest
1860

1961
before_install:
20-
- composer self-update
21-
- phpenv config-rm xdebug.ini
22-
- composer require --no-update fabpot/php-cs-fixer:1.9.*
62+
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
2363

24-
install: composer update $COMPOSER_FLAGS --prefer-dist
64+
install:
65+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
66+
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
67+
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
68+
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
69+
- stty cols 120 && composer show
2570

2671
script:
27-
- ./vendor/bin/phpunit -c ./tests/ --coverage-text
28-
- ./vendor/bin/php-cs-fixer fix -v --dry-run --level=psr2 .
72+
- if [[ $TEST_COVERAGE == 'true' ]]; then composer run-script test-coverage -- --verbose ; else composer run-script test -- --verbose ; fi
73+
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
74+
75+
after_script:
76+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
77+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry vendor/bin/php-coveralls -v ; fi
2978

3079
notifications:
31-
irc: "irc.freenode.org#zftalk.dev"
3280
email: false

.zf-mkdoc-theme-landing

Whitespace-only changes.

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file, in reverse chronological order by release.
4+
5+
Releases prior to 1.2.0 did not have entries.
6+
7+
## 1.2.0 - TBD
8+
9+
### Added
10+
11+
- [#89](https://github.com/zendframework/zenddiagnostics/pull/89) adds full documentation at https://docs.zendframework.com/zend-diagnostics
12+
13+
- [#89](https://github.com/zendframework/zenddiagnostics/pull/89) adds support for Guzzle 6. While support was previously
14+
added, it included syntax that emitted deprecation notices; it now
15+
correctly uses the Guzzle HTTP client.
16+
17+
### Changed
18+
19+
- Nothing.
20+
21+
### Deprecated
22+
23+
- Nothing.
24+
25+
### Removed
26+
27+
- [#89](https://github.com/zendframework/zenddiagnostics/pull/89) removes support for Guzzle versions 3 and 4 when using the
28+
Guzzle HTTP checks. Guzzle 3 has been EOL for approximately 5 years, while version
29+
4 is incompatible with PHP versions 7.1 and 7.2 due to a syntax issue that only
30+
those versions detect correctly. Since version 5 has been available for almost 4
31+
years, users who are on older versions should upgrade.
32+
33+
### Fixed
34+
35+
- Nothing.

LICENSE.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Copyright (c) 2013-2018, Zend Technologies USA, Inc.
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without modification,
5+
are permitted provided that the following conditions are met:
6+
7+
- Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
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.
13+
14+
- Neither the name of Zend Technologies USA, Inc. nor the names of its
15+
contributors may be used to endorse or promote products derived from this
16+
software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
22+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
25+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)