Merging develop to master in preparation for 1.1.0 release.

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.1.0 - 2019-02-19
+
+### Added
+
+- [#10](https://github.com/zendframework/zend-httphandlerrunner/pull/10) adds support for zend-diactoros v2 releases.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.0.2 - 2019-02-19
 
 ### Added

composer.json

@@ -27,7 +27,7 @@
     "require-dev": {
         "phpunit/phpunit": "^7.0.2",
         "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-diactoros": "^1.7"
+        "zendframework/zend-diactoros": "^1.7 || ^2.1.1"
     },
     "autoload": {
         "psr-4": {
@@ -47,7 +47,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.1.x-dev",
+            "dev-develop": "1.2.x-dev"
         },
         "zf": {
             "config-provider": "Zend\\HttpHandlerRunner\\ConfigProvider"