Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge 0f06f57 into 7dd4735
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Mar 7, 2018
2 parents 7dd4735 + 0f06f57 commit 1ba5207
Show file tree
Hide file tree
Showing 21 changed files with 1,445 additions and 224 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -8,7 +8,7 @@ cache:

env:
global:
- COMPOSER_ARGS="--no-interaction"
- COMPOSER_ARGS="--no-interaction --no-scripts"
- COVERAGE_DEPS="php-coveralls/php-coveralls"

matrix:
Expand All @@ -19,7 +19,7 @@ matrix:
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- LEGACY_DEPS="phpunit/phpunit symfony/console symfony/finder"
- php: 5.6
env:
- DEPS=latest
Expand All @@ -29,7 +29,7 @@ matrix:
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- LEGACY_DEPS="phpunit/phpunit symfony/console symfony/finder"
- php: 7
env:
- DEPS=latest
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Expand Up @@ -11,6 +11,27 @@ All notable changes to this project will be documented in this file, in reverse
`Zend\Expressive\Router\Middleware\RouteMiddleware`. These are the same as the
versions shipped in 2.3.0, but under a new namespace.

- [#55](https://github.com/zendframework/zend-expressive-router/pull/55) adds
`Zend\Expressive\Router\Middleware\ImplicitHeadMiddleware`. It is imported
from zend-expressive, and implements the same functionality.

- [#55](https://github.com/zendframework/zend-expressive-router/pull/55) adds
`Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware`. It is imported
from zend-expressive, and implements the same functionality.

- [#57](https://github.com/zendframework/zend-expressive-router/pull/57) adds
the following factories for use with PSR-11 containers:

- Zend\Expressive\Router\Middleware\DispatchMiddlewareFactory`
- Zend\Expressive\Router\Middleware\ImplicitHeadMiddlewareFactory`
- Zend\Expressive\Router\Middleware\ImplicitOptionsMiddlewareFactory`
- Zend\Expressive\Router\Middleware\RouteMiddlewareFactory`

- [#57](https://github.com/zendframework/zend-expressive-router/pull/57) adds
`Zend\Expressive\Router\ConfigProvider`, mapping the above factories to their
respective middleware, and exposing it to zend-component-installer via the
package definition.

### Changed

- Nothing.
Expand Down
4 changes: 4 additions & 0 deletions composer.json
Expand Up @@ -22,6 +22,7 @@
"require": {
"php": "^5.6 || ^7.0",
"fig/http-message-util": "^1.1.2",
"psr/container": "^1.0",
"psr/http-message": "^1.0.1",
"webimpress/http-middleware-compatibility": "^0.1.1"
},
Expand Down Expand Up @@ -53,6 +54,9 @@
"dev-master": "2.3.x-dev",
"dev-develop": "2.4.x-dev",
"dev-release-3.0.0": "3.0.x-dev"
},
"zf": {
"config-provider": "Zend\\Expressive\\Router\\ConfigProvider"
}
},
"scripts": {
Expand Down

0 comments on commit 1ba5207

Please sign in to comment.