Merging develop to master in preparation for 1.6.0 release.

.travis.yml

@@ -20,8 +20,7 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-        - TEST_COVERAGE=true
+        - LEGACY_DEPS="phpunit/phpunit zendframework/zend-hydrator"
     - php: 5.6
       env:
         - DEPS=latest
@@ -31,7 +30,7 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
+        - LEGACY_DEPS="phpunit/phpunit zendframework/zend-hydrator"
         - CS_CHECK=true
     - php: 7
       env:
@@ -42,6 +41,8 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+        - LEGACY_DEPS="zendframework/zend-hydrator"
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest

CHANGELOG.md

@@ -2,11 +2,11 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.5.1 - TBD
+## 1.6.0 - 2018-12-11
 
 ### Added
 
-- Nothing.
+- [#172](https://github.com/zfcampus/zf-hal/pull/172) adds support for zend-hydrator v3 releases (while retaining support for v1 and v2).
 
 ### Changed
 

composer.json

@@ -21,8 +21,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.5-dev",
-            "dev-develop": "1.6-dev"
+            "dev-master": "1.6.x-dev",
+            "dev-develop": "1.7.x-dev"
         },
         "zf": {
             "module": "ZF\\Hal"
@@ -34,7 +34,7 @@
         "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
         "zendframework/zend-filter": "^2.7.1",
         "zendframework/zend-http": "^2.5.4",
-        "zendframework/zend-hydrator": "^1.1 || ^2.2.1",
+        "zendframework/zend-hydrator": "^1.1 || ^2.2.1 || ^3.0",
         "zendframework/zend-mvc": "^2.7.15 || ^3.0.2",
         "zendframework/zend-paginator": "^2.7",
         "zendframework/zend-uri": "^2.5.2",
@@ -47,6 +47,9 @@
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "autoload": {
+        "files": [
+            "src/_autoload.php"
+        ],
         "psr-4": {
             "ZF\\Hal\\": "src/"
         }