Merge branch 'hotfix/form-multicheckbox' into releases/2.0.1

zendframework · Aug 30, 2012 · ff0927a · ff0927a
2 parents 4ce1f7e + bd8f89b
commit ff0927a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -17,6 +17,8 @@ XX August 2012
 - Zend\Di
   - Fixes ArrayDefinition and ClassDefinition hasMethods() methods to return
     boolean values.
+- Zend\Form
+  - Fixes issue with multi-checkbox rendering.
 - Zend\Ldap
   - Fixes an error nesting condition
 - Zend\Log

diff --git a/library/Zend/Form/Element/MultiCheckbox.php b/library/Zend/Form/Element/MultiCheckbox.php
@@ -21,6 +21,15 @@
  */
 class MultiCheckbox extends Checkbox
 {
+    /**
+     * Seed attributes
+     *
+     * @var array
+     */
+    protected $attributes = array(
+        'type' => 'multi_checkbox',
+    );
+
     /**
      * @var bool
      */

diff --git a/library/Zend/Form/View/Helper/FormRow.php b/library/Zend/Form/View/Helper/FormRow.php
@@ -99,7 +99,7 @@ public function render(ElementInterface $element)
             // Multicheckbox elements have to be handled differently as the HTML standard does not allow nested
             // labels. The semantic way is to group them inside a fieldset
             $type = $element->getAttribute('type');
-            if ($type === 'multi_checkbox' || $type === 'multicheckbox' || $type === 'radio') {
+            if ($type === 'multi_checkbox' || $type === 'radio') {
                 $markup = sprintf(
                     '<fieldset><legend>%s</legend>%s</fieldset>',
                     $label,

diff --git a/tests/ZendTest/Form/Element/MultiCheckboxTest.php b/tests/ZendTest/Form/Element/MultiCheckboxTest.php
@@ -104,4 +104,13 @@ public function testInArrayValidationOfOptions($valueTests, $options)
         $this->assertInstanceOf('Zend\Validator\Explode', $explodeValidator);
         $this->assertTrue($explodeValidator->isValid($valueTests));
     }
+
+    public function testAttributeType()
+    {
+        $element = new MultiCheckboxElement();
+        $attributes = $element->getAttributes();
+
+        $this->assertArrayHasKey('type', $attributes);
+        $this->assertEquals('multi_checkbox', $attributes['type']);
+    }
 }
diff --git a/tests/ZendTest/Form/View/Helper/FormElementTest.php b/tests/ZendTest/Form/View/Helper/FormElementTest.php
@@ -112,10 +112,13 @@ public function testRendersMultiElementsAsExpected($type, $inputType, $additiona
     {
         if ($type === 'radio') {
             $element = new Element\Radio('foo');
+            $this->assertEquals('radio', $element->getAttribute('type'));
         } elseif ($type === 'multi_checkbox') {
             $element = new Element\MultiCheckbox('foo');
+            $this->assertEquals('multi_checkbox', $element->getAttribute('type'));
         } elseif ($type === 'select') {
             $element = new Element\Select('foo');
+            $this->assertEquals('select', $element->getAttribute('type'));
         } else {
             $element = new Element('foo');
         }