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

Commit 5e04b61

Browse files
committed
Merge branch 'feature/zend-hydrator-v3' into develop
Close #224
2 parents 3e8c526 + dfbe461 commit 5e04b61

34 files changed

+1480
-700
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ matrix:
2727
- php: 5.6
2828
env:
2929
- DEPS=locked
30-
- LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code"
30+
- LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code zendframework/zend-hydrator zendframework/zend-captcha"
3131
- php: 5.6
3232
env:
3333
- DEPS=latest
@@ -37,7 +37,7 @@ matrix:
3737
- php: 7
3838
env:
3939
- DEPS=locked
40-
- LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code"
40+
- LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code zendframework/zend-hydrator"
4141
- php: 7
4242
env:
4343
- DEPS=latest
@@ -47,6 +47,7 @@ matrix:
4747
- php: 7.1
4848
env:
4949
- DEPS=locked
50+
- LEGACY_DEPS="zendframework/zend-hydrator"
5051
- CS_CHECK=true
5152
- TEST_COVERAGE=true
5253
- php: 7.1

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ All notable changes to this project will be documented in this file, in reverse
66

77
### Added
88

9-
- [#211](https://github.com/zendframework/zend-form/pull/211) adds support for the HTML5 `minlength` attribute in all form elements that support it.
9+
- [#224](https://github.com/zendframework/zend-form/pull/224) adds support for zend-hydrator v3 releases, while keeping support for
10+
versions 1 and 2.
11+
12+
- [#211](https://github.com/zendframework/zend-form/pull/211) adds support for the HTML5 `minlength` attribute in all form elements
13+
that support it.
1014

1115
- [#217](https://github.com/zendframework/zend-form/pull/217) adds `Zend\Form\View\HelperTrait`, which can be used to provide IDE
1216
autocompletion for view helpers provided by zend-form. See

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^5.6 || ^7.0",
2020
"zendframework/zend-inputfilter": "^2.8",
21-
"zendframework/zend-hydrator": "^1.1 || ^2.1",
21+
"zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
2222
"zendframework/zend-stdlib": "^2.7 || ^3.0"
2323
},
2424
"require-dev": {
@@ -57,6 +57,9 @@
5757
]
5858
},
5959
"autoload-dev": {
60+
"files": [
61+
"test/_autoload.php"
62+
],
6063
"psr-4": {
6164
"ZendTest\\Form\\": "test/"
6265
}

0 commit comments

Comments
 (0)