Merge branch 'hotfix/5926' into develop

Close zendframework/zendframework#5926
zendframework · Mar 7, 2014 · 1628530 · 1628530
commit 1628530
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Factory.php b/src/Factory.php
@@ -303,6 +303,9 @@ public function createInputFilter($inputFilterSpecification)
             if (isset($inputFilterSpecification['count'])) {
                 $inputFilter->setCount($inputFilterSpecification['count']);
             }
+            if (isset($inputFilterSpecification['required'])) {
+                $inputFilter->setIsRequired($inputFilterSpecification['required']);
+            }
             return $inputFilter;
         }
 

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -439,12 +439,14 @@ public function testFactoryAcceptsCollectionInputFilter()
 
         $inputFilter = $factory->createInputFilter(array(
             'type'        => 'Zend\InputFilter\CollectionInputFilter',
+            'required'    => true,
             'inputfilter' => new InputFilter(),
-            'count'       => 3
+            'count'       => 3,
         ));
 
         $this->assertInstanceOf('Zend\InputFilter\CollectionInputFilter', $inputFilter);
         $this->assertInstanceOf('Zend\InputFilter\InputFilter', $inputFilter->getInputFilter());
+        $this->assertTrue($inputFilter->getIsRequired());
         $this->assertEquals(3, $inputFilter->getCount());
     }