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

Commit afab173

Browse files
committed
Merging develop to master in preparation for 2.14.0 release.
2 parents 03b17b9 + 337c9eb commit afab173

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

.travis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
sudo: false
2-
31
language: php
42

53
branches:
@@ -62,6 +60,15 @@ matrix:
6260
- php: 7.2
6361
env:
6462
- DEPS=latest
63+
- php: 7.3
64+
env:
65+
- DEPS=lowest
66+
- php: 7.3
67+
env:
68+
- DEPS=locked
69+
- php: 7.3
70+
env:
71+
- DEPS=latest
6572

6673
before_install:
6774
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

CHANGELOG.md

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

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

5-
## 2.13.1 - TBD
5+
## 2.14.0 - 2019-01-07
66

77
### Added
88

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

1111
### Changed
1212

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

1919
### Removed
2020

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

2323
### Fixed
2424

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": "^5.6 || ^7.0",
2020
"zendframework/zend-inputfilter": "^2.8",
2121
"zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
22-
"zendframework/zend-stdlib": "^2.7 || ^3.0"
22+
"zendframework/zend-stdlib": "^3.2.1"
2323
},
2424
"require-dev": {
2525
"doctrine/annotations": "~1.0",
@@ -69,8 +69,8 @@
6969
},
7070
"extra": {
7171
"branch-alias": {
72-
"dev-master": "2.13.x-dev",
73-
"dev-develop": "2.14.x-dev"
72+
"dev-master": "2.14.x-dev",
73+
"dev-develop": "2.15.x-dev"
7474
},
7575
"zf": {
7676
"component": "Zend\\Form",

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)