Use DispatchMiddleware and PathBasedRoutingMiddleware from zend-expressive-router v3

This patch updates zend-expressive to consume the `DispatchMiddleware`
and `PathBasedRoutingMiddleware` classes from zend-expressive-router
v3.0.0alpha1 and up. Doing so allows removal of those classes and
related tests from this package, but requires:

- `Application` now needs to depend on `PathBasedRoutingMiddleware`
- `ApplicationConfigInjectionDelegator` needs to use the new classes
  when injecting routing and dispatch middleware.
- tests needed updating to refer to the new classes.

Author: weierophinney

composer.json

@@ -28,7 +28,7 @@
         "psr/http-message": "^1.0.1",
         "psr/http-server-middleware": "^1.0",
         "zendframework/zend-diactoros": "^1.3.10",
-        "zendframework/zend-expressive-router": "^3.0.0-dev",
+        "zendframework/zend-expressive-router": "^3.0.0alpha1",
         "zendframework/zend-expressive-template": "^2.0.0-dev",
         "zendframework/zend-stratigility": "^3.0.0alpha2"
     },

composer.lock

@@ -13,6 +13,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Zend\Expressive\Router\PathBasedRoutingMiddleware;
 use Zend\Stratigility\MiddlewarePipeInterface;
 
 use function Zend\Stratigility\path;
@@ -30,7 +31,7 @@ class Application implements MiddlewareInterface, RequestHandlerInterface
     private $pipeline;
 
     /**
-     * @var Middleware\RouteMiddleware
+     * @var PathBasedRoutingMiddleware
      */
     private $routes;
 
@@ -42,7 +43,7 @@ class Application implements MiddlewareInterface, RequestHandlerInterface
     public function __construct(
         MiddlewareFactory $factory,
         MiddlewarePipeInterface $pipeline,
-        Middleware\RouteMiddleware $routes,
+        PathBasedRoutingMiddleware $routes,
         ApplicationRunner $runner
     ) {
         $this->factory = $factory;

src/Application.php

@@ -33,7 +33,9 @@ public function getDependencies() : array
         // @codingStandardsIgnoreStart
         return [
             'aliases' => [
-                Handler\DefaultHandler::class => Handler\NotFoundHandler::class,
+                Handler\DefaultHandler::class        => Handler\NotFoundHandler::class,
+                Middleware\DispatchMiddleware::class => Router\DispatchMiddleware::class,
+                Middleware\RouteMiddleware::class    => Router\PathBasedRoutingMiddleware::class,
             ],
             'factories' => [
                 Application::class                         => Container\ApplicationFactory::class,
@@ -46,10 +48,10 @@ public function getDependencies() : array
                 Handler\NotFoundHandler::class             => Handler\NotFoundHandlerFactory::class,
                 MiddlewareContainer::class                 => Container\MiddlewareContainerFactory::class,
                 MiddlewareFactory::class                   => Container\MiddlewareFactoryFactory::class,
-                Middleware\DispatchMiddleware::class       => Container\DispatchMiddlewareFactory::class,
                 Middleware\NotFoundMiddleware::class       => Container\NotFoundMiddlewareFactory::class,
-                Middleware\RouteMiddleware::class          => Container\RouteMiddlewareFactory::class,
                 ResponseInterface::class                   => Container\ResponseFactory::class,
+                Router\DispatchMiddleware::class           => Container\DispatchMiddlewareFactory::class,
+                Router\PathBasedRoutingMiddleware::class   => Container\RouteMiddlewareFactory::class,
                 ServerRequestErrorResponseGenerator::class => Container\ServerRequestErrorResponseGeneratorFactory::class,
                 ServerRequestFactory::class                => Container\ServerRequestFactoryFactory::class,
             ],

src/ConfigProvider.php

@@ -13,7 +13,8 @@
 use SplPriorityQueue;
 use Zend\Expressive\Application;
 use Zend\Expressive\Exception\InvalidArgumentException;
-use Zend\Expressive\Middleware;
+use Zend\Expressive\Router\DispatchMiddleware;
+use Zend\Expressive\Router\PathBasedRoutingMiddleware;
 use Zend\Expressive\Router\Route;
 
 class ApplicationConfigInjectionDelegator
@@ -64,8 +65,8 @@ public function __invoke(ContainerInterface $container, string $serviceName, cal
      *     'middleware_pipeline' => [
      *         // An array of middleware to register with the pipeline.
      *         // entries to register prior to routing/dispatching...
-     *         // - entry for \Zend\Expressive\Middleware\RouteMiddleware::class
-     *         // - entry \Zend\Expressive\Middleware\DispatchMiddleware::class
+     *         // - entry for \Zend\Expressive\Router\PathBasedRoutingMiddleware::class
+     *         // - entry \Zend\Expressive\Router\DispatchMiddleware::class
      *         // entries to register after routing/dispatching...
      *     ],
      * ];
@@ -106,8 +107,8 @@ public static function injectPipelineFromConfig(Application $application, array
                 return;
             }
 
-            $application->pipe(Middleware\RouteMiddleware::class);
-            $application->pipe(Middleware\DispatchMiddleware::class);
+            $application->pipe(PathBasedRoutingMiddleware::class);
+            $application->pipe(DispatchMiddleware::class);
             return;
         }
 

src/Container/ApplicationConfigInjectionDelegator.php

@@ -14,7 +14,7 @@
 use Zend\Expressive\ApplicationPipeline;
 use Zend\Expressive\ApplicationRunner;
 use Zend\Expressive\MiddlewareFactory;
-use Zend\Expressive\Middleware\RouteMiddleware;
+use Zend\Expressive\Router\PathBasedRoutingMiddleware;
 use Zend\Stratigility\MiddlewarePipe;
 
 /**
@@ -36,7 +36,7 @@ public function __invoke(ContainerInterface $container) : Application
         return new Application(
             $container->get(MiddlewareFactory::class),
             $container->get(ApplicationPipeline::class),
-            $container->get(RouteMiddleware::class),
+            $container->get(PathBasedRoutingMiddleware::class),
             $container->get(ApplicationRunner::class)
         );
     }

src/Container/ApplicationFactory.php

@@ -10,7 +10,7 @@
 namespace Zend\Expressive\Container;
 
 use Psr\Container\ContainerInterface;
-use Zend\Expressive\Middleware\DispatchMiddleware;
+use Zend\Expressive\Router\DispatchMiddleware;
 
 class DispatchMiddlewareFactory
 {

src/Container/DispatchMiddlewareFactory.php

@@ -11,14 +11,14 @@
 
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
-use Zend\Expressive\Middleware\RouteMiddleware;
+use Zend\Expressive\Router\PathBasedRoutingMiddleware;
 use Zend\Expressive\Router\RouterInterface;
 
 class RouteMiddlewareFactory
 {
-    public function __invoke(ContainerInterface $container) : RouteMiddleware
+    public function __invoke(ContainerInterface $container) : PathBasedRoutingMiddleware
     {
-        return new RouteMiddleware(
+        return new PathBasedRoutingMiddleware(
             $container->get(RouterInterface::class),
             $container->get(ResponseInterface::class)
         );