ChoiceControl, MultiChoiceControl: extracted getItem() method

Author: dg

src/Forms/Controls/CheckboxList.php

@@ -85,10 +85,7 @@ public function getLabel($caption = null): Html
 	public function getControlPart($key = null): Html
 	{
 		$key = key([(string) $key => null]);
-		if (!array_key_exists($key, $this->getItems())) {
-			throw new Nette\InvalidArgumentException("Item '$key' does not exist in field '{$this->getName()}'.");
-		}
-
+		$this->getItem($key);
 		return parent::getControl()->addAttributes([
 			'id' => $this->getHtmlId() . '-' . $key,
 			'checked' => in_array($key, (array) $this->value, strict: true),
@@ -109,12 +106,8 @@ public function getLabelPart($key = null): Html
 		}
 
 		$key = key([(string) $key => null]);
-		if (!array_key_exists($key, $this->getItems())) {
-			throw new Nette\InvalidArgumentException("Item '$key' does not exist in field '{$this->getName()}'.");
-		}
-
 		$itemLabel = clone $this->itemLabel;
-		return $itemLabel->setText($this->translate($this->getItems()[$key]))->for($this->getHtmlId() . '-' . $key);
+		return $itemLabel->setText($this->translate($this->getItem($key)))->for($this->getHtmlId() . '-' . $key);
 	}
 
 

src/Forms/Controls/ChoiceControl.php

@@ -153,4 +153,16 @@ public function checkDefaultValue(bool $value = true): static
 		$this->checkDefaultValue = $value;
 		return $this;
 	}
+
+
+	/**
+	 * Returns the item label for the given key, or throws an exception if the key does not exist.
+	 */
+	protected function getItem(string|int $key): mixed
+	{
+		$key = key([(string) $key => null]);
+		return array_key_exists($key, $this->items)
+			? $this->items[$key]
+			: throw new Nette\InvalidArgumentException("Item '$key' does not exist in field '{$this->getName()}'.");
+	}
 }

src/Forms/Controls/MultiChoiceControl.php

@@ -8,7 +8,7 @@
 namespace Nette\Forms\Controls;
 
 use Nette;
-use function array_combine, array_diff, array_fill_keys, array_flip, array_keys, array_map, count, get_debug_type, implode, is_array, is_scalar, sprintf, var_export;
+use function array_combine, array_diff, array_fill_keys, array_flip, array_key_exists, array_keys, array_map, count, get_debug_type, implode, is_array, is_scalar, key, sprintf, var_export;
 
 
 /**
@@ -168,4 +168,16 @@ public function checkDefaultValue(bool $value = true): static
 		$this->checkDefaultValue = $value;
 		return $this;
 	}
+
+
+	/**
+	 * Returns the item label for the given key, or throws an exception if the key does not exist.
+	 */
+	protected function getItem(string|int $key): mixed
+	{
+		$key = key([(string) $key => null]);
+		return array_key_exists($key, $this->items)
+			? $this->items[$key]
+			: throw new Nette\InvalidArgumentException("Item '$key' does not exist in field '{$this->getName()}'.");
+	}
 }

src/Forms/Controls/RadioList.php

@@ -10,7 +10,7 @@
 use Nette;
 use Nette\Utils\Html;
 use Stringable;
-use function array_key_exists, array_key_first, array_merge, func_num_args, in_array, is_array, key;
+use function array_key_first, array_merge, func_num_args, in_array, is_array, key;
 
 
 /**
@@ -82,10 +82,7 @@ public function getLabel($caption = null): Html
 	public function getControlPart($key = null): Html
 	{
 		$key = key([(string) $key => null]);
-		if (!array_key_exists($key, $this->getItems())) {
-			throw new Nette\InvalidArgumentException("Item '$key' does not exist in field '{$this->getName()}'.");
-		}
-
+		$this->getItem($key);
 		return parent::getControl()->addAttributes([
 			'id' => $this->getHtmlId() . '-' . $key,
 			'checked' => in_array($key, (array) $this->value, strict: true),
@@ -105,12 +102,8 @@ public function getLabelPart($key = null): Html
 		}
 
 		$key = key([(string) $key => null]);
-		if (!array_key_exists($key, $this->getItems())) {
-			throw new Nette\InvalidArgumentException("Item '$key' does not exist in field '{$this->getName()}'.");
-		}
-
 		$itemLabel = clone $this->itemLabel;
-		return $itemLabel->setText($this->translate($this->getItems()[$key]))->for($this->getHtmlId() . '-' . $key);
+		return $itemLabel->setText($this->translate($this->getItem($key)))->for($this->getHtmlId() . '-' . $key);
 	}