Merge branch 'feature/zend-router' into develop

Close #99

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,13 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.8.0 - TBD
+## 3.0.0 - TBD
+
+New major version! Please see:
+
+- [doc/book/migration/to-v3-0.md](doc/book/migration/to-v3-0.md)
+
+for full details on how to migrate your v2 application.
 
 ### Added
 
@@ -14,7 +20,19 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#99](https://github.com/zendframework/zend-mvc/pull/99) removes all router
+  functionality (everything in the `Zend\Mvc\Router` namespace. This
+  functionality is now provided by the [zend-router](https://zendframework.github.io/zend-router/)
+  component, which becomes a requirement of zend-mvc. The removal also includes
+  all service factories related to routing, as they are provided by zend-router.
+- [#99](https://github.com/zendframework/zend-mvc/pull/99) removes all
+  console-related functionality, including the `AbstractConsoleController`, the
+  `CreateConsoleNotFoundModel` controller plugin, the `ConsoleResponseSender`,
+  and all classes under the `Zend\Mvc\View\Console` namespace; these are now
+  provided by the [zend-mvc-console](https://zendframework.github.io/zend-mvc-console/)
+  component. (That component also includes console-specific routes, which were
+  removed from zend-router.) All service factories related to console
+  functionality are also now provided by zend-mvc-console.
 
 ### Fixed
 

composer.json

@@ -16,19 +16,19 @@
         "php": "^5.5 || ^7.0",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-hydrator": "^1.1 || ^2.1",
         "zendframework/zend-form": "^2.7",
+        "zendframework/zend-router": "^3.0",
         "zendframework/zend-stdlib": "^2.7.5 || ^3.0",
         "zendframework/zend-psr7bridge": "^0.2",
         "container-interop/container-interop": "^1.1"
     },
     "require-dev": {
         "zendframework/zend-authentication": "^2.5.3",
         "zendframework/zend-cache": "^2.6.1",
-        "zendframework/zend-console": "^2.6",
         "zendframework/zend-di": "^2.6",
         "zendframework/zend-filter": "^2.6.1",
-        "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-i18n": "^2.6",
         "zendframework/zend-inputfilter": "^2.6",
         "zendframework/zend-json": "^2.6.1",
@@ -37,7 +37,6 @@
         "zendframework/zend-session": "^2.6.2",
         "zendframework/zend-serializer": "^2.6.1",
         "zendframework/zend-text": "^2.6",
-        "zendframework/zend-uri": "^2.5",
         "zendframework/zend-validator": "^2.6",
         "zendframework/zend-version": "^2.5",
         "zendframework/zend-view": "^2.6.3",
@@ -48,7 +47,6 @@
     "suggest": {
         "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
         "zendframework/zend-config": "Zend\\Config component",
-        "zendframework/zend-console": "Zend\\Console component",
         "zendframework/zend-di": "Zend\\Di component",
         "zendframework/zend-filter": "Zend\\Filter component",
         "zendframework/zend-http": "Zend\\Http component",
@@ -57,18 +55,18 @@
         "zendframework/zend-json": "Zend\\Json component",
         "zendframework/zend-log": "Zend\\Log component",
         "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
+        "zendframework/zend-mvc-console": "zend-mvc-console provides the ability to expose zend-mvc as a console application",
         "zendframework/zend-serializer": "Zend\\Serializer component",
         "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
         "zendframework/zend-text": "Zend\\Text component",
-        "zendframework/zend-uri": "Zend\\Uri component",
         "zendframework/zend-validator": "Zend\\Validator component",
         "zendframework/zend-version": "Zend\\Version component",
         "zendframework/zend-view": "Zend\\View component"
     },
     "extra": {
         "branch-alias": {
             "dev-master": "2.7-dev",
-            "dev-develop": "2.8-dev"
+            "dev-develop": "3.0-dev"
         }
     },
     "autoload-dev": {

composer.lock

@@ -0,0 +1,12 @@
+# Migration
+
+While we strive to keep functionality backwards compatible between releases,
+occasionally we need to break features in order to fix critical or security
+issues. Additionally, in order to signal upcoming changes, we will introduce
+deprecation notices or add forwards-compatibility features to assist you in
+migration.
+
+The chapters in this section document these changes.
+
+- [Migrating from v2.X to v2.7](to-v2-7.md)
+- [Migrating to v3.0](to-v3-0.md)