Use RouteMiddleware instead of PathBasedRoutingMiddleware

Per changes for final v3 release.

Author: weierophinney

src/OAuth2CallbackMiddlewareFactory.php

@@ -12,7 +12,7 @@
 use Zend\Expressive\Authentication\AuthenticationMiddleware;
 use Zend\Expressive\Container\ApplicationFactory;
 use Zend\Expressive\Router\Middleware\DispatchMiddleware;
-use Zend\Expressive\Router\Middleware\PathBasedRoutingMiddleware;
+use Zend\Expressive\Router\Middleware\RouteMiddleware;
 use Zend\Expressive\Session\SessionMiddleware;
 
 /**
@@ -84,7 +84,7 @@ public function __invoke(ContainerInterface $container) : MiddlewareInterface
             $pipeline->get($path, Debug\DebugProviderMiddleware::class);
         }
 
-        $pipeline->pipe(PathBasedRoutingMiddleware::class);
+        $pipeline->pipe(RouteMiddleware::class);
         $pipeline->pipe(DispatchMiddleware::class);
 
         return $pipeline;

test/OAuth2CallbackMiddlewareFactoryTest.php

@@ -10,14 +10,17 @@
 use Phly\Expressive\OAuth2ClientAuthentication\Debug\DebugProviderMiddleware;
 use Phly\Expressive\OAuth2ClientAuthentication\OAuth2CallbackMiddlewareFactory;
 use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use ReflectionProperty;
 use Zend\Expressive\Application;
 use Zend\Expressive\MiddlewareContainer;
 use Zend\Expressive\MiddlewareFactory;
-use Zend\Expressive\Router\Middleware\PathBasedRoutingMiddleware;
+use Zend\Expressive\Router\Middleware\RouteMiddleware;
+use Zend\Expressive\Router\Route;
+use Zend\Expressive\Router\RouteCollector;
 use Zend\Expressive\Router\RouterInterface;
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
 use Zend\Stratigility\MiddlewarePipe;
@@ -39,14 +42,19 @@ public function setUp()
 
         $runner = $this->prophesize(RequestHandlerRunner::class);
         $router = $this->prophesize(RouterInterface::class);
-        $routeMiddleware = new PathBasedRoutingMiddleware($router->reveal());
+        $router->addRoute(Argument::type(Route::class))->shouldBeCalled();
+
+        $routeMiddleware = new RouteMiddleware($router->reveal());
+
+        $routes = new RouteCollector($router->reveal());
 
         $this->pipeline = new MiddlewarePipe();
 
         $middlewareFactory = new MiddlewareFactory(new MiddlewareContainer($this->container->reveal()));
         $this->container->get(MiddlewareFactory::class)->willReturn($middlewareFactory);
         $this->container->get(\Zend\Expressive\ApplicationPipeline::class)->willReturn($this->pipeline);
-        $this->container->get(PathBasedRoutingMiddleware::class)->willReturn($routeMiddleware);
+        $this->container->get(RouteCollector::class)->willReturn($routes);
+        $this->container->get(RouteMiddleware::class)->willReturn($routeMiddleware);
         $this->container->get(RequestHandlerRunner::class)->will([$runner, 'reveal']);
 
         $this->factory = new OAuth2CallbackMiddlewareFactory();