Merging develop to master in preparation for master release.

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,46 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.9.0 - 2018-12-17
+
+### Added
+
+- [#172](https://github.com/zendframework/zend-inputfilter/pull/172) adds support for PSR-7 `UploadedFileInterface` to `Zend\InputFilter\FileInput`.
+  It adds a new interface, `Zend\InputFilter\FileInput\FileInputDecoratorInterface`, 
+  which defines methods required for validating and filtering file uploads. It
+  also provides two implementations of it, one for standard SAPI file uploads,
+  and the other for PSR-7 uploads. The `FileInput` class does detection on the
+  value being tested and decorates itself using the appropriate decorator, which
+  then performs the work of validating and filtering the upload or uploads.
+
+- [#170](https://github.com/zendframework/zend-inputfilter/pull/170) adds the ability to set a "required" message on a `CollectionInputFilter`.
+  By default, such instances will lazy-load a `NotEmpty` validator, and use its
+  messages to report that the collection was empty if it is marked as required.
+  If you wish to set a different message, you have two options:
+
+  - provide a custom `NotEmpty` validator via the new method
+    `setNotEmptyValidator()`.
+
+  - if using a factory, provide the key `required_message` as a sibling to
+    `required`, containing the custom message. This will replace the typical
+    `IS_EMPTY` message.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.8.3 - 2018-12-13
 
 ### Added

composer.json

@@ -12,8 +12,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.8.x-dev",
-            "dev-develop": "2.9.x-dev"
+            "dev-master": "2.9.x-dev",
+            "dev-develop": "2.10.x-dev"
         },
         "zf": {
             "component": "Zend\\InputFilter",
@@ -30,15 +30,19 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "zendframework/zend-filter": "^2.6",
+        "zendframework/zend-filter": "^2.9.1",
+        "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1",
         "zendframework/zend-stdlib": "^2.7 || ^3.0",
-        "zendframework/zend-validator": "^2.10.1",
-        "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
+        "zendframework/zend-validator": "^2.11"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "psr/http-message": "^1.0",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
+    "suggest": {
+        "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
+    },
     "autoload": {
         "psr-4": {
             "Zend\\InputFilter\\": "src/"