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

Commit d9c9162

Browse files
committed
Merge branch 'feature/15-psr-15' into release-1.0.0
Close #15
2 parents 2145176 + ab73fe4 commit d9c9162

File tree

6 files changed

+107
-103
lines changed

6 files changed

+107
-103
lines changed

CHANGELOG.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5-
## 1.0.0alpha1 - TBD
5+
## 1.0.0alpha1 - 2018-02-07
66

77
### Added
88

9-
- [#3](https://github.com/zendframework/zend-expressive-authentication/pull/3)
10-
adds support for http-interop/http-middleware.
9+
- [#15](https://github.com/zendframework/zend-expressive-authentication/pull/15)
10+
adds support for PSR-15.
1111

1212
### Changed
1313

@@ -19,8 +19,10 @@ All notable changes to this project will be documented in this file, in reverse
1919

2020
### Removed
2121

22-
- [#3](https://github.com/zendframework/zend-expressive-authentication/pull/3)
23-
removes support for http-interop/http-middleware.
22+
- [#15](https://github.com/zendframework/zend-expressive-authentication/pull/15) and
23+
[#3](https://github.com/zendframework/zend-expressive-authentication/pull/3)
24+
remove support for http-interop/http-middleware and
25+
http-interop/http-server-middleware.
2426

2527
### Fixed
2628

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017, Zend Technologies USA, Inc.
1+
Copyright (c) 2017-2018, Zend Technologies USA, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"http",
1010
"middleware",
1111
"zend-expressive",
12-
"psr-7"
12+
"psr-7",
13+
"psr-15"
1314
],
1415
"support": {
1516
"docs": "https://docs.zendframework.com/zend-expressive-authentication/",
@@ -21,12 +22,12 @@
2122
},
2223
"require": {
2324
"php": "^7.1",
24-
"http-interop/http-server-middleware": "^1.0.1",
2525
"psr/container": "^1.0",
26-
"psr/http-message": "^1.0.1"
26+
"psr/http-message": "^1.0.1",
27+
"psr/http-server-middleware": "^1.0"
2728
},
2829
"require-dev": {
29-
"phpunit/phpunit": "^6.3",
30+
"phpunit/phpunit": "^6.5.5",
3031
"roave/security-advisories": "dev-master",
3132
"zendframework/zend-coding-standard": "~1.0.0"
3233
},

0 commit comments

Comments
 (0)