Merge pull request #4 from simara-esports/master

Forms: Selectbox allow item with null caption [ID => null]

Author: dg

src/Forms/Controls/ChoiceControl.php

@@ -58,7 +58,7 @@ public function loadHttpData()
 	 */
 	public function setValue($value)
 	{
-		if ($value !== NULL && !isset($this->items[(string) $value])) {
+		if ($value !== NULL && !array_key_exists((string) $value, $this->items)) {
 			$range = Nette\Utils\Strings::truncate(implode(', ', array_map(function($s) { return var_export($s, TRUE); }, $this->items)), 70, '...');
 			throw new Nette\InvalidArgumentException("Value '$value' is out of allowed range [$range] in field '{$this->name}'.");
 		}
@@ -73,7 +73,7 @@ public function setValue($value)
 	 */
 	public function getValue()
 	{
-		return isset($this->items[$this->value]) ? $this->value : NULL;
+		return array_key_exists($this->value, $this->items) ? $this->value : NULL;
 	}
 
 

tests/Forms/Controls.ChoiceControl.loadData.phpt

@@ -188,3 +188,16 @@ test(function() use ($series) { // disabled one
 
 	Assert::null( $input->getValue() );
 });
+
+test(function() {
+	$_POST = array('select' => 1);
+
+	$form = new Form;
+	$input = $form['select'] = new ChoiceControl(NULL);
+	$input->setItems(array(
+		1 => NULL,
+		2 => 'Red dwarf'
+	));
+
+	Assert::same( 1, $input->getValue() );
+});

tests/Forms/Controls.SelectBox.loadData.phpt

@@ -266,3 +266,15 @@ test(function() use ($series) { // disabled one
 
 	Assert::null( $input->getValue() );
 });
+
+test(function() {
+	$_POST = array('select' => 1);
+
+	$form = new Form;
+	$input = $form->addSelect('select', NULL, array(
+		1 => NULL,
+		2 => 'Red dwarf'
+	));
+
+	Assert::same( 1, $input->getValue() );
+});