Merge branch 'hotfix/3922' into develop

Close #3922
zendframework · Mar 11, 2013 · 5da8ff7 · 5da8ff7
2 parents 27e71d4 + 052728c
commit 5da8ff7
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 4 deletions.
diff --git a/library/Zend/Form/Element/Select.php b/library/Zend/Form/Element/Select.php
@@ -46,6 +46,11 @@ class Select extends Element implements InputProviderInterface
      */
     protected $validator;
 
+    /**
+     * @var bool
+     */
+    protected $disableInArrayValidator = false;
+
     /**
      * Create an empty option (option with label but no value). If set to null, no option is created
      *
@@ -119,6 +124,10 @@ public function setOptions($options)
             $this->setEmptyOption($this->options['empty_option']);
         }
 
+        if (isset($this->options['disable_inarray_validator'])) {
+            $this->setDisableInArrayValidator($this->options['disable_inarray_validator']);
+        }
+
         return $this;
     }
 
@@ -140,6 +149,28 @@ public function setAttribute($key, $value)
         return parent::setAttribute($key, $value);
     }
 
+    /**
+     * Set the flag to allow for disabling the automatic addition of an InArray validator.
+     *
+     * @param bool $disableOption
+     * @return Select
+     */
+    public function setDisableInArrayValidator($disableOption)
+    {
+        $this->disableInArrayValidator = (bool) $disableOption;
+        return $this;
+    }
+
+    /**
+     * Get the disable in array validator flag.
+     *
+     * @return bool
+     */
+    public function disableInArrayValidator()
+    {
+        return $this->disableInArrayValidator;
+    }
+
     /**
      * Set the string for an empty option (can be empty string). If set to null, no option will be added
      *
@@ -169,7 +200,7 @@ public function getEmptyOption()
      */
     protected function getValidator()
     {
-        if (null === $this->validator) {
+        if (null === $this->validator && !$this->disableInArrayValidator()) {
             $validator = new InArrayValidator(array(
                 'haystack' => $this->getValueOptionsValues(),
                 'strict'   => false
@@ -202,11 +233,14 @@ public function getInputSpecification()
         $spec = array(
             'name' => $this->getName(),
             'required' => true,
-            'validators' => array(
-                $this->getValidator()
-            )
         );
 
+        if ($validator = $this->getValidator()) {
+            $spec['validators'] = array(
+                $validator,
+            );
+        }
+
         return $spec;
     }
 

diff --git a/tests/ZendTest/Form/Element/SelectTest.php b/tests/ZendTest/Form/Element/SelectTest.php
@@ -205,5 +205,18 @@ public function testSetOptionsOptions()
         $this->assertEquals(array('baz' => 'foo'), $element->getOption('empty_option'));
     }
 
+    public function testDisableInputSpecification()
+    {
+        $element = new SelectElement();
+        $element->setValueOptions(array(
+            'Option 1' => 'option1',
+            'Option 2' => 'option2',
+            'Option 3' => 'option3',
+        ));
+        $element->setDisableInArrayValidator(true);
+
+        $inputSpec = $element->getInputSpecification();
+        $this->assertArrayNotHasKey('validators', $inputSpec);
+    }
 
 }