Merge branch 'feature/implicit-middleware-aliases' into release-3.0.0

Close #554

Author: weierophinney

CHANGELOG.md

@@ -12,10 +12,13 @@ All notable changes to this project will be documented in this file, in reverse
   capable of producing an empty, writable PSR-7 `StreamInterface` instance using
   zend-diactoros. The stream produced is backed by a `php://temp` stream.
 
-- [#551](https://github.com/zendframework/zend-expressive/pull/551) adds
+- [#551](https://github.com/zendframework/zend-expressive/pull/551) and
+  [#554](https://github.com/zendframework/zend-expressive/pull/554) add
   the following constants under the `Zend\Expressive` namespace:
 
   - `DEFAULT_DELEGATE` can be used to refer to the former `DefaultDelegate` FQCN service.
+  - `IMPLICIT_HEAD_MIDDLEWARE` can be used to refer to the former `Zend\Expressive\Router\Middleware\ImplicitHeadMiddleware` service.
+  - `IMPLICIT_OPTIONS_MIDDLEWARE` can be used to refer to the former `Zend\Expressive\Router\Middleware\ImplicitOPTIONSMiddleware` service.
   - `NOT_FOUND_MIDDLEWARE` can be used to refer to the former `Zend\Expressive\Middleware\NotFoundMiddleware` service.
   - `NOT_FOUND_RESPONSE` can be used to refer to the former `Zend\Expressive\Response\NotFoundResponseInterface` service.
   - `SERVER_REQUEST_ERROR_RESPONSE_GENERATOR` can be used to refer to the former `Zend\Expressive\ServerRequestErrorResponseGenerator` service.
@@ -47,6 +50,12 @@ All notable changes to this project will be documented in this file, in reverse
   - `IMPLICIT_HEAD_MIDDLEWARE_STREAM_FACTORY` maps to the `StreamFactory`.
   - `IMPLICIT_OPTIONS_MIDDLEWARE_RESPONSE` maps to the `ResponseFactory`.
 
+- [#554](https://github.com/zendframework/zend-expressive/pull/554) updates
+  the `ConfigProvider` to add entries for the following constants as follows:
+
+  - `IMPLICIT_HEAD_MIDDLEWARE` aliases to the `Zend\Expressive\Router\Middleware\ImplicitHeadMiddleware` service.
+  - `IMPLICIT_OPTIONS_MIDDLEWARE` aliases to the `Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware` service.
+
 ### Deprecated
 
 - Nothing.

src/ConfigProvider.php

@@ -32,10 +32,12 @@ public function getDependencies() : array
         // @codingStandardsIgnoreStart
         return [
             'aliases' => [
-                DEFAULT_DELEGATE     => Handler\NotFoundHandler::class,
-                DISPATCH_MIDDLEWARE  => Router\Middleware\DispatchMiddleware::class,
-                NOT_FOUND_MIDDLEWARE => Handler\NotFoundHandler::class,
-                ROUTE_MIDDLEWARE     => Router\Middleware\PathBasedRoutingMiddleware::class,
+                DEFAULT_DELEGATE            => Handler\NotFoundHandler::class,
+                DISPATCH_MIDDLEWARE         => Router\Middleware\DispatchMiddleware::class,
+                IMPLICIT_HEAD_MIDDLEWARE    => Router\Middleware\ImplicitHeadMiddleware::class,
+                IMPLICIT_OPTIONS_MIDDLEWARE => Router\Middleware\ImplicitOptionsMiddleware::class,
+                NOT_FOUND_MIDDLEWARE        => Handler\NotFoundHandler::class,
+                ROUTE_MIDDLEWARE            => Router\Middleware\PathBasedRoutingMiddleware::class,
             ],
             'factories' => [
                 Application::class                             => Container\ApplicationFactory::class,

src/constants.php

@@ -28,6 +28,26 @@
  */
 const DISPATCH_MIDDLEWARE = __NAMESPACE__ . '\Middleware\DispatchMiddleware';
 
+/**
+ * Legacy service name for the ImplicitHeadMiddleware referenced in version 2.
+ * Should resolve to the Zend\Expressive\Router\Middleware\ImplicitHeadMiddleware
+ * service.
+ *
+ * @deprecated To remove in version 4.0.0.
+ * @var string
+ */
+const IMPLICIT_HEAD_MIDDLEWARE = __NAMESPACE__ . '\Middleware\ImplicitHeadMiddleware';
+
+/**
+ * Legacy service name for the ImplicitOptionsMiddleware referenced in version 2.
+ * Should resolve to the Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware
+ * service.
+ *
+ * @deprecated To remove in version 4.0.0.
+ * @var string
+ */
+const IMPLICIT_OPTIONS_MIDDLEWARE = __NAMESPACE__ . '\Middleware\ImplicitOptionsMiddleware';
+
 /**
  * Legacy/transitional service name for the NotFoundMiddleware introduced in
  * 3.0.0alpha2. Should resolve to the Handler\NotFoundHandler class.

test/ConfigProviderTest.php

@@ -26,6 +26,8 @@
 
 use const Zend\Expressive\DEFAULT_DELEGATE;
 use const Zend\Expressive\DISPATCH_MIDDLEWARE;
+use const Zend\Expressive\IMPLICIT_HEAD_MIDDLEWARE;
+use const Zend\Expressive\IMPLICIT_OPTIONS_MIDDLEWARE;
 use const Zend\Expressive\NOT_FOUND_MIDDLEWARE;
 use const Zend\Expressive\NOT_FOUND_RESPONSE;
 use const Zend\Expressive\ROUTE_MIDDLEWARE;
@@ -49,6 +51,8 @@ public function testProviderDefinesExpectedAliases()
         $aliases = $config['aliases'];
         $this->assertArrayHasKey(DEFAULT_DELEGATE, $aliases);
         $this->assertArrayHasKey(DISPATCH_MIDDLEWARE, $aliases);
+        $this->assertArrayHasKey(IMPLICIT_HEAD_MIDDLEWARE, $aliases);
+        $this->assertArrayHasKey(IMPLICIT_OPTIONS_MIDDLEWARE, $aliases);
         $this->assertArrayHasKey(NOT_FOUND_MIDDLEWARE, $aliases);
         $this->assertArrayHasKey(ROUTE_MIDDLEWARE, $aliases);
     }