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

Commit

Permalink
Merge branch 'features/2.4-support' into develop
Browse files Browse the repository at this point in the history
Close #42
  • Loading branch information
weierophinney committed Mar 8, 2018
2 parents 5f12fb2 + fe6a725 commit 4846b96
Show file tree
Hide file tree
Showing 5 changed files with 166 additions and 273 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -8,7 +8,7 @@ cache:

env:
global:
- COMPOSER_ARGS="--no-interaction"
- COMPOSER_ARGS="--no-interaction --no-scripts"
- COVERAGE_DEPS="php-coveralls/php-coveralls"

matrix:
Expand All @@ -19,7 +19,7 @@ matrix:
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- LEGACY_DEPS="phpunit/phpunit symfony/console symfony/finder"
- php: 5.6
env:
- DEPS=latest
Expand All @@ -29,7 +29,7 @@ matrix:
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- LEGACY_DEPS="phpunit/phpunit symfony/console symfony/finder"
- php: 7
env:
- DEPS=latest
Expand Down
27 changes: 3 additions & 24 deletions CHANGELOG.md
Expand Up @@ -2,37 +2,16 @@

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

## 2.2.0 - TBD
## 2.2.0 - 2018-03-08

### Added

- Nothing.

### Changed

- Nothing.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- Nothing.

## 2.1.1 - TBD

### Added

- Nothing.

### Changed

- Nothing.
- [#42](https://github.com/zendframework/zend-expressive-zendrouter/pull/42)
updates the minimum supported version of zend-expressive-router to 2.4.0.

### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -23,7 +23,7 @@
"php": "^5.6 || ^7.0",
"fig/http-message-util": "^1.1.2",
"psr/http-message": "^1.0.1",
"zendframework/zend-expressive-router": "^2.1",
"zendframework/zend-expressive-router": "^2.4",
"zendframework/zend-psr7bridge": "^0.2.2 || ^1.0.0",
"zendframework/zend-router": "^3.0.2"
},
Expand Down

0 comments on commit 4846b96

Please sign in to comment.