Merges develop into release-3.0.0 in preparation for 2.2.0 release

Conflicts:
	.travis.yml
	CHANGELOG.md
	composer.json
	composer.lock
	mkdocs.yml
	src/AppFactory.php
	src/Application.php
	src/ConfigProvider.php
	src/Container/ApplicationConfigInjectionDelegator.php
	src/Container/ApplicationFactory.php
	src/Container/NotFoundDelegateFactory.php
	src/Container/ResponseFactoryFactory.php
	src/Container/StreamFactoryFactory.php
	src/Delegate/NotFoundDelegate.php
	src/Emitter/EmitterStack.php
	src/Handler/NotFoundHandler.php
	src/IsCallableInteropMiddlewareTrait.php
	src/MarshalMiddlewareTrait.php
	src/Middleware/DispatchMiddleware.php
	src/Middleware/ImplicitHeadMiddleware.php
	src/Middleware/ImplicitOptionsMiddleware.php
	src/Middleware/NotFoundHandler.php
	src/Middleware/RouteMiddleware.php
	test/AppFactoryTest.php
	test/Application/MarshalMiddlewareTraitTest.php
	test/ApplicationTest.php
	test/ConfigProviderTest.php
	test/Container/ApplicationConfigInjectionDelegatorTest.php
	test/Container/ApplicationFactoryTest.php
	test/Container/ResponseFactoryFactoryTest.php
	test/Container/StreamFactoryFactoryTest.php
	test/Handler/NotFoundHandlerTest.php
	test/Middleware/ImplicitHeadMiddlewareTest.php
	test/Middleware/ImplicitOptionsMiddlewareTest.php

Author: weierophinney

.travis.yml

@@ -43,7 +43,9 @@ install:
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then cp phpunit.xml.dist-coverage phpunit.xml.dist ; fi
   - stty cols 120 && composer show
+  - cat phpunit.xml.dist
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi

CHANGELOG.md

