Consume zend-router and remove internal Router subcomponent

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,10 +55,10 @@
         "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"

src/Controller/AbstractActionController.php

@@ -9,7 +9,6 @@
 
 namespace Zend\Mvc\Controller;
 
-use Zend\Http\Response as HttpResponse;
 use Zend\Mvc\Exception;
 use Zend\Mvc\MvcEvent;
 use Zend\View\Model\ViewModel;
@@ -43,15 +42,12 @@ public function indexAction()
      */
     public function notFoundAction()
     {
-        $response   = $this->response;
         $event      = $this->getEvent();
         $routeMatch = $event->getRouteMatch();
         $routeMatch->setParam('action', 'not-found');
 
-        if ($response instanceof HttpResponse) {
-            return $this->createHttpNotFoundModel($response);
-        }
-        return $this->createConsoleNotFoundModel($response);
+        $helper = $this->plugin('createHttpNotFoundModel');
+        return $helper($event->getResponse());
     }
 
     /**
@@ -85,26 +81,4 @@ public function onDispatch(MvcEvent $e)
 
         return $actionResponse;
     }
-
-    /**
-     * @deprecated please use the {@see \Zend\Mvc\Controller\Plugin\CreateHttpNotFoundModel} plugin instead: this
-     *             method will be removed in release 2.5 or later.
-     *
-     * {@inheritDoc}
-     */
-    protected function createHttpNotFoundModel(HttpResponse $response)
-    {
-        return $this->__call('createHttpNotFoundModel', [$response]);
-    }
-
-    /**
-     * @deprecated please use the {@see \Zend\Mvc\Controller\Plugin\CreateConsoleNotFoundModel} plugin instead: this
-     *             method will be removed in release 2.5 or later.
-     *
-     * {@inheritDoc}
-     */
-    protected function createConsoleNotFoundModel($response)
-    {
-        return $this->__call('createConsoleNotFoundModel', [$response]);
-    }
 }