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

Commit

Permalink
Merging develop to master in preparation for 2.14.0 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Jan 7, 2019
2 parents 03b17b9 + 337c9eb commit afab173
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
11 changes: 9 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
sudo: false

language: php

branches:
Expand Down Expand Up @@ -62,6 +60,15 @@ matrix:
- php: 7.2
env:
- DEPS=latest
- php: 7.3
env:
- DEPS=lowest
- php: 7.3
env:
- DEPS=locked
- php: 7.3
env:
- DEPS=latest

before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
Expand Down
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

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

## 2.13.1 - TBD
## 2.14.0 - 2019-01-07

### Added

- Nothing.
- [#228](https://github.com/zendframework/zend-form/pull/228) adds support for PHP 7.3.

### Changed

Expand All @@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse

### Removed

- Nothing.
- [#228](https://github.com/zendframework/zend-form/pull/228) removes support for zend-stdlib v2 releases.

### Fixed

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"php": "^5.6 || ^7.0",
"zendframework/zend-inputfilter": "^2.8",
"zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
"zendframework/zend-stdlib": "^3.2.1"
},
"require-dev": {
"doctrine/annotations": "~1.0",
Expand Down Expand Up @@ -69,8 +69,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.13.x-dev",
"dev-develop": "2.14.x-dev"
"dev-master": "2.14.x-dev",
"dev-develop": "2.15.x-dev"
},
"zf": {
"component": "Zend\\Form",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit afab173

Please sign in to comment.