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

Commit

Permalink
Merge branch 'feature/45-psr-15-final' into release-3.0.0
Browse files Browse the repository at this point in the history
Close #45
  • Loading branch information
weierophinney committed Jan 24, 2018
2 parents 3d71af1 + 86dec40 commit 9ecd970
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 212 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ All notable changes to this project will be documented in this file, in reverse

### Added

- [#39](https://github.com/zendframework/zend-expressive-router/pull/39) adds
PSR-15 `http-interop/http-server-middleware` support.
- [#39](https://github.com/zendframework/zend-expressive-router/pull/39) and
[#45](https://github.com/zendframework/zend-expressive-router/pull/45) add
PSR-15 `psr/http-server-middleware` support.

### Changed

Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
"require": {
"php": "^7.1",
"fig/http-message-util": "^1.1.2",
"http-interop/http-server-middleware": "^1.0.1",
"psr/http-message": "^1.0.1"
"psr/http-message": "^1.0.1",
"psr/http-server-middleware": "^1.0"
},
"require-dev": {
"malukenho/docheader": "^0.1.5",
"phpunit/phpunit": "^6.4.4",
"malukenho/docheader": "^0.1.6",
"phpunit/phpunit": "^6.5.5",
"zendframework/zend-coding-standard": "~1.0.0"
},
"suggest": {
"zendframework/zend-expressive-aurarouter": "^1.0 to use the Aura.Router routing adapter",
"zendframework/zend-expressive-fastroute": "^1.2 to use the FastRoute routing adapter",
"zendframework/zend-expressive-zendrouter": "^1.2 to use the zend-router routing adapter"
"zendframework/zend-expressive-aurarouter": "^3.0 to use the Aura.Router routing adapter",
"zendframework/zend-expressive-fastroute": "^3.0 to use the FastRoute routing adapter",
"zendframework/zend-expressive-zendrouter": "^3.0 to use the zend-router routing adapter"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 9ecd970

Please sign in to comment.