Merge branch 'hotfix/435'

Close #435
Fixes #434

Author: weierophinney

CHANGELOG.md

@@ -39,6 +39,10 @@ All notable changes to this project will be documented in this file, in reverse
   forwards-compatibility measure for the upcoming version 2.0.0. Currently,
   it proxies to `getFinalHandler()`.
 
+- [#435](https://github.com/zendframework/zend-expressive/pull/435) adds support
+  for the 2.X versions of zend-expressive-router and the various router
+  implementations. This change also allows usage of zend-expressive-helpers 3.X.
+
 ### Changed
 
 - [#429](https://github.com/zendframework/zend-expressive/pull/429) updates the

composer.json

@@ -20,17 +20,17 @@
         "container-interop/container-interop": "^1.1",
         "psr/http-message": "^1.0",
         "zendframework/zend-diactoros": "^1.1",
-        "zendframework/zend-expressive-router": "^1.1",
+        "zendframework/zend-expressive-router": "^1.1 || ^2.0",
         "zendframework/zend-expressive-template": "^1.0.1",
         "zendframework/zend-stratigility": "^1.3.3"
     },
     "require-dev": {
         "filp/whoops": "^1.1 || ^2.0",
         "phpunit/phpunit": "^4.7",
         "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-expressive-aurarouter": "^1.0",
-        "zendframework/zend-expressive-fastroute": "^1.0",
-        "zendframework/zend-expressive-zendrouter": "^1.0",
+        "zendframework/zend-expressive-aurarouter": "^1.0 || ^2.0",
+        "zendframework/zend-expressive-fastroute": "^1.0 || ^2.0",
+        "zendframework/zend-expressive-zendrouter": "^1.0 || ^2.0",
         "zendframework/zend-servicemanager": "^2.6",
         "malukenho/docheader": "^0.1.5",
         "mockery/mockery": "^0.9.5"