Merge branch 'options-attributes' of git://github.com/neilime/zf2 int…

…o hotfix/3792
zendframework · Feb 19, 2013 · 4597759 · 4597759
2 parents 63e4aef + 741881d
commit 4597759
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/library/Zend/Form/View/Helper/FormSelect.php b/library/Zend/Form/View/Helper/FormSelect.php
@@ -160,6 +160,11 @@ public function renderOptions(array $options, array $selectedOptions = array())
             }
 
             $attributes = compact('value', 'selected', 'disabled');
+
+            if (isset($optionSpec['attributes']) && is_array($optionSpec['attributes'])) {
+            	$attributes = array_merge($attributes, $optionSpec['attributes']);
+            }
+
             $this->validTagAttributes = $this->validOptionAttributes;
             $optionStrings[] = sprintf(
                 $template,

diff --git a/tests/ZendTest/Form/View/Helper/FormSelectTest.php b/tests/ZendTest/Form/View/Helper/FormSelectTest.php
@@ -37,6 +37,9 @@ public function getElement()
             array(
                 'label' => 'This is the third label',
                 'value' => 'value3',
+                'attributes' => array(
+                    'class' => 'test-class',
+                ),
             ),
         );
         $element->setValueOptions($options);
@@ -58,6 +61,9 @@ public function testCreatesSelectWithOptionsFromAttribute()
         $this->assertContains('value="value1"', $markup);
         $this->assertContains('value="value2"', $markup);
         $this->assertContains('value="value3"', $markup);
+
+        //Test class attribute on third option
+        $this->assertRegexp('#option .*?value="value3" class="test-class"#', $markup);
     }
 
     public function testCanMarkSingleOptionAsSelected()