Merge branch 'hotfix/5970' into develop

weierophinney · weierophinney · commit 477755eaa70e · 2014-04-14T08:52:31.000-05:00
Forward port #5970
diff --git a/library/Zend/Form/Element/Radio.php b/library/Zend/Form/Element/Radio.php
@@ -29,7 +29,7 @@ class Radio extends MultiCheckbox
      */
     protected function getValidator()
     {
-        if (null === $this->validator) {
+        if (null === $this->validator && !$this->disableInArrayValidator()) {
             $this->validator = new InArrayValidator(array(
                 'haystack'  => $this->getValueOptionsValues(),
                 'strict'    => false,
diff --git a/tests/ZendTest/Form/Element/RadioTest.php b/tests/ZendTest/Form/Element/RadioTest.php
@@ -85,4 +85,18 @@ public function testInArrayValidationOfOptions($valueTests, $options)
             $this->assertTrue($inArrayValidator->isValid($valueToTest));
         }
     }
+
+    public function testDisableInputSpecification()
+    {
+        $element = new RadioElement();
+        $element->setValueOptions(array(
+            'Option 1' => 'option1',
+            'Option 2' => 'option2',
+            'Option 3' => 'option3',
+        ));
+        $element->setDisableInArrayValidator(true);
+
+        $inputSpec = $element->getInputSpecification();
+        $this->assertArrayNotHasKey('validators', $inputSpec);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class Radio extends MultiCheckbox`
`29`	`29`	`*/`
`30`	`30`	`protected function getValidator()`
`31`	`31`	`{`
`32`		`- if (null === $this->validator) {`
	`32`	`+ if (null === $this->validator && !$this->disableInArrayValidator()) {`
`33`	`33`	`$this->validator = new InArrayValidator(array(`
`34`	`34`	`'haystack' => $this->getValueOptionsValues(),`
`35`	`35`	`'strict' => false,`
Original file line number	Diff line number	Diff line change
`@@ -85,4 +85,18 @@ public function testInArrayValidationOfOptions($valueTests, $options)`
`85`	`85`	`$this->assertTrue($inArrayValidator->isValid($valueToTest));`
`86`	`86`	`}`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ public function testDisableInputSpecification()`
	`90`	`+ {`
	`91`	`+ $element = new RadioElement();`
	`92`	`+ $element->setValueOptions(array(`
	`93`	`+ 'Option 1' => 'option1',`
	`94`	`+ 'Option 2' => 'option2',`
	`95`	`+ 'Option 3' => 'option3',`
	`96`	`+ ));`
	`97`	`+ $element->setDisableInArrayValidator(true);`
	`98`	`+`
	`99`	`+ $inputSpec = $element->getInputSpecification();`
	`100`	`+ $this->assertArrayNotHasKey('validators', $inputSpec);`
	`101`	`+ }`
`88`	`102`	`}`