Replace ApplicationRunner with zend-httphandlerrunner

This patch removes the `ApplicationRunner`, and replaces it with
zend-httphandlerrunner's `RequestHandlerInterface` and emitters.

Author: weierophinney

composer.json

@@ -30,6 +30,7 @@
         "zendframework/zend-diactoros": "^1.3.10",
         "zendframework/zend-expressive-router": "^3.0.0alpha1",
         "zendframework/zend-expressive-template": "^2.0.0-dev",
+        "zendframework/zend-httphandlerrunner": "^1.0",
         "zendframework/zend-stratigility": "^3.0.0alpha2"
     },
     "require-dev": {

composer.lock

@@ -14,6 +14,7 @@
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Expressive\Router\PathBasedRoutingMiddleware;
+use Zend\HttpHandlerRunner\RequestHandlerRunner;
 use Zend\Stratigility\MiddlewarePipeInterface;
 
 use function Zend\Stratigility\path;
@@ -36,15 +37,15 @@ class Application implements MiddlewareInterface, RequestHandlerInterface
     private $routes;
 
     /**
-     * @var ApplicationRunner
+     * @var RequestHandlerRunner
      */
     private $runner;
 
     public function __construct(
         MiddlewareFactory $factory,
         MiddlewarePipeInterface $pipeline,
         PathBasedRoutingMiddleware $routes,
-        ApplicationRunner $runner
+        RequestHandlerRunner $runner
     ) {
         $this->factory = $factory;
         $this->pipeline = $pipeline;
@@ -73,11 +74,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     /**
      * Run the application.
      *
-     * Proxies to the ApplicationRunner::run() method.
+     * Proxies to the RequestHandlerRunner::run() method.
      */
-    public function run(ServerRequestInterface $request = null) : void
+    public function run() : void
     {
-        $this->runner->run($request);
+        $this->runner->run();
     }
 
     /**

src/Application.php

@@ -11,6 +11,7 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Zend\Diactoros\Response\EmitterInterface;
+use Zend\HttpHandlerRunner\RequestHandlerRunner;
 use Zend\Stratigility\Middleware\ErrorHandler;
 use Zend\Stratigility\Middleware\ErrorResponseGenerator;
 
@@ -40,7 +41,6 @@ public function getDependencies() : array
             'factories' => [
                 Application::class                         => Container\ApplicationFactory::class,
                 ApplicationPipeline::class                 => Container\ApplicationPipelineFactory::class,
-                ApplicationRunner::class                   => Container\ApplicationRunnerFactory::class,
                 EmitterInterface::class                    => Container\EmitterFactory::class,
                 ErrorHandler::class                        => Container\ErrorHandlerFactory::class,
                 // Change the following in development to the WhoopsErrorResponseGeneratorFactory:
@@ -49,6 +49,7 @@ public function getDependencies() : array
                 MiddlewareContainer::class                 => Container\MiddlewareContainerFactory::class,
                 MiddlewareFactory::class                   => Container\MiddlewareFactoryFactory::class,
                 Middleware\NotFoundMiddleware::class       => Container\NotFoundMiddlewareFactory::class,
+                RequestHandlerRunner::class                => Container\RequestHandlerRunnerFactory::class,
                 ResponseInterface::class                   => Container\ResponseFactory::class,
                 Router\DispatchMiddleware::class           => Container\DispatchMiddlewareFactory::class,
                 Router\PathBasedRoutingMiddleware::class   => Container\RouteMiddlewareFactory::class,

src/ApplicationRunner.php

@@ -12,9 +12,9 @@
 use Psr\Container\ContainerInterface;
 use Zend\Expressive\Application;
 use Zend\Expressive\ApplicationPipeline;
-use Zend\Expressive\ApplicationRunner;
 use Zend\Expressive\MiddlewareFactory;
 use Zend\Expressive\Router\PathBasedRoutingMiddleware;
+use Zend\HttpHandlerRunner\RequestHandlerRunner;
 use Zend\Stratigility\MiddlewarePipe;
 
 /**
@@ -27,7 +27,7 @@
  * - Zend\Expressive\ApplicationPipeline, which should resolve to a
  *   Zend\Stratigility\MiddlewarePipeInterface instance.
  * - Zend\Expressive\Middleware\RouteMiddleware.
- * - Zend\Expressive\ApplicationRunner.
+ * - Zend\HttpHandler\RequestHandlerRunner.
  */
 class ApplicationFactory
 {
@@ -37,7 +37,7 @@ public function __invoke(ContainerInterface $container) : Application
             $container->get(MiddlewareFactory::class),
             $container->get(ApplicationPipeline::class),
             $container->get(PathBasedRoutingMiddleware::class),
-            $container->get(ApplicationRunner::class)
+            $container->get(RequestHandlerRunner::class)
         );
     }
 }

src/ConfigProvider.php

@@ -10,9 +10,9 @@
 namespace Zend\Expressive\Container;
 
 use Psr\Container\ContainerInterface;
-use Zend\Diactoros\Response\EmitterInterface;
-use Zend\Diactoros\Response\SapiEmitter;
-use Zend\Expressive\Emitter\EmitterStack;
+use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
+use Zend\HttpHandlerRunner\Emitter\EmitterStack;
+use Zend\HttpHandlerRunner\Emitter\SapiEmitter;
 
 class EmitterFactory
 {

src/Container/ApplicationFactory.php

@@ -10,12 +10,12 @@
 namespace Zend\Expressive\Container;
 
 use Psr\Container\ContainerInterface;
-use Zend\Diactoros\Response\EmitterInterface;
 use Zend\Expressive\Application;
 use Zend\Expressive\ApplicationPipeline;
-use Zend\Expressive\ApplicationRunner;
 use Zend\Expressive\ServerRequestFactory;
 use Zend\Expressive\ServerRequestErrorResponseGenerator;
+use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
+use Zend\HttpHandlerRunner\RequestHandlerRunner;
 
 /**
  * Create an ApplicationRunner instance.
@@ -33,13 +33,13 @@
  *   to a PHP callable that accepts a Throwable argument, and which will return
  *   a Psr\Http\Message\ResponseInterface instance.
  *
- * It also consumes the service Zend\Diactoros\Response\EmitterInterface.
+ * It also consumes the service Zend\HttpHandlerRunner\Emitter\EmitterInterface.
  */
-class ApplicationRunnerFactory
+class RequestHandlerRunnerFactory
 {
-    public function __invoke(ContainerInterface $container) : ApplicationRunner
+    public function __invoke(ContainerInterface $container) : RequestHandlerRunner
     {
-        return new ApplicationRunner(
+        return new RequestHandlerRunner(
             $container->get(ApplicationPipeline::class),
             $container->get(EmitterInterface::class),
             $container->get(ServerRequestFactory::class),