Merging develop to master in preparation for 1.7.0 release.

zfcampus · Dec 11, 2018 · d474fc5 · d474fc5
2 parents e3474c3 + 8d2839f
commit d474fc5
Show file tree

Hide file tree

Showing 4 changed files with 244 additions and 288 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
       env:
         - DEPS=locked
         - ENABLE_EXT_MONGO=true
-        - ALTERNATE_DEPS="phpunit/phpunit zendframework/zend-code zendframework/zend-permissions-rbac"
+        - ALTERNATE_DEPS="phpunit/phpunit zendframework/zend-code zendframework/zend-permissions-rbac zendframework/zend-hydrator zfcampus/zf-oauth2"
     - php: 5.6
       env:
         - DEPS=latest
@@ -36,7 +36,7 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
-        - ALTERNATE_DEPS="phpunit/phpunit zendframework/zend-code zendframework/zend-permissions-rbac"
+        - ALTERNATE_DEPS="phpunit/phpunit zendframework/zend-code zendframework/zend-permissions-rbac zendframework/zend-hydrator"
         - ENABLE_EXT_MONGODB=true
         - CS_CHECK=true
     - php: 7
@@ -50,6 +50,7 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+        - ALTERNATE_DEPS="zendframework/zend-hydrator"
         - ENABLE_EXT_MONGODB=true
     - php: 7.1
       env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.6.1 - TBD
+## 1.7.0 - 2018-12-11
 
 ### Added
 
-- Nothing.
+- [#396](https://github.com/zfcampus/zf-apigility-admin/pull/396) adds support for zend-hydrator v3 releases, and maintains compatibility
+  with v1 and v2.
 
 ### Changed
 

diff --git a/composer.json b/composer.json
@@ -18,8 +18,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.6.x-dev",
-            "dev-develop": "1.7.x-dev"
+            "dev-master": "1.7.x-dev",
+            "dev-develop": "1.8.x-dev"
         },
         "zf": {
             "module": "ZF\\Apigility\\Admin"
@@ -31,7 +31,7 @@
         "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
         "zendframework/zend-filter": "^2.8",
         "zendframework/zend-http": "^2.8",
-        "zendframework/zend-hydrator": "^1.1 || ^2.4",
+        "zendframework/zend-hydrator": "^1.1 || ^2.4 || ^3.0",
         "zendframework/zend-inputfilter": "^2.8.1",
         "zendframework/zend-modulemanager": "^2.8.2",
         "zendframework/zend-mvc": "^2.7.15 || ^3.1.1",