Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit 9a02b4f

Browse files
committed
Merge branch 'hotfix/233' into release-2.7
Close #233
2 parents e0dd48d + a4ead90 commit 9a02b4f

File tree

3 files changed

+742
-382
lines changed

3 files changed

+742
-382
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ All notable changes to this project will be documented in this file, in reverse
66

77
### Added
88

9-
- Nothing.
9+
- [#233](https://github.com/zendframework/zend-mvc/pull/233) adds a `replace`
10+
entry to the `composer.json` indicating the package replaces
11+
zendframework/zend-router. This is done to prevent errors from installing both
12+
zend-mvc v2 with zend-router, which could lead to subtle errors when checking
13+
exceptions, locating route types, etc. Users should upgrade to zend-mvc v3 if
14+
they wish to use the standalone zend-router package.
1015

1116
### Deprecated
1217

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@
4545
"phpunit/PHPUnit": "^4.5",
4646
"sebastian/version": "^1.0.4"
4747
},
48+
"replace": {
49+
"zendframework/zend-router": "^2.0"
50+
},
4851
"suggest": {
4952
"zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
5053
"zendframework/zend-config": "Zend\\Config component",

0 commit comments

Comments
 (0)