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

Commit 3a70af1

Browse files
committed
Prepares for 3.0.0 release
- Updates dependencies to stable (not rc or alpha) versions - Updates branch aliases: - dev-master => 3.0.x-dev - dev-develop => 3.1.x-dev - Merges all alpha and rc changelogs into a single 3.0.0 changelog with today's date
1 parent e4239c8 commit 3a70af1

File tree

3 files changed

+35
-131
lines changed

3 files changed

+35
-131
lines changed

CHANGELOG.md

Lines changed: 13 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -2,106 +2,7 @@
22

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

5-
## 3.0.0rc3 - 2018-03-07
6-
7-
### Added
8-
9-
- Nothing.
10-
11-
### Changed
12-
13-
- [#41](https://github.com/zendframework/zend-expressive-zendrouter/pull/41)
14-
updates the minimum supported version of zend-expressive-router to 3.0.0rc3
15-
and later.
16-
17-
### Deprecated
18-
19-
- Nothing.
20-
21-
### Removed
22-
23-
- Nothing.
24-
25-
### Fixed
26-
27-
- Nothing.
28-
29-
## 3.0.0rc2 - 2018-03-06
30-
31-
### Added
32-
33-
- Nothing.
34-
35-
### Changed
36-
37-
- [#40](https://github.com/zendframework/zend-expressive-zendrouter/pull/40)
38-
updates the minimum supported version of zend-expressive-router to 3.0.0rc2.
39-
40-
### Deprecated
41-
42-
- Nothing.
43-
44-
### Removed
45-
46-
- Nothing.
47-
48-
### Fixed
49-
50-
- [#40](https://github.com/zendframework/zend-expressive-zendrouter/pull/40)
51-
fixes how the router creates a `RouteResult` when the path matches, but not
52-
the HTTP method. In particular, it does not provide special handling for
53-
`HEAD` requests, treating them like any other method mismatch.
54-
55-
## 3.0.0rc1 - 2018-03-05
56-
57-
### Added
58-
59-
- Nothing.
60-
61-
### Changed
62-
63-
- [#37](https://github.com/zendframework/zend-expressive-zendrouter/pull/37)
64-
updates the package to pin to zend-expressive-router 3.0.0rc1 or later.
65-
66-
### Deprecated
67-
68-
- Nothing.
69-
70-
### Removed
71-
72-
- Nothing.
73-
74-
### Fixed
75-
76-
- [#37](https://github.com/zendframework/zend-expressive-zendrouter/pull/37)
77-
fixes an issue with how a failure result is marshaled when the path patches
78-
but the request method does not. The package now correctly aggregates allowed
79-
methods for the route result failure instance.
80-
81-
## 3.0.0alpha2 - 2018-02-07
82-
83-
### Added
84-
85-
- Nothing.
86-
87-
### Changed
88-
89-
- Nothing.
90-
91-
### Deprecated
92-
93-
- Nothing.
94-
95-
### Removed
96-
97-
- Nothing.
98-
99-
### Fixed
100-
101-
- [#36](https://github.com/zendframework/zend-expressive-zendrouter/pull/36)
102-
fixes the composer config provider entry.
103-
104-
## 3.0.0alpha1 - 2018-02-06
5+
## 3.0.0 - 2018-03-15
1056

1067
### Added
1078

@@ -115,7 +16,9 @@ All notable changes to this project will be documented in this file, in reverse
11516

11617
### Changed
11718

118-
- Nothing.
19+
- [#41](https://github.com/zendframework/zend-expressive-zendrouter/pull/41)
20+
updates the minimum supported version of zend-expressive-router to 3.0.0rc3
21+
and later.
11922

12023
### Deprecated
12124

@@ -131,7 +34,15 @@ All notable changes to this project will be documented in this file, in reverse
13134

13235
### Fixed
13336

134-
- Nothing.
37+
- [#37](https://github.com/zendframework/zend-expressive-zendrouter/pull/37)
38+
fixes an issue with how a failure result is marshaled when the path patches
39+
but the request method does not. The package now correctly aggregates allowed
40+
methods for the route result failure instance.
41+
42+
- [#40](https://github.com/zendframework/zend-expressive-zendrouter/pull/40)
43+
fixes how the router creates a `RouteResult` when the path matches, but not
44+
the HTTP method. In particular, it does not provide special handling for
45+
`HEAD` requests, treating them like any other method mismatch.
13546

13647
## 2.2.0 - 2018-03-08
13748

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"php": "^7.1",
2424
"fig/http-message-util": "^1.1.2",
2525
"psr/http-message": "^1.0.1",
26-
"zendframework/zend-expressive-router": "^3.0.0rc3",
26+
"zendframework/zend-expressive-router": "^3.0",
2727
"zendframework/zend-psr7bridge": "^0.2.2 || ^1.0.0",
2828
"zendframework/zend-router": "^3.0.2"
2929
},
@@ -32,7 +32,7 @@
3232
"phpunit/phpunit": "^7.0.2",
3333
"zendframework/zend-coding-standard": "~1.0.0",
3434
"zendframework/zend-i18n": "^2.7.4",
35-
"zendframework/zend-stratigility": "^3.0.0rc1"
35+
"zendframework/zend-stratigility": "^3.0"
3636
},
3737
"autoload": {
3838
"psr-4": {
@@ -49,8 +49,8 @@
4949
},
5050
"extra": {
5151
"branch-alias": {
52-
"dev-master": "2.2.x-dev",
53-
"dev-develop": "3.0.x-dev"
52+
"dev-master": "3.0.x-dev",
53+
"dev-develop": "3.1.x-dev"
5454
},
5555
"zf": {
5656
"config-provider": "Zend\\Expressive\\Router\\ZendRouter\\ConfigProvider"

composer.lock

Lines changed: 18 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)