Merge branch 'feature/hydrators' into develop

Close #30
zendframework · Sep 22, 2015 · 06431d7 · 06431d7
2 parents 71cfa87 + c17d369
commit 06431d7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,14 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.6.0 - TBD
+## 2.6.0 - 2015-09-22
 
 ### Added
 
-- Nothing.
+- [#30](https://github.com/zendframework/zend-mvc/pull/30) updates the component
+  to use zend-hydrator for hydrator functionality; this provides forward
+  compatibility with zend-hydrator, and backwards compatibility with
+  hydrators from older versions of zend-stdlib.
 
 ### Deprecated
 

diff --git a/composer.json b/composer.json
@@ -16,8 +16,9 @@
         "php": ">=5.5",
         "zendframework/zend-eventmanager": "~2.5",
         "zendframework/zend-servicemanager": "~2.5",
-        "zendframework/zend-form": "~2.5",
-        "zendframework/zend-stdlib": ">=2.5.0,<2.7.0"
+        "zendframework/zend-hydrator": "~1.0",
+        "zendframework/zend-form": "~2.6",
+        "zendframework/zend-stdlib": "~2.7"
     },
     "require-dev": {
         "zendframework/zend-authentication": "~2.5",
@@ -30,7 +31,7 @@
         "zendframework/zend-inputfilter": "~2.5",
         "zendframework/zend-json": "~2.5",
         "zendframework/zend-log": "~2.5",
-        "zendframework/zend-modulemanager": "~2.5",
+        "zendframework/zend-modulemanager": "~2.6",
         "zendframework/zend-session": "~2.5",
         "zendframework/zend-serializer": "~2.5",
         "zendframework/zend-text": "~2.5",

diff --git a/src/Service/HydratorManagerFactory.php b/src/Service/HydratorManagerFactory.php
@@ -11,5 +11,5 @@
 
 class HydratorManagerFactory extends AbstractPluginManagerFactory
 {
-    const PLUGIN_MANAGER_CLASS = 'Zend\Stdlib\Hydrator\HydratorPluginManager';
+    const PLUGIN_MANAGER_CLASS = 'Zend\Hydrator\HydratorPluginManager';
 }
diff --git a/test/Service/TestAsset/CustomForm.php b/test/Service/TestAsset/CustomForm.php
@@ -10,7 +10,7 @@
 namespace ZendTest\Mvc\Service\TestAsset;
 
 use Zend\Form\Form;
-use Zend\Stdlib\Hydrator\ClassMethods as ClassMethodsHydrator;
+use Zend\Hydrator\ClassMethods as ClassMethodsHydrator;
 
 class CustomForm extends Form
 {