Merge branch 'hotfix/4516'

Close zendframework/zendframework#4516

src/CollectionInputFilter.php

@@ -145,7 +145,7 @@ public function getCount()
      */
     public function setData($data)
     {
-        $this->collectionData = array_values($data);
+        $this->collectionData = $data;
     }
 
     /**
@@ -162,13 +162,16 @@ public function isValid()
             return $valid;
         }
 
-        $inputCollection = array_fill(0, $this->getCount(), $this->validationGroup ?: array_keys($this->inputs));
+        if (count($this->collectionData) < $this->getCount()) {
+            $valid = false;
+        }
 
-        foreach ($inputCollection as $key => $inputs) {
-            $this->data = array();
-            if (isset($this->collectionData[$key])) {
-               $this->data = $this->collectionData[$key];
+        $inputs = $this->validationGroup ?: array_keys($this->inputs);
+        foreach ($this->collectionData as $key => $data) {
+            if (!is_array($data)) {
+                $data = array();
             }
+            $this->data = $data;
             $this->populate();
 
             if ($this->validateInputs($inputs)) {

test/CollectionInputFilterTest.php

@@ -163,6 +163,16 @@ public function testCanValidateValidData()
         $this->assertTrue($this->filter->isValid());
     }
 
+    public function testCanValidateValidDataWithNonConsecutiveKeys()
+    {
+        $collectionData = $this->getValidCollectionData();
+        $collectionData[2] = $collectionData[0];
+        unset($collectionData[0]);
+        $this->filter->setInputFilter($this->getBaseInputFilter());
+        $this->filter->setData($collectionData);
+        $this->assertTrue($this->filter->isValid());
+    }
+
     public function testInvalidDataReturnsFalse()
     {
         $invalidCollectionData = array(