@@ -654,6 +654,114 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 2.2.0 - 2018-03-12
+
+### Added
+
+- [#581](https://github.com/zendframework/zend-expressive/pull/581) adds the
+  class `Zend\Expressive\ConfigProvider`, and exposes it to the
+  zend-component-installer Composer plugin. We recommend updating your
+  `config/config.php` to reference it, as well as the
+  `Zend\Expressive\Router\ConfigProvider` shipped with zend-expressive-router
+  versions 2.4 and up.
+
+- [#581](https://github.com/zendframework/zend-expressive/pull/581) adds the
+  class `Zend\Expressive\Container\ApplicationConfigInjectionDelegator`. The
+  class can act as a delegator factory, and, when enabled, will inject routes
+  and pipeline middleware defined in configuration.
+
+  Additionally, the class exposes two static methods:
+
+  - `injectPipelineFromConfig(Application $app, array $config)`
+  - `injectRoutesFromConfig(Application $app, array $config)`
+
+  These may be called to modify an `Application` instance based on an array of
+  configuration. See thd documentation for more details.
+
+- [#581](https://github.com/zendframework/zend-expressive/pull/581) adds the
+  class `Zend\Expressive\Handler\NotFoundHandler`; the class takes over the
+  functionality previously provided in `Zend\Expressive\Delegate\NotFoundDelegate`.
+
+### Changed
+
+- [#581](https://github.com/zendframework/zend-expressive/pull/581) updates the
+  minimum supported zend-stratigility version to 2.2.0.
+
+- [#581](https://github.com/zendframework/zend-expressive/pull/581) updates the
+  minimum supported zend-expressive-router version to 2.4.0.
+
+### Deprecated
+
+- [#581](https://github.com/zendframework/zend-expressive/pull/581) deprecates
+  the following classes and traits:
+
+  - `Zend\Expressive\AppFactory`: if you are using this, you will need to switch
+    to direct usage of `Zend\Expressive\Application` or a
+    `Zend\Stratigility\MiddlewarePipe` instance.
+  
+  - `Zend\Expressive\ApplicationConfigInjectionTrait`: if you are using it, it is
+    marked internal, and deprecated; it will be removed in version 3.
+  
+  - `Zend\Expressive\Container\NotFoundDelegateFactory`: the `NotFoundDelegate`
+    will be renamed to `Zend\Expressive\Handler\NotFoundHandler` in version 3,
+    making this factory obsolete.
+  
+  - `Zend\Expressive\Delegate\NotFoundDelegate`: this class becomes
+    `Zend\Expressive\Handler\NotFoundHandler` in v3, and the new class is added in
+    version 2.2 as well.
+  
+  - `Zend\Expressive\Emitter\EmitterStack`: the emitter concept is extracted from
+    zend-diactoros to a new component, zend-httphandlerrunner. This latter
+    component is used in version 3, and defines the `EmitterStack` class. Unless
+    you are extending it or interacting with it directly, this change should not
+    affect you; the `Zend\Diactoros\Response\EmitterInterface` service will be
+    directed to the new class in that version.
+  
+  - `Zend\Expressive\IsCallableInteropMiddlewareTrait`: if you are using it, it is
+    marked internal, and deprecated; it will be removed in version 3.
+  
+  - `Zend\Expressive\MarshalMiddlewareTrait`: if you are using it, it is marked
+    internal, and deprecated; it will be removed in version 3.
+  
+  - `Zend\Expressive\Middleware\DispatchMiddleware`: this functionality has been
+    moved to zend-expressive-router, under the `Zend\Expressive\Router\Middleware`
+    namespace.
+  
+  - `Zend\Expressive\Middleware\ImplicitHeadMiddleware`: this functionality has been
+    moved to zend-expressive-router, under the `Zend\Expressive\Router\Middleware`
+    namespace.
+  
+  - `Zend\Expressive\Middleware\ImplicitOptionsMiddleware`: this functionality has been
+    moved to zend-expressive-router, under the `Zend\Expressive\Router\Middleware`
+    namespace.
+  
+  - `Zend\Expressive\Middleware\NotFoundHandler`: this will be removed in
+    version 3, where you can instead pipe `Zend\Expressive\Handler\NotFoundHandler`
+    directly instead.
+  
+  - `Zend\Expressive\Middleware\RouteMiddleware`: this functionality has been
+    moved to zend-expressive-router, under the `Zend\Expressive\Router\Middleware`
+    namespace.
+
+- [#581](https://github.com/zendframework/zend-expressive/pull/581) deprecates
+  the following methods from `Zend\Expressive\Application`:
+  - `pipeRoutingMiddleware()`
+  - `pipeDispatchMiddleware()`
+  - `getContainer()`: this method is removed in version 3; container access will only be via the bootstrap.
+  - `getDefaultDelegate()`: the concept of a default delegate is removed in version 3.
+  - `getEmitter()`: emitters move to a different collaborator in version 3.
+  - `injectPipelineFromConfig()` andd `injectRoutesFromConfig()` are methods
+    defined by the `ApplicationConfigInjectionTrait`, which will be removed in
+    version 3. Use the `ApplicationConfigInjectionDelegator` instead.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.1.1 - 2018-03-09
 
 ### Added

docs/book/v2/cookbook/autowiring-routes-and-pipelines.md

@@ -208,3 +208,35 @@ delegator factory by wiring it into their own configuration.
       occur in exactly _one_ delegator factory.
 - Distributable packages should create a delegator factory for _routes only_,
   but _should not_ register the delegator factory by default.
+
+## ApplicationConfigInjectionDelegator
+
+- Since version 2.2
+
+`Zend\Expressive\Container\ApplicationConfigInjectionDelegator` allows you to
+define configuration that is then used to call `pipe()` or the various routing
+methods of `Zend\Expressive\Application`. This is particularly useful for
+injecting _routes_.
+
+The format of routes configuration is as follows:
+
+```php
+return [
+    'routes' => [
+        [
+            'path' => '/path/to/match',
+            'middleware' => 'Middleware Service Name',
+            'allowed_methods' => ['GET', 'POST', 'PATCH'],
+            'options' => [
+                'stuff' => 'to',
+                'pass'  => 'to',
+                'the'   => 'underlying router',
+            ],
+        ],
+        // etc.
+    ],
+];
+```
+
+All your various modules could provide route configuration, and you could then
+use a single delegator to add all of them at once.

docs/book/v2/features/application.md

@@ -34,50 +34,32 @@ As noted at the start of this document, we provide several ways to create an
 If you wish to manually instantiate the `Application` instance, it has the
 following constructor:
 
-- Expressive 2.X:
-
-  ```php
-  /**
-   * @param Zend\Expressive\Router\RouterInterface $router
-   * @param null|Psr\Container\ContainerInterface $container IoC container from which to pull services, if any.
-   * @param null|Interop\Http\ServerMiddleware\DelegateInterface $defaultDelegate
-   *     Delegate to invoke when the internal middleware pipeline is exhausted
-   *     without returning a response.
-   * @param null|Zend\Diactoros\Response\EmitterInterface $emitter Emitter to use when `run()` is
-   *     invoked.
-   */
-  public function __construct(
-      Zend\Expressive\Router\RouterInterface $router,
-      Psr\Container\ContainerInterface $container = null,
-      Interop\Http\ServerMiddleware\DelegateInterface $defaultDelegate = null,
-      Zend\Diactoros\Response\EmitterInterface $emitter = null
-  );
-  ```
-
-- Expressive 1.X:
-
-  ```php
-  /**
-   * @param Zend\Expressive\Router\RouterInterface $router
-   * @param null|Psr\Container\ContainerInterface $container IoC container from which to pull services, if any.
-   * @param null|callable $finalHandler Final handler to use when $out is not
-   *     provided on invocation.
-   * @param null|Zend\Diactoros\Response\EmitterInterface $emitter Emitter to use when `run()` is
-   *     invoked.
-   */
-  public function __construct(
-      Zend\Expressive\Router\RouterInterface $router,
-      Psr\Container\ContainerInterface $container = null,
-      callable $finalHandler = null,
-      Zend\Diactoros\Response\EmitterInterface $emitter = null
-  );
-  ```
+```php
+/**
+ * @param Zend\Expressive\Router\RouterInterface $router
+ * @param null|Psr\Container\ContainerInterface $container IoC container from which to pull services, if any.
+ * @param null|Interop\Http\ServerMiddleware\DelegateInterface $defaultDelegate
+ *     Delegate to invoke when the internal middleware pipeline is exhausted
+ *     without returning a response.
+ * @param null|Zend\Diactoros\Response\EmitterInterface $emitter Emitter to use when `run()` is
+ *     invoked.
+ */
+public function __construct(
+    Zend\Expressive\Router\RouterInterface $router,
+    Psr\Container\ContainerInterface $container = null,
+    Interop\Http\ServerMiddleware\DelegateInterface $defaultDelegate = null,
+    Zend\Diactoros\Response\EmitterInterface $emitter = null
+);
+```
 
 If no container is provided at instantiation, then all routed and piped
 middleware **must** be provided as callables.
 
 ### AppFactory
 
+- Deprecated since version 2.2; instantiate `Application` directly and/or use a
+  `Zend\Stratigility\MiddlewarePipe` instance instead.
+
 `Zend\Expressive\AppFactory` provides a convenience layer for creating an
 `Application` instance; it makes the assumption that you will use defaults in
 most situations, and likely only change which container and/or router you wish
@@ -210,10 +192,10 @@ Read the section on [piping vs routing](router/piping.md) for more information.
 
 ### Registering routing and dispatch middleware
 
-Routing is accomplished via a dedicated middleware method,
-`Application::routeMiddleware()`; similarly, dispatching of routed middleware
-has a corresponding instance middleware method, `Application::dispatchMiddleware()`.
-Each can be piped/registered with other middleware platforms if desired.
+Routing is accomplished via dedicated middleware, `Zend\Expressive\Middleware\RouteMiddleware`;
+similarly, dispatching of routed middleware has a corresponding middleware,
+`Zend\Expressive\Middleware\DispatchMiddleware`. Each can be piped/registered
+with other middleware platforms if desired.
 
 These methods **MUST** be piped to the application so that the application will
 route and dispatch routed middleware. This is done using the following methods:
@@ -226,6 +208,18 @@ $app->pipeDispatchMiddleware();
 See the section on [piping](router/piping.md) to see how you can register
 non-routed middleware and create layered middleware applications.
 
+> #### Changed in version 2.2
+>
+> Starting in version 2.2, the methods `pipeRoutingMiddleware` and
+> `pipeDispatchMiddleware` are deprecated in favor of piping the middleware
+> manually.
+>
+> Additionally, the middleware has been ported to the zend-expressive-router
+> package, under the namespace `Zend\Expressive\Router\Middleware`. We suggest
+> piping them by service name. Please see our [migration documentation](../reference/migration-to-v2-2.md#routing-and-dispatch-middleware)
+> for more details, and for information on how to automatically update your
+> application.
+
 ## Retrieving dependencies
 
 As noted in the intro, the `Application` class has several dependencies. Some of
@@ -237,7 +231,7 @@ methods for retrieving them. They include:
 - `getEmitter()`: returns the composed
   [emitter](https://docs.zendframework.com/zend-diactoros/emitting-responses/),
   typically a `Zend\Expressive\Emitter\EmitterStack` instance.
-- `getDefaultDelegate()`: (Since 2.0) retrieves the default delegate to use when the internal middleware pipeline is exhausted without returning a response. If none is provided at instantiation, this method will do one of the following:
+- `getDefaultDelegate()`: retrieves the default delegate to use when the internal middleware pipeline is exhausted without returning a response. If none is provided at instantiation, this method will do one of the following:
     - If no container is composed, instanatiates a
       `Zend\Expressive\Delegate\NotFoundDelegate` using the composed response
       prototype only.
@@ -247,10 +241,12 @@ methods for retrieving them. They include:
       the composed container, and uses the value created.
     - If a container is composed and contains the `Zend\Expressive\Delegate\DefaultDelegate`
       service, it returns that.
-- `getFinalHandler(ResponseInterface $response = null)`: (**REMOVED in version 2.0**)
-  retrieves the final handler instance. This is middleware with the signature
-  `function ($request, $response, $error = null)`, and it is invoked when the
-  middleware pipeline queue is depleted and no response has been returned.
+
+> #### Deprecated
+>
+> Each of the above methods are deprecated starting in version 2.2, and will be
+> removed in version 3.0.
+
 
 ## Executing the application: run()
 

docs/book/v2/features/emitters.md

@@ -39,3 +39,13 @@ $stack->push($emitterInstance);
 
 As a stack, execution is in LIFO (last in, first out) order; the first emitter
 on the stack will be evaluated last.
+
+> ## Deprecated with version 2.2
+> 
+> Starting in version 2.2, the `EmitterStack` is deprecated, and moved, along with the
+> zend-diactoros `EmitterInterface` and implementations, to a new package,
+> [zend-httphandlerrunner](https://docs.zendframework.com/zend-httphandlerrunner).
+> 
+> The interface and the `EmitterStack` are roughly identical to what is present in
+> version 2; if you are defining a `Zend\Diactoros\Emitter\EmitterInterface`
+> service of your own, you will need to update it in that version.