Removed all console-related functionality

zend-mvc-console now provides all console-related integration between zend-mvc,
zend-router, and zend-view, allowing it to be removed from this component. Doing
this as part of the zend-router removal, as otherwise you cannot actually route
to console-related controllers.

Author: weierophinney

composer.json

@@ -16,6 +16,7 @@
         "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",
@@ -26,10 +27,8 @@
     "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",
@@ -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,6 +55,7 @@
         "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",

composer.lock

@@ -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]);
-    }
 }

src/Controller/AbstractActionController.php

@@ -40,7 +40,6 @@
  * @method \Zend\Http\Response|array postRedirectGet(string $redirect = null, bool $redirectToUrl = false)
  * @method \Zend\Mvc\Controller\Plugin\Redirect redirect()
  * @method \Zend\Mvc\Controller\Plugin\Url url()
- * @method \Zend\View\Model\ConsoleModel createConsoleNotFoundModel()
  * @method \Zend\View\Model\ViewModel createHttpNotFoundModel(Response $response)
  */
 abstract class AbstractController implements

src/Controller/AbstractConsoleController.php

@@ -52,7 +52,6 @@ class ControllerManager extends AbstractPluginManager
     public function __construct($configOrContainerInstance, array $v3config = [])
     {
         $this->addInitializer([$this, 'injectEventManager']);
-        $this->addInitializer([$this, 'injectConsole']);
         $this->addInitializer([$this, 'injectPluginManager']);
         parent::__construct($configOrContainerInstance, $v3config);
 
@@ -137,36 +136,6 @@ public function injectEventManager($first, $second)
         }
     }
 
-    /**
-     * Initializer: inject Console adapter instance
-     *
-     * @param ContainerInterface|DispatchableInterface $first Container when
-     *     using zend-servicemanager v3; controller under v2.
-     * @param DispatchableInterface|ContainerInterface $second Controller when
-     *     using zend-servicemanager v3; container under v2.
-     */
-    public function injectConsole($first, $second)
-    {
-        if ($first instanceof ContainerInterface) {
-            $container = $first;
-            $controller = $second;
-        } else {
-            $container = $second;
-            $controller = $first;
-        }
-
-        if (! $controller instanceof AbstractConsoleController) {
-            return;
-        }
-
-        // For v2, we need to pull the parent service locator
-        if (! method_exists($container, 'configure')) {
-            $container = $container->getServiceLocator() ?: $container;
-        }
-
-        $controller->setConsole($container->get('Console'));
-    }
-
     /**
      * Initializer: inject plugin manager
      *

src/Controller/AbstractController.php

@@ -63,9 +63,6 @@ class PluginManager extends AbstractPluginManager
         'CreateHttpNotFoundModel'     => Plugin\CreateHttpNotFoundModel::class,
         'createHttpNotFoundModel'     => Plugin\CreateHttpNotFoundModel::class,
         'createhttpnotfoundmodel'     => Plugin\CreateHttpNotFoundModel::class,
-        'CreateConsoleNotFoundModel'  => Plugin\CreateConsoleNotFoundModel::class,
-        'createConsoleNotFoundModel'  => Plugin\CreateConsoleNotFoundModel::class,
-        'createconsolenotfoundmodel'  => Plugin\CreateConsoleNotFoundModel::class,
     ];
 
     /**
@@ -83,7 +80,6 @@ class PluginManager extends AbstractPluginManager
         Plugin\Redirect::class                    => InvokableFactory::class,
         Plugin\Url::class                         => InvokableFactory::class,
         Plugin\CreateHttpNotFoundModel::class     => InvokableFactory::class,
-        Plugin\CreateConsoleNotFoundModel::class  => InvokableFactory::class,
 
         // v2 normalized names
 
@@ -98,7 +94,6 @@ class PluginManager extends AbstractPluginManager
         'zendmvccontrollerpluginredirect'                    => InvokableFactory::class,
         'zendmvccontrollerpluginurl'                         => InvokableFactory::class,
         'zendmvccontrollerplugincreatehttpnotfoundmodel'     => InvokableFactory::class,
-        'zendmvccontrollerplugincreateconsolenotfoundmodel'  => InvokableFactory::class,
     ];
 
     /**