Merging develop to master in preparation for 2.13.0 release.

Author: weierophinney

.travis.yml

@@ -27,7 +27,7 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code"
+        - LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code zendframework/zend-hydrator zendframework/zend-captcha"
     - php: 5.6
       env:
         - DEPS=latest
@@ -37,7 +37,7 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code"
+        - LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code zendframework/zend-hydrator"
     - php: 7
       env:
         - DEPS=latest
@@ -47,6 +47,7 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+        - LEGACY_DEPS="zendframework/zend-hydrator"
         - CS_CHECK=true
         - TEST_COVERAGE=true
     - php: 7.1

CHANGELOG.md

@@ -2,6 +2,37 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.13.0 - 2018-12-11
+
+### Added
+
+- [#224](https://github.com/zendframework/zend-form/pull/224) adds support for zend-hydrator v3 releases, while keeping support for
+  versions 1 and 2.
+
+- [#211](https://github.com/zendframework/zend-form/pull/211) adds support for the HTML5 `minlength` attribute in all form elements
+  that support it.
+
+- [#217](https://github.com/zendframework/zend-form/pull/217) adds `Zend\Form\View\HelperTrait`, which can be used to provide IDE
+  autocompletion for view helpers provided by zend-form. See
+  https://docs.zendframework.com/zend-form/view-helpers/#ide-auto-completion-in-templates
+  for more information.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.12.1 - 2018-12-11
 
 ### Added

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": "^5.6 || ^7.0",
         "zendframework/zend-inputfilter": "^2.8",
-        "zendframework/zend-hydrator": "^1.1 || ^2.1",
+        "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
@@ -57,6 +57,9 @@
         ]
     },
     "autoload-dev": {
+        "files": [
+            "test/_autoload.php"
+        ],
         "psr-4": {
             "ZendTest\\Form\\": "test/"
         }
@@ -66,8 +69,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.12.x-dev",
-            "dev-develop": "2.13.x-dev"
+            "dev-master": "2.13.x-dev",
+            "dev-develop": "2.14.x-dev"
         },
         "zf": {
             "component": "Zend\\Form",