ChoiceControl, MultiChoiceControl: added $checkAllowedValues [Closes #28]

Author: dg

src/Forms/Controls/ChoiceControl.php

@@ -19,6 +19,9 @@
  */
 abstract class ChoiceControl extends BaseControl
 {
+	/** @var bool */
+	public $checkAllowedValues = TRUE;
+
 	/** @var array */
 	private $items = [];
 
@@ -56,7 +59,7 @@ public function loadHttpData()
 	 */
 	public function setValue($value)
 	{
-		if ($value !== NULL && !array_key_exists((string) $value, $this->items)) {
+		if ($this->checkAllowedValues && $value !== NULL && !array_key_exists((string) $value, $this->items)) {
 			$set = Nette\Utils\Strings::truncate(implode(', ', array_map(function ($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');
 			throw new Nette\InvalidArgumentException("Value '$value' is out of allowed set [$set] in field '{$this->name}'.");
 		}

src/Forms/Controls/MultiChoiceControl.php

@@ -19,6 +19,9 @@
  */
 abstract class MultiChoiceControl extends BaseControl
 {
+	/** @var bool */
+	public $checkAllowedValues = TRUE;
+
 	/** @var array */
 	private $items = [];
 
@@ -65,7 +68,7 @@ public function setValue($values)
 			$flip[(string) $value] = TRUE;
 		}
 		$values = array_keys($flip);
-		if ($diff = array_diff($values, array_keys($this->items))) {
+		if ($this->checkAllowedValues && ($diff = array_diff($values, array_keys($this->items)))) {
 			$set = Nette\Utils\Strings::truncate(implode(', ', array_map(function ($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');
 			$vals = (count($diff) > 1 ? 's' : '') . " '" . implode("', '", $diff) . "'";
 			throw new Nette\InvalidArgumentException("Value$vals are out of allowed set [$set] in field '{$this->name}'.");

tests/Forms/Controls.ChoiceControl.loadData.phpt

@@ -151,6 +151,15 @@ test(function () use ($series) { // setValue() and invalid argument
 });
 
 
+test(function () use ($series) { // setValue() and disabled $checkAllowedValues
+	$form = new Form;
+	$input = $form['select'] = new ChoiceControl(NULL, $series);
+	$input->checkAllowedValues = FALSE;
+	$input->setValue('unknown');
+	Assert::null($input->getValue());
+});
+
+
 test(function () { // object as value
 	$form = new Form;
 	$input = $form['select'] = new ChoiceControl(NULL, ['2013-07-05 00:00:00' => 1]);

tests/Forms/Controls.MultiChoiceControl.loadData.phpt

@@ -172,6 +172,23 @@ test(function () use ($series) { // setValue() and invalid argument
 });
 
 
+test(function () use ($series) { // setValue() and disabled $checkAllowedValues
+	$form = new Form;
+	$input = $form['select'] = new MultiChoiceControl(NULL, $series);
+	$input->checkAllowedValues = FALSE;
+	$input->setValue('unknown');
+	Assert::same([], $input->getValue());
+
+	Assert::exception(function () use ($input) {
+		$input->setValue(new stdClass);
+	}, 'Nette\InvalidArgumentException', "Value must be array or NULL, object given in field 'select'.");
+
+	Assert::exception(function () use ($input) {
+		$input->setValue([new stdClass]);
+	}, 'Nette\InvalidArgumentException', "Values must be scalar, object given in field 'select'.");
+});
+
+
 test(function () { // object as value
 	$form = new Form;
 	$input = $form['select'] = new MultiChoiceControl(NULL, ['2013-07-05 00:00:00' => 1]);