From b69e6fbe0bd86da7e1da6df8ed68e8eea7f57ea1 Mon Sep 17 00:00:00 2001 From: fabiocarneiro Date: Thu, 6 Mar 2014 12:06:15 -0300 Subject: [PATCH 1/2] Fix for missing required option for CollectionInputFilter --- library/Zend/InputFilter/Factory.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/Zend/InputFilter/Factory.php b/library/Zend/InputFilter/Factory.php index 6ac6bc2be5c..0d60fb0d043 100644 --- 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; } From 12441a8a8640c5b4ded4aab223e094c51822d76f Mon Sep 17 00:00:00 2001 From: fabiocarneiro Date: Thu, 6 Mar 2014 12:31:30 -0300 Subject: [PATCH 2/2] Test for CollectionInputFilter required option --- tests/ZendTest/InputFilter/FactoryTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/ZendTest/InputFilter/FactoryTest.php b/tests/ZendTest/InputFilter/FactoryTest.php index ffd3d539716..83142cbfbdf 100644 --- 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()); }