Merge pull request #5926 from fabiocarneiro/hotfix-factory-collection…

…-input-filter-required Fix for missing required option for CollectionInputFilter
zendframework · Mar 7, 2014 · d3a692a · d3a692a
2 parents 4599c6c + 12441a8
commit d3a692a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/library/Zend/InputFilter/Factory.php b/library/Zend/InputFilter/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/tests/ZendTest/InputFilter/FactoryTest.php b/tests/ZendTest/InputFilter/FactoryTest.php
@@ -439,12 +439,14 @@ public function testFactoryAcceptsCollectionInputFilter()
 
         $inputFilter = $factory->createInputFilter(array(
             'type'        => 'Zend\InputFilter\CollectionInputFilter',
+            'required' => true,
             'inputfilter' => new InputFilter(),
             'count'       => 3
         ));
 
         $this->assertInstanceOf('Zend\InputFilter\CollectionInputFilter', $inputFilter);
         $this->assertInstanceOf('Zend\InputFilter\InputFilter', $inputFilter->getInputFilter());
+        $this->assertTrue($inputFilter->getIsRequired());
         $this->assertEquals(3, $inputFilter->getCount());
     }