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

Add integration tests #325

Merged
merged 9 commits into from Sep 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions .travis.yml
Expand Up @@ -9,7 +9,6 @@ cache:
env:
global:
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="php-coveralls/php-coveralls"
- LEGACY_DEPS="phpunit/phpunit"

matrix:
Expand All @@ -31,6 +30,7 @@ matrix:
- DEPS=locked
- CHECK_CS=true
- TEST_COVERAGE=true
- INTEGRATION_DEPS="php-coveralls/php-coveralls"
- php: 7
env:
- DEPS=latest
Expand All @@ -52,6 +52,10 @@ matrix:
- php: 7.2
env:
- DEPS=latest
- php: 7.2
name: Integration tests
env:
- INTEGRATION_DEPS="http-interop/http-factory-diactoros"

before_install:
- if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
Expand All @@ -62,7 +66,7 @@ install:
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
- if [[ $INTEGRATION_DEPS != '' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $INTEGRATION_DEPS ; fi
- stty cols 120 && composer show

script:
Expand Down
16 changes: 13 additions & 3 deletions CHANGELOG.md
Expand Up @@ -2,15 +2,21 @@

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

## 1.8.6 - TBD
## 1.8.6 - 2018-09-05

### Added

- Nothing.

### Changed

- Nothing.
- [#325](https://github.com/zendframework/zend-diactoros/pull/325) changes the behavior of `ServerRequest::withParsedBody()`. Per
- PSR-7, it now no longer allows values other than `null`, arrays, or objects.

- [#325](https://github.com/zendframework/zend-diactoros/pull/325) changes the behavior of each of `Request`, `ServerRequest`, and
`Response` in relation to the validation of header values. Previously, we
allowed empty arrays to be provided via `withHeader()`; however, this was
contrary to the PSR-7 specification. Empty arrays are no longer allowed.

### Deprecated

Expand All @@ -22,7 +28,11 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- Nothing.
- [#325](https://github.com/zendframework/zend-diactoros/pull/325) ensures that `Uri::withUserInfo()` no longer ignores values of
`0` (numeric zero).

- [#325](https://github.com/zendframework/zend-diactoros/pull/325) fixes how header values are merged when calling
`withAddedHeader()`, ensuring that array keys are ignored.

## 1.8.5 - 2018-08-10

Expand Down
1 change: 1 addition & 0 deletions composer.json
Expand Up @@ -30,6 +30,7 @@
"require-dev": {
"ext-dom": "*",
"ext-libxml": "*",
"php-http/psr7-integration-tests": "dev-master",
"phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
"zendframework/zend-coding-standard": "~1.0"
},
Expand Down