From d6ed696a6f9bc1b8b6668ab55f8a26674b43e445 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 28 Feb 2014 08:18:26 +0700
Subject: [PATCH] Fixes #5648

---
 .../InputFilter/CollectionInputFilter.php     |  1 -
 .../ZendTest/InputFilter/InputFilterTest.php  | 25 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/library/Zend/InputFilter/CollectionInputFilter.php b/library/Zend/InputFilter/CollectionInputFilter.php
index fa937ce0eef..e678ffba821 100644
--- a/library/Zend/InputFilter/CollectionInputFilter.php
+++ b/library/Zend/InputFilter/CollectionInputFilter.php
@@ -159,7 +159,6 @@ public function isValid()
             if ($this->isRequired) {
                 $valid = false;
             }
-            return $valid;
         }
 
         if (count($this->collectionData) < $this->getCount()) {
diff --git a/tests/ZendTest/InputFilter/InputFilterTest.php b/tests/ZendTest/InputFilter/InputFilterTest.php
index b4641895c81..58d2e341f1b 100644
--- a/tests/ZendTest/InputFilter/InputFilterTest.php
+++ b/tests/ZendTest/InputFilter/InputFilterTest.php
@@ -11,7 +11,9 @@
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Filter;
+use Zend\InputFilter\CollectionInputFilter;
 use Zend\InputFilter\Factory;
+use Zend\InputFilter\Input;
 use Zend\InputFilter\InputFilter;
 
 class InputFilterTest extends TestCase
@@ -43,4 +45,27 @@ public function testCanAddUsingSpecification()
         $foo = $this->filter->get('foo');
         $this->assertInstanceOf('Zend\InputFilter\InputInterface', $foo);
     }
+
+    /**
+     * @group ZF2-5648
+     */
+    public function testCountZeroValidateInternalInputWithCollectionInputFilter()
+    {
+        $collection = new CollectionInputFilter();
+        $collection->setCount(0)
+                   ->add(new Input(), 'name');
+        $this->filter->add($collection, 'people');
+
+        $data = array(
+            'people' => array(
+                array(
+                    'name' => 'Wanderson',
+                ),
+            ),
+        );
+        $this->filter->setData($data);
+
+        $this->assertTrue($this->filter->isvalid());
+        $this->assertSame($data, $this->filter->getValues());
+    }
 }