fixes #6585

library/Zend/Form/Form.php

@@ -300,7 +300,8 @@ public function bind($object, $flags = FormInterface::VALUES_NORMALIZED)
 
         $this->bindAs = $flags;
         $this->setObject($object);
-        $this->extract();
+        $data = $this->extract();
+        $this->populateValues($data, true);
 
         return $this;
     }
@@ -480,6 +481,7 @@ public function isValid()
 
         if (!is_array($this->data)) {
             $data = $this->extract();
+            $this->populateValues($data, true);
             if (!is_array($data)) {
                 throw new Exception\DomainException(sprintf(
                     '%s is unable to validate as there is no data currently set',
@@ -867,7 +869,24 @@ public function wrapElements()
     }
 
     /**
-     * Recursively extract values for elements and sub-fieldsets, and populate form values
+     * {@inheritDoc}
+     *
+     * @param bool $onlyBase
+     */
+    public function populateValues($data, $onlyBase = false)
+    {
+        if ($onlyBase && $this->baseFieldset !== null) {
+            $name = $this->baseFieldset->getName();
+            if (array_key_exists($name, $data)) {
+                $this->baseFieldset->populateValues($data[$name]);
+            }
+        } else {
+            parent::populateValues($data);
+        }
+    }
+
+    /**
+     * Recursively extract values for elements and sub-fieldsets
      *
      * @return array
      */
@@ -876,10 +895,8 @@ protected function extract()
         if (null !== $this->baseFieldset) {
             $name = $this->baseFieldset->getName();
             $values[$name] = $this->baseFieldset->extract();
-            $this->baseFieldset->populateValues($values[$name]);
         } else {
             $values = parent::extract();
-            $this->populateValues($values);
         }
 
         return $values;

tests/ZendTest/Form/Element/CollectionTest.php

@@ -479,6 +479,85 @@ public function testCreatesNewObjectsIfSpecified()
         $this->assertNotSame($categories[1], $cat2);
     }
 
+    public function testAddingCollectionElementAfterBind()
+    {
+        $form = new Form();
+        $form->setHydrator(new ObjectPropertyHydrator());
+
+        $phone = new \ZendTest\Form\TestAsset\PhoneFieldset();
+
+        $form->add(array(
+            'name' => 'phones',
+            'type' => 'Collection',
+            'options' => array(
+                'target_element' => $phone,
+                'count' => 1,
+                'allow_add' => true
+            ),
+        ));
+
+        $data = array(
+            'phones' => array(
+                array('number' => '1234567'),
+                array('number' => '1234568'),
+            )
+        );
+
+        $phone = new Phone();
+        $phone->setNumber($data['phones'][0]['number']);
+
+        $customer = new stdClass();
+        $customer->phones = array($phone);
+
+        $form->bind($customer);
+        $form->setData($data);
+        $this->assertTrue($form->isValid());
+    }
+
+    public function testDoesNotCreateNewObjectsWhenUsingNestedCollections()
+    {
+        $addressesFieldeset = new \ZendTest\Form\TestAsset\AddressFieldset();
+        $addressesFieldeset->setHydrator(new \Zend\Stdlib\Hydrator\ClassMethods());
+        $addressesFieldeset->remove('city');
+
+        $form = new Form();
+        $form->setHydrator(new ObjectPropertyHydrator());
+        $form->add(array(
+            'name' => 'addresses',
+            'type' => 'Collection',
+            'options' => array(
+                'target_element' => $addressesFieldeset,
+                'count' => 1
+            ),
+        ));
+
+        $data = array(
+            'addresses' =>
+                array(array(
+                    'street' => 'street1',
+                    'phones' =>
+                        array(array('number' => '1234567')),
+                ))
+        );
+
+        $phone  = new Phone();
+        $phone->setNumber($data['addresses'][0]['phones'][0]['number']);
+
+        $address = new Address();
+        $address->setStreet($data['addresses'][0]['street']);
+        $address->setPhones(array($phone));
+
+        $customer = new stdClass();
+        $customer->addresses = array($address);
+
+        $form->bind($customer);
+        $form->setData($data);
+
+        $this->assertTrue($form->isValid());
+        $phones = $customer->addresses[0]->getPhones();
+        $this->assertSame($phone, $phones[0]);
+    }
+
     public function testDoNotCreateExtraFieldsetOnMultipleBind()
     {
         $form = new \Zend\Form\Form();

tests/ZendTest/Form/FieldsetTest.php

@@ -14,6 +14,7 @@
 use Zend\Form\Form;
 use Zend\Form\Fieldset;
 use Zend\InputFilter\InputFilter;
+use Zend\Stdlib\Hydrator;
 
 class FieldsetTest extends TestCase
 {
@@ -522,4 +523,25 @@ public function testShouldValidateAllowObjectBindingByObject()
         $this->assertTrue($allowed);
     }
 
+    public function testBindValuesPreservesNewValueAfterValidation()
+    {
+        $form = new Form();
+        $form->add(new Element('foo'));
+        $form->setHydrator(new Hydrator\ObjectProperty);
+
+        $object      = new \stdClass();
+        $object->foo = 'Initial value';
+        $form->bind($object);
+
+        $form->setData(array(
+            'foo' => 'New value'
+        ));
+
+        $this->assertSame('New value', $form->get('foo')->getValue());
+
+        $form->isValid();
+
+        $this->assertSame('New value', $form->get('foo')->getValue());
+    }
+
 }