Create a HydratorAwareInterface. Use the Fieldset object hydrator if …

…its able to provide one

library/Zend/Form/Fieldset.php

@@ -13,6 +13,7 @@
 use Zend\Stdlib\Hydrator;
 use Zend\Stdlib\Hydrator\HydratorInterface;
 use Zend\Stdlib\PriorityQueue;
+use Zend\Stdlib\Hydrator\HydratorAwareInterface;
 
 class Fieldset extends Element implements FieldsetInterface
 {
@@ -480,14 +481,21 @@ public function setHydrator(HydratorInterface $hydrator)
     /**
      * Get the hydrator used when binding an object to the fieldset
      *
+     * If no hydrator is present and object implements HydratorAwareInterface,
+     * hydrator will be retrieved from the object.
+     *
      * Will lazy-load Hydrator\ArraySerializable if none is present.
      *
      * @return HydratorInterface
      */
     public function getHydrator()
     {
         if (!$this->hydrator instanceof HydratorInterface) {
-            $this->setHydrator(new Hydrator\ArraySerializable());
+            if ($this->object instanceof HydratorAwareInterface) {
+                $this->setHydrator($this->object->getHydrator());
+            } else {
+                $this->setHydrator(new Hydrator\ArraySerializable());
+            }
         }
         return $this->hydrator;
     }

library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator;
+
+interface HydratorAwareInterface
+{
+    /**
+     * Set hydrator
+     *
+     * @param  HydratorInterface $hydrator
+     * @return HydratorAwareInterface
+     */
+    public function setHydrator(HydratorInterface $hydrator);
+
+    /**
+     * Retrieve hydrator
+     *
+     * @return HydratorInterface
+     */
+    public function getHydrator();
+}