Merging develop to master in preparation for 2.11.0 release

.gitattributes

@@ -1,8 +1,10 @@
-/test export-ignore
-/vendor export-ignore
-.coveralls.yml export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-.php_cs export-ignore
-phpunit.xml.dist export-ignore
+/.coveralls.yml export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/composer.lock export-ignore
+/docs/ export-ignore
+/mkdocs.yml export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/test/ export-ignore

.gitignore

@@ -1,16 +1,7 @@
-.buildpath
-.DS_Store
-.idea
-.project
-.settings/
-.*.sw*
-.*.un~
-nbproject
-doc/html/
-tmp/
-zf-mkdoc-theme/
-
-clover.xml
-coveralls-upload.json
-phpunit.xml
-vendor
+/clover.xml
+/coveralls-upload.json
+/docs/html/
+/phpunit.xml
+/vendor/
+/zf-mkdoc-theme.tgz
+/zf-mkdoc-theme/

.travis.yml

@@ -4,7 +4,7 @@ language: php
 
 branches:
   except:
-    - /^release-\d+\.\d+\.\d+.*$/
+    - /^release-.*$/
     - /^ghgfk-.*$/
 
 cache:
@@ -16,7 +16,6 @@ env:
   global:
     - COMPOSER_ARGS="--no-interaction"
     - COVERAGE_DEPS="satooshi/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit"
     - TESTS_ZEND_FORM_ANNOTATION_SUPPORT=true
     - TESTS_ZEND_FORM_RECAPTCHA_SUPPORT=true
 
@@ -28,17 +27,17 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - CS_CHECK=true
+        - LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code"
     - php: 5.6
       env:
         - DEPS=latest
-        - TEST_COVERAGE=true
     - php: 7
       env:
         - DEPS=lowest
     - php: 7
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code"
     - php: 7
       env:
         - DEPS=latest
@@ -48,28 +47,27 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=lowest
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=locked
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: hhvm
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - travis_retry composer self-update
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
-  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi

CHANGELOG.md

@@ -2,10 +2,21 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.10.3 - TBD
+## 2.11.0 - TBD
 
 ### Added
 
+- [#104](https://github.com/zendframework/zend-form/pull/104) adds the ability
+  for the `FormElementErrors` view helper to translate validation error messages
+  using the composed translator and text domain instances.
+
+- [#171](https://github.com/zendframework/zend-form/pull/171),
+  [#186](https://github.com/zendframework/zend-form/pull/186), and
+  [#187](https://github.com/zendframework/zend-form/pull/187) add support for
+  PHP 7.2.
+
+### Changed
+
 - Nothing.
 
 ### Deprecated
@@ -14,11 +25,29 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#171](https://github.com/zendframework/zend-form/pull/171) removes support
+  for HHVM.
+
+- [#186](https://github.com/zendframework/zend-form/pull/186) removes support
+  for PHP 5.5.
 
 ### Fixed
 
-- Nothing.
+- [#162](https://github.com/zendframework/zend-form/pull/162) fixes an issue
+  with hydration when a form has called `setWrapElements(true)`, ensuring that
+  binding values in a fieldset will correctly identify the elements in the
+  provided data.
+
+- [#172](https://github.com/zendframework/zend-form/pull/172) fixes the
+  `DateTime` element such that it no longer attempts to use its
+  `DATETIME_FORMAT` constant, but, rather, the value of the `$format` property,
+  when representing the element; this change allows developers to override the
+  format, which was the original intention.
+
+- [#178](https://github.com/zendframework/zend-form/pull/178) loosens the checks
+  in `Zend\Form\Element\DateTime::getValue()` to check against PHP's `DateTimeInterface` (vs
+  `DateTime`) when retrieving the value; this fixes edge cases where it was
+  instead returning the format for `DateTimeImmutable` values.
 
 ## 2.10.2 - 2017-05-18
 
@@ -102,6 +131,28 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#139](https://github.com/zendframework/zend-form/pull/139) adds support for 
+  ReCaptcha version 2 though zend-captcha 2.7.1.
+
+## 2.10.0 - 2017-02-23
+
+### Added
+
+- [#115](https://github.com/zendframework/zend-form/pull/115) adds translatable
+  HTML attributes to the abstract view helper.
+- [#116](https://github.com/zendframework/zend-form/pull/116) adds the InputFilterFactory
+  dependency to the constructor.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
 - [#139](https://github.com/zendframework/zend-form/pull/139) adds support for 
   ReCaptcha version 2 though zend-captcha 2.7.1.
 

LICENSE.md

@@ -1,16 +1,15 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
-
+Copyright (c) 2005-2017, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
 
 - Neither the name of Zend Technologies USA, Inc. nor the names of its
   contributors may be used to endorse or promote products derived from this

README.md

@@ -1,7 +1,7 @@
 # zend-form
 
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-form.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-form)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-form/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-form?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-form/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-form?branch=master)
 
 zend-form is intended primarily as a bridge between your domain models and
 the View Layer. It composes a thin layer of objects representing form elements,

composer.json

@@ -1,23 +1,23 @@
 {
     "name": "zendframework/zend-form",
-    "description": " ",
+    "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "form"
     ],
-    "homepage": "https://github.com/zendframework/zend-form",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Form\\": "src/"
-        },
-        "files": [
-            "autoload/formElementManagerPolyfill.php"
-        ]
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-form/",
+        "issues": "https://github.com/zendframework/zend-form/issues",
+        "source": "https://github.com/zendframework/zend-form",
+        "rss": "https://github.com/zendframework/zend-form/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
-        "php": "^7.0 || ^5.6",
-        "zendframework/zend-inputfilter": "^2.6",
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-inputfilter": "^2.8",
         "zendframework/zend-hydrator": "^1.1 || ^2.1",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
@@ -31,12 +31,12 @@
         "zendframework/zend-filter": "^2.6",
         "zendframework/zend-i18n": "^2.6",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-session": "^2.6.2",
+        "zendframework/zend-session": "^2.8.1",
         "zendframework/zend-text": "^2.6",
         "zendframework/zend-validator": "^2.6",
         "zendframework/zend-view": "^2.6.2",
         "zendframework/zendservice-recaptcha": "^3.0.0",
-        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+        "phpunit/phpunit": "^5.7.23 || ^6.5.3",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "suggest": {
@@ -48,8 +48,22 @@
         "zendframework/zend-view": "^2.6.2, required for using the zend-form view helpers",
         "zendframework/zendservice-recaptcha": "in order to use the ReCaptcha form element"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
+    "autoload": {
+        "psr-4": {
+            "Zend\\Form\\": "src/"
+        },
+        "files": [
+            "autoload/formElementManagerPolyfill.php"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "ZendTest\\Form\\": "test/"
+        }
+    },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.10-dev",
@@ -60,14 +74,6 @@
             "config-provider": "Zend\\Form\\ConfigProvider"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "ZendTest\\Form\\": "test/"
-        }
-    },
-    "config": {
-        "process-timeout": 0
-    },
     "scripts": {
         "check": [
             "@cs-check",