Merge branch 'bugfix558' of https://github.com/igormx/zf2 into hotfix…

…/zf2-558
zendframework · Sep 21, 2012 · 41c6931 · 41c6931
2 parents 3b9784c + b04198f
commit 41c6931
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 0 deletions.
diff --git a/library/Zend/Form/Element/MultiCheckbox.php b/library/Zend/Form/Element/MultiCheckbox.php
@@ -62,6 +62,13 @@ public function getValueOptions()
     public function setValueOptions(array $options)
     {
         $this->valueOptions = $options;
+
+        // Update InArray validator haystack
+        if (!is_null($this->validator)) {
+            $validator = $this->validator->getValidator();
+            $validator->setHaystack($this->getValueOptionsValues());
+        }
+
         return $this;
     }
 

diff --git a/library/Zend/Form/Element/Select.php b/library/Zend/Form/Element/Select.php
@@ -80,6 +80,13 @@ public function getValueOptions()
     public function setValueOptions(array $options)
     {
         $this->valueOptions = $options;
+
+        // Update InArrayValidator validator haystack
+        if (!is_null($this->validator)) {
+            $validator = $this->validator instanceof InArrayValidator ? $this->validator : $this->validator->getValidator();
+            $validator->setHaystack($this->getValueOptionsValues());          
+        }
+
         return $this;
     }
 

diff --git a/tests/ZendTest/Form/Element/MultiCheckboxTest.php b/tests/ZendTest/Form/Element/MultiCheckboxTest.php
@@ -105,6 +105,26 @@ public function testInArrayValidationOfOptions($valueTests, $options)
         $this->assertTrue($explodeValidator->isValid($valueTests));
     }
 
+    /**
+     * Testing that InArray Validator Haystack is Updated if the Options
+     * are added after the validator is attached
+     *
+     * @dataProvider multiCheckboxOptionsDataProvider
+     */
+    public function testInArrayValidatorHaystakIsUpdated($valueTests, $options)
+    {
+        $element = new MultiCheckboxElement('my-checkbox');
+        $inputSpec = $element->getInputSpecification();    	
+        $inArrayValidator=$inputSpec['validators'][0]->getValidator();
+
+        $element->setAttributes(array(
+    	    'options' => $options,
+    	));
+        $haystack=$inArrayValidator->getHaystack();
+        $this->assertCount(count($options), $haystack);
+    }
+
+
     public function testAttributeType()
     {
         $element = new MultiCheckboxElement();

diff --git a/tests/ZendTest/Form/Element/SelectTest.php b/tests/ZendTest/Form/Element/SelectTest.php
@@ -151,6 +151,26 @@ public function testInArrayValidationOfOptions($valueTests, $options)
             $this->assertTrue($inArrayValidator->isValid($valueToTest));
         }
     }
+
+    /**
+     * Testing that InArray Validator Haystack is Updated if the Options
+     * are added after the validator is attached
+     *
+     * @dataProvider selectOptionsDataProvider
+     */
+    public function testInArrayValidatorHaystakIsUpdated($valueTests, $options)
+    {
+        $element = new SelectElement('my-select');
+        $inputSpec = $element->getInputSpecification();
+
+        $inArrayValidator = $inputSpec['validators'][0];
+        $this->assertInstanceOf('Zend\Validator\InArray', $inArrayValidator);
+
+        $element->setValueOptions($options);
+        $haystack=$inArrayValidator->getHaystack();
+        $this->assertCount(count($options), $haystack);
+    }
+
 
     public function testOptionsHasArrayOnConstruct()
     {