Merge branch 'hotfix/14'

Close #14

Author: weierophinney

CHANGELOG.md

@@ -18,7 +18,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#14](https://github.com/zendframework/zend-form/pull/14) ensures that
+  collections can remove all elements when populating values.
 
 ## 2.6.0 - 2015-09-22
 

src/Element/Collection.php

@@ -195,11 +195,6 @@ public function populateValues($data)
             ));
         }
 
-        // Can't do anything with empty data
-        if (empty($data)) {
-            return;
-        }
-
         if (!$this->allowRemove && count($data) < $this->count) {
             throw new Exception\DomainException(sprintf(
                 'There are fewer elements than specified in the collection (%s). Either set the allow_remove option '

test/Element/CollectionTest.php

@@ -938,11 +938,15 @@ public function testCanRemoveAllElementsIfAllowRemoveIsTrue()
         $collection->setAllowRemove(true);
         $collection->setCount(0);
 
-
         // By default, $collection contains 2 elements
         $data = [];
+        $data[] = 'blue';
+        $data[] = 'green';
 
         $collection->populateValues($data);
+        $this->assertEquals(2, count($collection->getElements()));
+
+        $collection->populateValues([]);
         $this->assertEquals(0, count($collection->getElements()));
     }
 
@@ -1233,14 +1237,14 @@ public function testCollectionShouldSilentlyIgnorePopulatingFieldsetWithDisallow
     public function testCanHydrateObject()
     {
         $form = $this->form;
+        $object = new \ArrayObject();
+        $form->bind($object);
         $data = [
             'colors' => [
                 '#ffffff',
             ],
         ];
         $form->setData($data);
-        $object = new \ArrayObject();
-        $form->bind($object);
         $this->assertTrue($form->isValid());
         $this->assertInternalType('array', $object['colors']);
         $this->assertCount(1, $object['colors']);