Merge branch 'hotfix/122' into develop

Forward port #122

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.9.2 - TBD
+## 2.9.2 - 2016-09-22
 
 ### Added
 
@@ -36,7 +36,11 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#122](https://github.com/zendframework/zend-form/pull/122) fixes collection
+  binding following successful validation. The fix introduced in #106, while it
+  corrected the behavior around binding a collection that was not re-submitted,
+  broke behavior around binding submitted collections. #122 corrects the issue,
+  retaining the fix from #106.
 
 ## 2.9.1 - 2016-09-14
 

src/Fieldset.php

@@ -570,7 +570,7 @@ public function bindValues(array $values = [], array $validationGroup = null)
         foreach ($this->iterator as $element) {
             $name = $element->getName();
 
-            if ($validationGroup && (array_key_exists($name, $validationGroup) || !in_array($name, $validationGroup))) {
+            if ($validationGroup && (!array_key_exists($name, $validationGroup) && !in_array($name, $validationGroup))) {
                 continue;
             }
 

test/FormTest.php

@@ -567,6 +567,47 @@ public function testSettingValidationGroupBindsOnlyThoseValuesToModel()
         $this->assertObjectNotHasAttribute('foobar', $model);
     }
 
+    public function testFormWithCollectionAndValidationGroupBindValuesToModel()
+    {
+        $model = new stdClass;
+        $data = [
+            'foo' => 'abcde',
+            'categories' => [
+                [
+                    'name' => 'category'
+                ]
+            ]
+        ];
+        $this->populateForm();
+        $this->form->add([
+            'type' => 'Zend\Form\Element\Collection',
+            'name' => 'categories',
+            'options' => [
+                'count' => 0,
+                'target_element' => [
+                    'type' => 'ZendTest\Form\TestAsset\CategoryFieldset'
+                ]
+            ]
+        ]);
+        $this->form->setHydrator(new Hydrator\ObjectProperty());
+        $this->form->bind($model);
+        $this->form->setData($data);
+        $this->form->setValidationGroup([
+            'foo',
+            'categories' => [
+                'name'
+            ]
+        ]);
+        $this->form->isValid();
+
+        $this->assertObjectHasAttribute('foo', $model);
+        $this->assertEquals('abcde', $model->foo);
+        $this->assertObjectHasAttribute('categories', $model);
+        $this->assertObjectHasAttribute('name', $model->categories[0]);
+        $this->assertEquals('category', $model->categories[0]->getName());
+        $this->assertObjectNotHasAttribute('foobar', $model);
+    }
+
     public function testSettingValidationGroupWithoutCollectionBindsOnlyThoseValuesToModel()
     {
         $model = new stdClass;