Merge branch 'hotfix/6494'

Fixes #6494
zendframework · Aug 7, 2014 · f83dec7 · f83dec7
2 parents ce45124 + 51793f8
commit f83dec7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/library/Zend/InputFilter/CollectionInputFilter.php b/library/Zend/InputFilter/CollectionInputFilter.php
@@ -156,11 +156,13 @@ public function isValid()
             }
         }
 
-        if (count($this->data) < $this->getCount()) {
+        if (is_scalar($this->data)
+            || count($this->data) < $this->getCount()
+        ) {
             $valid = false;
         }
 
-        if (empty($this->data)) {
+        if (empty($this->data) || is_scalar($this->data)) {
             $this->clearValues();
             $this->clearRawValues();
 

diff --git a/tests/ZendTest/InputFilter/CollectionInputFilterTest.php b/tests/ZendTest/InputFilter/CollectionInputFilterTest.php
@@ -771,4 +771,14 @@ public function testNestingCollectionCountCached($count, $expectedIsValid)
         $mainInputFilter->setData($data);
         $this->assertSame($expectedIsValid, $mainInputFilter->isValid());
     }
+
+    public function testInvalidCollectionIsNotValid()
+    {
+        $data = 1;
+
+        $this->filter->setInputFilter($this->getBaseInputFilter());
+        $this->filter->setData($data);
+
+        $this->assertFalse($this->filter->isValid());
+    }
 }