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

Commit 84572c1

Browse files
committed
Prepares for 2.0.0 release
- Updates dependencies to stable (no alpha or rc) versions - Updates branch aliases: - dev-master => 2.0.x-dev - dev-develop => 2.1.x-dev - Removes dev-release-2.0.0 entry - Updates CHANGELOG: - Merges alpha entries into a single 2.0.0 entry with today's date - Removes empty 1.5.0 stub
1 parent 89d45b1 commit 84572c1

File tree

3 files changed

+37
-96
lines changed

3 files changed

+37
-96
lines changed

CHANGELOG.md

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,7 @@
22

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

5-
## 2.0.0alpha2 - 2018-02-07
6-
7-
### Added
8-
9-
- Nothing.
10-
11-
### Changed
12-
13-
- Nothing.
14-
15-
### Deprecated
16-
17-
- Nothing.
18-
19-
### Removed
20-
21-
- Nothing.
22-
23-
### Fixed
24-
25-
- [#53](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/53)
26-
adds the missing default layout.
27-
28-
## 2.0.0alpha1 - 2018-02-06
5+
## 2.0.0 - 2018-03-15
296

307
### Added
318

@@ -78,29 +55,8 @@ All notable changes to this project will be documented in this file, in reverse
7855

7956
### Fixed
8057

81-
- Nothing.
82-
83-
## 1.5.0 - TBD
84-
85-
### Added
86-
87-
- Nothing.
88-
89-
### Changed
90-
91-
- Nothing.
92-
93-
### Deprecated
94-
95-
- Nothing.
96-
97-
### Removed
98-
99-
- Nothing.
100-
101-
### Fixed
102-
103-
- Nothing.
58+
- [#53](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/53)
59+
adds the missing default layout.
10460

10561
## 1.4.2 - 2018-03-15
10662

composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"php": "^7.1",
2424
"psr/container": "^1.0",
2525
"psr/http-message": "^1.0.1",
26-
"zendframework/zend-expressive-helpers": "^5.0.0alpha1 || ^5.0",
27-
"zendframework/zend-expressive-router": "^3.0.0alpha1 || ^3.0",
28-
"zendframework/zend-expressive-template": "^2.0.0alpha1 || ^2.0",
26+
"zendframework/zend-expressive-helpers": "^5.0",
27+
"zendframework/zend-expressive-router": "^3.0",
28+
"zendframework/zend-expressive-template": "^2.0",
2929
"zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
3030
"zendframework/zend-view": "^2.8.1"
3131
},
@@ -52,9 +52,8 @@
5252
},
5353
"extra": {
5454
"branch-alias": {
55-
"dev-master": "1.4.x-dev",
56-
"dev-develop": "1.5.x-dev",
57-
"dev-release-2.0.0": "2.0.x-dev"
55+
"dev-master": "2.0.x-dev",
56+
"dev-develop": "2.1.x-dev"
5857
},
5958
"zf": {
6059
"config-provider": "Zend\\Expressive\\ZendView\\ConfigProvider"

composer.lock

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

0 commit comments

Comments
 (0)