Merge branch 'feature/zend-expressive-router-3-series' into develop

Close #25
zendframework · Dec 5, 2017 · 07d24ff · 07d24ff
2 parents 04b120d + 903ba0e
commit 07d24ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,17 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.1.0 - TBD
+## 2.1.0 - 2017-12-05
 
 ### Added
 
 - [#23](https://github.com/zendframework/zend-expressive-aurarouter/pull/23)
   adds support for PHP 7.2.
 
+- [#25](https://github.com/zendframework/zend-expressive-aurarouter/pull/25)
+  adds support for the 3.0.0-dev series of zend-expressive-router, which has an
+  API that is compatible with the 2.X series.
+
 ### Deprecated
 
 - Nothing.

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "aura/router": "^3.0.1",
         "fig/http-message-util": "^1.1.2",
         "psr/http-message": "^1.0.1",
-        "zendframework/zend-expressive-router": "^2.1"
+        "zendframework/zend-expressive-router": "^2.1 || ^3.0.0-dev || ^3.0.0"
     },
     "require-dev": {
         "malukenho/docheader": "^0.1.5",