Merge branch 'feature/325-integration-tests' into develop

Forward port #325

Conflicts:
	CHANGELOG.md

.travis.yml

@@ -9,7 +9,6 @@ cache:
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="php-coveralls/php-coveralls"
     - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
@@ -31,6 +30,7 @@ matrix:
         - DEPS=locked
         - CHECK_CS=true
         - TEST_COVERAGE=true
+        - INTEGRATION_DEPS="php-coveralls/php-coveralls"
     - php: 7
       env:
         - DEPS=latest
@@ -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
@@ -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:

CHANGELOG.md

@@ -24,6 +24,49 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 1.8.6 - 2018-09-05
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#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
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#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
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+<<<<<<< HEAD
 ## 1.8.6 - TBD
 
 ### Added
@@ -56,6 +99,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+=======
+>>>>>>> feature/325-integration-tests
 ### Deprecated
 
 - Nothing.

composer.json

@@ -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"
   },