Merge branch 'hotfix/4374'

Close zendframework/zendframework#4374

src/CollectionInputFilter.php

@@ -28,6 +28,11 @@ class CollectionInputFilter extends InputFilter
      */
     protected $collectionInvalidInputs;
 
+    /*
+     * @var bool
+     */
+    protected $isRequired = false;
+
     /*
      * @var int
      */
@@ -87,6 +92,29 @@ public function getInputFilter()
         return $this->inputFilter;
     }
 
+    /**
+     * Set if the collection can be empty
+     *
+     * @param bool $isRequired
+     * @return CollectionInputFilter
+     */
+    public function setIsRequired($isRequired)
+    {
+        $this->isRequired = $isRequired;
+        return $this;
+    }
+
+    /**
+     * Get if collection can be empty
+     *
+     * @return bool
+     */
+    public function getIsRequired()
+    {
+        return $this->isRequired;
+    }
+
+
     /**
      * Set the count of data to validate
      *
@@ -128,6 +156,9 @@ public function isValid()
         $valid = true;
 
         if ($this->getCount() < 1) {
+            if ($this->isRequired) {
+                $valid = false;
+            }
             return $valid;
         }
 

test/CollectionInputFilterTest.php

@@ -354,4 +354,31 @@ public function testSetValidationGroupUsingFormStyle()
 
         $this->assertTrue($this->filter->isValid());
     }
+
+    public function testEmptyCollectionIsValidByDefault()
+    {
+        $data = array();
+
+        $this->filter->setInputFilter($this->getBaseInputFilter());
+        $this->filter->setData($data);
+
+        $this->assertTrue($this->filter->isValid());
+    }
+
+    public function testEmptyCollectionIsNotValidIfRequired()
+    {
+        $data = array();
+
+        $this->filter->setInputFilter($this->getBaseInputFilter());
+        $this->filter->setData($data);
+        $this->filter->setIsRequired(true);
+
+        $this->assertFalse($this->filter->isValid());
+    }
+
+    public function testSetRequired()
+    {
+        $this->filter->setIsRequired(true);
+        $this->assertEquals(true,$this->filter->getIsRequired());
+    }
 }