Merge branch 'hotfix/dispatch-middleware-constant' into release-3.0.0

Close #559

Author: weierophinney

CHANGELOG.md

@@ -10,7 +10,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Changed
 
-- Nothing.
+- [#559](https://github.com/zendframework/zend-expressive/pull/559) reverts the
+  changes performed for [#556](https://github.com/zendframework/zend-expressive/pull/556)
+  to the `ApplicationFactory`. It now uses the canonical service name for the
+  `PathBasedRoutingMiddleware` instead of the `ROUTE_MIDDLEWARE` constant.
 
 ### Deprecated
 

src/Container/ApplicationFactory.php

@@ -13,10 +13,9 @@
 use Zend\Expressive\Application;
 use Zend\Expressive\ApplicationPipeline;
 use Zend\Expressive\MiddlewareFactory;
+use Zend\Expressive\Router\Middleware\PathBasedRoutingMiddleware;
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
 
-use const Zend\Expressive\ROUTE_MIDDLEWARE;
-
 /**
  * Create an Application instance.
  *
@@ -36,7 +35,7 @@ public function __invoke(ContainerInterface $container) : Application
         return new Application(
             $container->get(MiddlewareFactory::class),
             $container->get(ApplicationPipeline::class),
-            $container->get(ROUTE_MIDDLEWARE),
+            $container->get(PathBasedRoutingMiddleware::class),
             $container->get(RequestHandlerRunner::class)
         );
     }

src/constants.php

@@ -70,6 +70,7 @@
  * Should resolve to the Zend\Expressive\Router\Middleware\PathBasedRoutingMiddleware
  * service.
  *
+ * @deprecated To remove in version 4.0.0.
  * @var string
  */
 const ROUTE_MIDDLEWARE = __NAMESPACE__ . '\Middleware\RouteMiddleware';

test/Container/ApplicationFactoryTest.php

@@ -19,8 +19,6 @@
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
 use Zend\Stratigility\MiddlewarePipeInterface;
 
-use const Zend\Expressive\ROUTE_MIDDLEWARE;
-
 class ApplicationFactoryTest extends TestCase
 {
     public function testFactoryProducesAnApplication()
@@ -33,7 +31,7 @@ public function testFactoryProducesAnApplication()
         $container = $this->prophesize(ContainerInterface::class);
         $container->get(MiddlewareFactory::class)->willReturn($middlewareFactory);
         $container->get(ApplicationPipeline::class)->willReturn($pipeline);
-        $container->get(ROUTE_MIDDLEWARE)->willReturn($routeMiddleware);
+        $container->get(PathBasedRoutingMiddleware::class)->willReturn($routeMiddleware);
         $container->get(RequestHandlerRunner::class)->willReturn($runner);
 
         $factory = new ApplicationFactory();