!!!TASK: Remove deprecated Http objects and replace with PSR-7 implementation

Neos.Flow/Classes/Cli/CommandController.php

@@ -14,23 +14,19 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Command\HelpCommandController;
 use Neos\Flow\Mvc\Controller\Argument;
-use Neos\Flow\Mvc\Controller\ControllerInterface;
 use Neos\Flow\Mvc\Controller\Arguments;
 use Neos\Flow\Mvc\Exception\CommandException;
 use Neos\Flow\Mvc\Exception\InvalidArgumentTypeException;
 use Neos\Flow\Mvc\Exception\NoSuchCommandException;
-use Neos\Flow\Mvc\Exception\StopActionException;
-use Neos\Flow\Mvc\Exception\UnsupportedRequestTypeException;
-use Neos\Flow\Mvc\RequestInterface;
-use Neos\Flow\Mvc\ResponseInterface;
+use Neos\Flow\Cli\Exception\StopCommandException;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 
 /**
  * A controller which processes requests from the command line
  *
  * @Flow\Scope("singleton")
  */
-class CommandController implements ControllerInterface
+class CommandController implements CommandControllerInterface
 {
     /**
      * @var Request
@@ -106,18 +102,15 @@ public function injectObjectManager(ObjectManagerInterface $objectManager)
     /**
      * Processes a command line request.
      *
-     * @param RequestInterface $request The request object
-     * @param ResponseInterface $response The response, modified by this handler
+     * @param Request $request The request object
+     * @param Response $response The response, modified by this handler
      * @return void
-     * @throws UnsupportedRequestTypeException if the controller doesn't support the current request type
+     * @throws InvalidArgumentTypeException
+     * @throws NoSuchCommandException
      * @api
      */
-    public function processRequest(RequestInterface $request, ResponseInterface $response)
+    public function processRequest(Request $request, Response $response): void
     {
-        if (!$request instanceof Request) {
-            throw new UnsupportedRequestTypeException(sprintf('%s only supports command line requests – requests of type "%s" given.', get_class($this), get_class($request)), 1300787096);
-        }
-
         $this->request = $request;
         $this->request->setDispatched(true);
         $this->response = $response;
@@ -214,7 +207,7 @@ protected function mapRequestArgumentsToControllerArguments()
      * @param string $controllerObjectName
      * @param array $arguments
      * @return void
-     * @throws StopActionException
+     * @throws StopCommandException
      */
     protected function forward(string $commandName, string $controllerObjectName = null, array $arguments = [])
     {
@@ -226,7 +219,7 @@ protected function forward(string $commandName, string $controllerObjectName = n
         $this->request->setArguments($arguments);
 
         $this->arguments->removeAll();
-        throw new StopActionException();
+        throw new StopCommandException(sprintf('Forwarded to "%s".', $commandName));
     }
 
     /**
@@ -338,13 +331,13 @@ protected function outputFormatted(string $text = '', array $arguments = [], int
      * shutdown (such as the persistence framework), you must use quit() instead of exit().
      *
      * @param integer $exitCode Exit code to return on exit (see http://www.php.net/exit)
-     * @throws StopActionException
+     * @throws StopCommandException
      * @return void
      */
     protected function quit(int $exitCode = 0)
     {
         $this->response->setExitCode($exitCode);
-        throw new StopActionException;
+        throw new StopCommandException(sprintf('Quitting with exit code %s', $exitCode));
     }
 
     /**

Neos.Flow/Classes/Cli/CommandControllerInterface.php

@@ -0,0 +1,21 @@
+<?php
+namespace Neos\Flow\Cli;
+
+use Neos\Flow\Cli\Exception\StopCommandException;
+
+/**
+ * Transitional interface for command controllers.
+ * @internal
+ */
+interface CommandControllerInterface
+{
+    /**
+     * Processes a general request. The result can be returned by altering the given response.
+     *
+     * @param Request $request The request object
+     * @param Response $response The response, modified by the controller
+     * @return void
+     * @throws StopCommandException
+     */
+    public function processRequest(Request $request, Response $response): void;
+}

Neos.Flow/Classes/Cli/CommandRequestHandler.php

@@ -15,7 +15,6 @@
 use Neos\Flow\Core\Bootstrap;
 use Neos\Flow\Core\LockManager;
 use Neos\Flow\Core\RequestHandlerInterface;
-use Neos\Flow\Mvc\Dispatcher;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Neos\Flow\Security\Context;
 
@@ -130,19 +129,22 @@ public function exitIfCompiletimeCommandWasNotCalledCorrectly(string $runlevel)
         if ($runlevel === Bootstrap::RUNLEVEL_COMPILETIME) {
             return;
         }
+
         $command = $this->request->getCommand();
-        if ($this->bootstrap->isCompiletimeCommand($command->getCommandIdentifier())) {
-            $this->response->appendContent(sprintf(
+        if (!$this->bootstrap->isCompiletimeCommand($command->getCommandIdentifier())) {
+            return;
+        }
+
+        $this->response->appendContent(sprintf(
                 "<b>Unrecognized Command</b>\n\n" .
                 "Sorry, but the command \"%s\" must be specified by its full command\n" .
                 "identifier because it is a compile time command which cannot be resolved\n" .
                 "from an abbreviated command identifier.\n\n",
                 $command->getCommandIdentifier())
-            );
-            $this->response->send();
-            $this->shutdown($runlevel);
-            exit(1);
-        }
+        );
+        $this->response->send();
+        $this->shutdown($runlevel);
+        exit(1);
     }
 
     /**

Neos.Flow/Classes/Cli/Dispatcher.php

@@ -0,0 +1,131 @@
+<?php
+namespace Neos\Flow\Cli;
+
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Cli\Exception\InfiniteLoopException;
+use Neos\Flow\Cli\Exception\InvalidCommandControllerException;
+use Neos\Flow\Cli\Exception\StopCommandException;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
+
+/**
+ * A command dispatcher.
+ *
+ * @Flow\Scope("singleton")
+ */
+class Dispatcher
+{
+    /**
+     * @var \Neos\Flow\SignalSlot\Dispatcher
+     */
+    protected $signalDispatcher;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @param \Neos\Flow\SignalSlot\Dispatcher $signalDispatcher
+     */
+    public function injectSignalDispatcher(\Neos\Flow\SignalSlot\Dispatcher $signalDispatcher)
+    {
+        $this->signalDispatcher = $signalDispatcher;
+    }
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function injectObjectManager(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Try processing the request until it is successfully marked "dispatched"
+     *
+     * @param Request $request
+     * @param Response $response
+     * @return Response
+     * @throws InfiniteLoopException
+     * @throws InvalidCommandControllerException
+     */
+    public function dispatch(Request $request, Response $response): Response
+    {
+        $dispatchLoopCount = 0;
+        /** @var Request $request */
+        while (!$request->isDispatched()) {
+            if ($dispatchLoopCount++ > 99) {
+                throw new InfiniteLoopException(sprintf('Could not ultimately dispatch the command request after %d iterations.', $dispatchLoopCount), 1565874819);
+            }
+            $controller = $this->resolveController($request);
+            try {
+                $this->emitBeforeControllerInvocation($request, $response, $controller);
+                $controller->processRequest($request, $response);
+                $this->emitAfterControllerInvocation($request, $response, $controller);
+            } catch (StopCommandException $exception) {
+                $this->emitAfterControllerInvocation($request, $response, $controller);
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * This signal is emitted directly before the request is been dispatched to a controller.
+     *
+     * @param Request $request
+     * @param Response $response
+     * @param CommandControllerInterface $controller
+     * @return void
+     */
+    protected function emitBeforeControllerInvocation(Request $request, Response $response, CommandControllerInterface $controller)
+    {
+        $this->signalDispatcher->dispatch(\Neos\Flow\Mvc\Dispatcher::class, 'beforeControllerInvocation', [
+            'request' => $request,
+            'response' => $response,
+            'controller' => $controller
+        ]);
+    }
+
+    /**
+     * This signal is emitted directly after the request has been dispatched to a controller and the controller
+     * returned control back to the dispatcher.
+     *
+     * @param Request $request
+     * @param Response $response
+     * @param CommandControllerInterface $controller
+     * @return void
+     */
+    protected function emitAfterControllerInvocation(Request $request, Response $response, CommandControllerInterface $controller)
+    {
+        $this->signalDispatcher->dispatch(\Neos\Flow\Mvc\Dispatcher::class, 'afterControllerInvocation', [
+            'request' => $request,
+            'response' => $response,
+            'controller' => $controller
+        ]);
+    }
+
+    /**
+     * Finds and instantiates a controller that matches the current request.
+     * If no controller can be found, an instance of NotFoundControllerInterface is returned.
+     *
+     * @param Request $request The request to dispatch
+     * @return CommandControllerInterface
+     * @throws InvalidCommandControllerException
+     */
+    protected function resolveController(Request $request): CommandControllerInterface
+    {
+        $controllerObjectName = $request->getControllerObjectName();
+        if ($controllerObjectName === '') {
+            $exceptionMessage = 'No controller could be resolved which would match your request';
+            throw new InvalidCommandControllerException($exceptionMessage, 1565878092);
+        }
+
+        $controller = $this->objectManager->get($controllerObjectName);
+        if (!$controller instanceof CommandControllerInterface) {
+            throw new InvalidCommandControllerException('Invalid controller "' . $request->getControllerObjectName() . '". The controller must be a valid request handling controller, ' . (is_object($controller) ? get_class($controller) : gettype($controller)) . ' given.', 1565878098);
+        }
+
+        return $controller;
+    }
+}

Neos.Flow/Classes/Cli/Exception/InfiniteLoopException.php

@@ -0,0 +1,11 @@
+<?php
+namespace Neos\Flow\Cli\Exception;
+
+/**
+ * An "Infinite Loop" exception
+ *
+ * @api
+ */
+class InfiniteLoopException extends \Exception
+{
+}

Neos.Flow/Classes/Cli/Exception/InvalidCommandControllerException.php

@@ -0,0 +1,9 @@
+<?php
+namespace Neos\Flow\Cli\Exception;
+
+/**
+ *
+ */
+class InvalidCommandControllerException extends \Exception
+{
+}

Neos.Flow/Classes/Cli/Exception/StopCommandException.php

@@ -0,0 +1,9 @@
+<?php
+namespace Neos\Flow\Cli\Exception;
+
+/**
+ *
+ */
+class StopCommandException extends \Exception
+{
+}

Neos.Flow/Classes/Cli/Request.php

@@ -13,14 +13,13 @@
 
 use Neos\Flow\Mvc\Exception\InvalidArgumentNameException;
 use Neos\Flow\Mvc\Exception\NoSuchArgumentException;
-use Neos\Flow\Mvc\RequestInterface;
 
 /**
  * Represents a CLI request.
  *
  * @api
  */
-class Request implements RequestInterface
+class Request
 {
     /**
      * @var string
@@ -54,12 +53,6 @@ class Request implements RequestInterface
      */
     protected $dispatched = false;
 
-    /**
-     *
-     * @var array
-     */
-    protected $commandLineArguments;
-
     /**
      * Sets the dispatched flag
      *
@@ -111,7 +104,7 @@ public function getControllerObjectName(): string
      * Returns the this request, as CLI request nesting is not supported.
      *
      * @return Request
-     * @api
+     * @deprecated
      */
     public function getMainRequest(): Request
     {
@@ -122,7 +115,7 @@ public function getMainRequest(): Request
      * Returns true, as CLI request nesting is not supported.
      *
      * @return boolean
-     * @api
+     * @deprecated
      */
     public function isMainRequest(): bool
     {
@@ -174,7 +167,7 @@ public function getCommand(): Command
      * @return void
      * @throws InvalidArgumentNameException
      */
-    public function setArgument(string $argumentName, $value)
+    public function setArgument(string $argumentName, $value): void
     {
         if ($argumentName === '') {
             throw new InvalidArgumentNameException('Invalid argument name.', 1300893885);