Merge branch 'patch-11' of https://github.com/davidwindell/zf2

zendframework · Aug 17, 2012 · 2f42641 · 2f42641
2 parents ae574d5 + 6dae4a2
commit 2f42641
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/library/Zend/Form/Element/Select.php b/library/Zend/Form/Element/Select.php
@@ -43,7 +43,8 @@ class Select extends Element implements InputProviderInterface
      * @var array
      */
     protected $attributes = array(
-        'type' => 'select',
+        'type'    => 'select',
+        'options' => array(),
     );
 
     /**

diff --git a/tests/ZendTest/Form/Element/SelectTest.php b/tests/ZendTest/Form/Element/SelectTest.php
@@ -118,4 +118,10 @@ public function testInArrayValidationOfOptions($valueTests, $options)
             $this->assertTrue($inArrayValidator->isValid($valueToTest));
         }
     }
+
+    public function testOptionsHasArrayOnConstruct()
+    {
+        $element = new SelectElement();
+        $this->assertTrue(is_array($element->getAttribute('options')));
+    }
 }