Merge pull request #233 from boesing/enhancement/replace-zend-router

Ensure that we replace `zendframework/zend-router` due to class confl… Conflicts: composer.lock
zendframework · Apr 27, 2017 · e934b2c · e934b2c
2 parents e0dd48d + 814020d
commit e934b2c
Show file tree

Hide file tree

Showing 2 changed files with 736 additions and 381 deletions.
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",