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

Commit

Permalink
Merge branch 'hotfix/579-zend-expressive-router-rc4' into release-3.0.0
Browse files Browse the repository at this point in the history
Close #579
  • Loading branch information
weierophinney committed Mar 7, 2018
2 parents 3b781f4 + 6436197 commit 5f46ce4
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 189 deletions.
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,32 @@

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

## 3.0.0rc3 - 2018-03-07

### Added

- Nothing.

### Changed

- [#579](https://github.com/zendframework/zend-expressive/pull/579) updates the
version constraint for zend-expressive-router to use 3.0.0rc4 or later.

- [#579](https://github.com/zendframework/zend-expressive/pull/579) updates the
version constraint for zend-stratigility to use 3.0.0rc1 or later.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- Nothing.

## 3.0.0rc2 - 2018-03-06

### Added
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@
"psr/http-message": "^1.0.1",
"psr/http-server-middleware": "^1.0",
"zendframework/zend-diactoros": "^1.3.10",
"zendframework/zend-expressive-router": "^3.0.0alpha3",
"zendframework/zend-expressive-router": "^3.0.0rc4",
"zendframework/zend-expressive-template": "^2.0.0alpha1",
"zendframework/zend-httphandlerrunner": "^1.0.1",
"zendframework/zend-stratigility": "^3.0.0alpha4"
"zendframework/zend-stratigility": "^3.0.0rc1"
},
"require-dev": {
"filp/whoops": "^1.1.10 || ^2.1.13",
"malukenho/docheader": "^0.1.6",
"mockery/mockery": "^1.0",
"phpstan/phpstan": "^0.9.2",
"phpstan/phpstan-strict-rules": "^0.9.0",
"phpstan/phpstan-strict-rules": "^0.9",
"phpunit/phpunit": "^7.0.1",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-expressive-aurarouter": "^3.0.0alpha2",
"zendframework/zend-expressive-fastroute": "^3.0.0alpha1",
"zendframework/zend-expressive-zendrouter": "^3.0.0alpha1",
"zendframework/zend-expressive-aurarouter": "^3.0.0rc3",
"zendframework/zend-expressive-fastroute": "^3.0.0rc4",
"zendframework/zend-expressive-zendrouter": "^3.0.0rc3",
"zendframework/zend-servicemanager": "^2.7.8 || ^3.3"
},
"conflict": {
Expand Down
Loading

0 comments on commit 5f46ce4

Please sign in to comment.