ChoiceControl, MultiChoiceControl::$checkAllowedValues removed, use checkDefaultValue()

Author: dg

src/Forms/Controls/ChoiceControl.php

@@ -20,11 +20,8 @@
  */
 abstract class ChoiceControl extends BaseControl
 {
-	/**
-	 * @var bool
-	 * @deprecated use checkDefaultValue()
-	 */
-	public $checkAllowedValues = true;
+	/** @var bool */
+	private $checkDefaultValue = true;
 
 	/** @var array */
 	private $items = [];
@@ -63,7 +60,7 @@ public function loadHttpData(): void
 	 */
 	public function setValue($value)
 	{
-		if ($this->checkAllowedValues && $value !== null && !array_key_exists((string) $value, $this->items)) {
+		if ($this->checkDefaultValue && $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}'.");
 		}
@@ -157,7 +154,7 @@ public function setDisabled($value = true)
 	 */
 	public function checkDefaultValue(bool $value = true)
 	{
-		$this->checkAllowedValues = $value;
+		$this->checkDefaultValue = $value;
 		return $this;
 	}
 }

src/Forms/Controls/MultiChoiceControl.php

@@ -20,11 +20,8 @@
  */
 abstract class MultiChoiceControl extends BaseControl
 {
-	/**
-	 * @var bool
-	 * @deprecated use checkDefaultValue()
-	 */
-	public $checkAllowedValues = true;
+	/** @var bool */
+	private $checkDefaultValue = true;
 
 	/** @var array */
 	private $items = [];
@@ -71,7 +68,7 @@ public function setValue($values)
 			$flip[(string) $value] = true;
 		}
 		$values = array_keys($flip);
-		if ($this->checkAllowedValues && ($diff = array_diff($values, array_keys($this->items)))) {
+		if ($this->checkDefaultValue && ($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}'.");
@@ -169,7 +166,7 @@ public function getHtmlName(): string
 	 */
 	public function checkDefaultValue(bool $value = true)
 	{
-		$this->checkAllowedValues = $value;
+		$this->checkDefaultValue = $value;
 		return $this;
 	}
 }