Merge branch 'hotfix/233' into release-2.7

Close #233
zendframework · Apr 27, 2017 · 9a02b4f · 9a02b4f
2 parents e0dd48d + a4ead90
commit 9a02b4f
Show file tree

Hide file tree

Showing 3 changed files with 742 additions and 382 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,12 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#233](https://github.com/zendframework/zend-mvc/pull/233) adds a `replace`
+  entry to the `composer.json` indicating the package replaces
+  zendframework/zend-router. This is done to prevent errors from installing both
+  zend-mvc v2 with zend-router, which could lead to subtle errors when checking
+  exceptions, locating route types, etc. Users should upgrade to zend-mvc v3 if
+  they wish to use the standalone zend-router package.
 
 ### Deprecated
 

diff --git a/composer.json b/composer.json
@@ -45,6 +45,9 @@
         "phpunit/PHPUnit": "^4.5",
         "sebastian/version": "^1.0.4"
     },
+    "replace": {
+        "zendframework/zend-router": "^2.0"
+    },
     "suggest": {
         "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
         "zendframework/zend-config": "Zend\\Config component",