Merge branch 'feature/162' into develop

Close #162

Author: weierophinney

CHANGELOG.md

@@ -10,6 +10,10 @@ All notable changes to this project will be documented in this file, in reverse
   for the `FormElementErrors` view helper to translate validation error messages
   using the composed translator and text domain instances.
 
+### Changed
+
+- Nothing.
+
 ### Deprecated
 
 - Nothing.
@@ -20,7 +24,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#162](https://github.com/zendframework/zend-form/pull/162) fixes an issue
+  with hydration when a form has called `setWrapElements(true)`, ensuring that
+  binding values in a fieldset will correctly identify the elements in the
+  provided data.
 
 ## 2.10.3 - TBD
 

src/Fieldset.php

@@ -569,9 +569,7 @@ public function bindValues(array $values = [], array $validationGroup = null)
         $hydrator = $this->getHydrator();
         $hydratableData = [];
 
-        foreach ($this->iterator as $element) {
-            $name = $element->getName();
-
+        foreach ($this->iterator as $name => $element) {
             if ($validationGroup
                 && (! array_key_exists($name, $validationGroup) && ! in_array($name, $validationGroup))
             ) {

test/FormTest.php

@@ -785,6 +785,39 @@ public function testCallingBindValuesWhenBindOnValidateIsDisabledPopulatesBoundO
         ], $model->foobar);
     }
 
+    public function testBindValuesWithWrappingPopulatesBoundObject()
+    {
+        $model = new stdClass;
+        $validSet = [
+            'foo' => 'abcde',
+            'bar' => ' ALWAYS valid ',
+            'foobar' => [
+                'foo' => 'abcde',
+                'bar' => ' always VALID',
+            ],
+        ];
+        $this->populateForm();
+        $this->form->setHydrator(new Hydrator\ObjectProperty());
+        $this->form->setName('formName');
+        $this->form->setWrapElements(true);
+        $this->form->prepare();
+        $this->form->bind($model);
+        $this->form->setData($validSet);
+
+        $this->assertObjectNotHasAttribute('foo', $model);
+        $this->assertObjectNotHasAttribute('bar', $model);
+        $this->assertObjectNotHasAttribute('foobar', $model);
+
+        $this->form->isValid();
+
+        $this->assertEquals($validSet['foo'], $model->foo);
+        $this->assertEquals('always valid', $model->bar);
+        $this->assertEquals([
+            'foo' => 'abcde',
+            'bar' => 'always valid',
+        ], $model->foobar);
+    }
+
     public function testHasFactoryComposedByDefault()
     {
         $factory = $this->form->getFormFactory();