Merge pull request phalcon#10790 from theDisco/2.0.x

Correctly assing keys and values to select field options
aniculescu · Aug 17, 2015 · b6f0e26 · b6f0e26
2 parents 571b20f + 5b978d0
commit b6f0e26
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/phalcon/forms/element/select.zep b/phalcon/forms/element/select.zep
@@ -74,7 +74,14 @@ class Select extends Element implements ElementInterface {
 	 */
 	public function addOption(var option) -> <Element>
 	{
-		let this->_optionsValues[] = option;
+		if is_array(option) {
+			var key, value;
+			for key, value in option {
+				let this->_optionsValues[key] = value;
+			}
+		} else {
+			let this->_optionsValues[] = option;
+		}
 		return this;
 	}
 

diff --git a/unit-tests/FormsTest.php b/unit-tests/FormsTest.php
@@ -517,4 +517,20 @@ public function testIssue2045()
 
 		$this->assertEquals('<input type="text" name="name" class="big-input" />', $element->render());
 	}
+
+	public function testCorrectlyAddOptionToSelectElementIfParameterIsAnArray()
+	{
+		$element = new Select('test-select');
+		$element->addOption(array('key' => 'value'));
+
+		$this->assertEquals('<select id="test-select" name="test-select"><option value="key">value</option></select>', preg_replace('/[[:cntrl:]]/', '', $element->render()));
+	}
+
+	public function testCorrectlyAddOptionToSelectElementIfParameterIsAString()
+	{
+		$element = new Select('test-select');
+		$element->addOption('value');
+
+		$this->assertEquals('<select id="test-select" name="test-select"><option value="0">value</option></select>', preg_replace('/[[:cntrl:]]/', '', $element->render()));
+	}
 }