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

Commit 5c93fbe

Browse files
committed
Merge branch 'hotfix/23'
Close #23
2 parents 1891a74 + cd8dff9 commit 5c93fbe

9 files changed

+919
-893
lines changed

.gitattributes

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
/docs export-ignore
2-
/test export-ignore
31
/.coveralls.yml export-ignore
42
/.gitattributes export-ignore
53
/.gitignore export-ignore
64
/.travis.yml export-ignore
75
/composer.lock export-ignore
6+
/docs/ export-ignore
87
/mkdocs.yml export-ignore
98
/phpcs.xml export-ignore
109
/phpunit.xml.dist export-ignore
10+
/test/ export-ignore

.gitignore

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
docs/html/
2-
vendor/
3-
phpunit.xml
4-
zf-mkdoc-theme/
5-
clover.xml
6-
coveralls-upload.json
7-
zf-mkdoc-theme.tgz
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

+2-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ language: php
55
cache:
66
directories:
77
- $HOME/.composer/cache
8-
- vendor
98

109
env:
1110
global:
@@ -34,19 +33,16 @@ matrix:
3433
- php: 7.2
3534
env:
3635
- DEPS=latest
37-
allow_failures:
38-
- php: 7.2
3936

4037
before_install:
4138
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
42-
- travis_retry composer self-update
4339

4440
install:
45-
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
41+
- travis_retry composer install $COMPOSER_ARGS
4642
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
4743
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
4844
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
49-
- composer show
45+
- stty cols 120 && composer show
5046

5147
script:
5248
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi

composer.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "zendframework/zend-problem-details",
33
"description": "Problem Details for PSR-7 HTTP APIs",
4-
"type": "library",
54
"license": "BSD-3-Clause",
65
"keywords": [
76
"api",
@@ -14,16 +13,15 @@
1413
"docs": "https://docs.zendframework.com/zend-problem-details/",
1514
"issues": "https://github.com/zendframework/zend-problem-details/issues",
1615
"source": "https://github.com/zendframework/zend-problem-details",
16+
"rss": "https://github.com/zendframework/zend-problem-details/releases.atom",
1717
"slack": "https://zendframework-slack.herokuapp.com",
1818
"forum": "https://discourse.zendframework.com/c/questions/expressive"
1919
},
20-
"config": {
21-
"sort-packages": true
22-
},
2320
"require": {
2421
"php": "^7.1",
2522
"ext-json": "*",
2623
"fig/http-message-util": "^1.1.2",
24+
"http-interop/http-middleware": "^0.4.1",
2725
"psr/container": "^1.0",
2826
"psr/http-message": "^1.0",
2927
"spatie/array-to-xml": "^2.3",
@@ -45,9 +43,15 @@
4543
"ZendTest\\ProblemDetails\\": "test/"
4644
}
4745
},
46+
"config": {
47+
"sort-packages": true
48+
},
4849
"extra": {
4950
"zf": {
5051
"config-provider": "Zend\\ProblemDetails\\ConfigProvider"
52+
},
53+
"branch-alias": {
54+
"dev-master": "1.0-dev"
5155
}
5256
},
5357
"scripts": {

0 commit comments

Comments
 (0)