1 files changed, 37 insertions, 30 deletions

diff --git a/modules-available/serversetup-bwlp-ipxe/inc/bootentryhook.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/bootentryhook.inc.php
index cf180006..ab55c888 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/bootentryhook.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/bootentryhook.inc.php
@@ -6,37 +6,37 @@ abstract class BootEntryHook
 	/**
 	 * @var string -- set by ipxe, not module implementing hook
 	 */
-	public $moduleId;
+	public $moduleId = '';
 	/**
 	 * @var string -- set by ipxe, not module implementing hook
 	 */
-	public $checked;
+	public $checked = '';
 
-	private $selectedId;
+	private $selectedId = '';
 
 	private $data = [];
 
 	/**
 	 * @return string
 	 */
-	public abstract function name();
+	public abstract function name(): string;
 
 	/**
 	 * @return HookExtraField[]
 	 */
-	public abstract function extraFields();
+	public abstract function extraFields(): array;
 
-	public abstract function isValidId($id);
+	public abstract function isValidId(string $id): bool;
 
 	/**
 	 * @return HookEntryGroup[]
 	 */
-	protected abstract function groupsInternal();
+	protected abstract function groupsInternal(): array;
 
 	/**
 	 * @return HookEntryGroup[]
 	 */
-	public final function groups()
+	public final function groups(): array
 	{
 		$groups = $this->groupsInternal();
 		foreach ($groups as $group) {
@@ -50,34 +50,48 @@ abstract class BootEntryHook
 	}
 
 	/**
-	 * @param $id
 	 * @return BootEntry|null the actual boot entry instance for given entry, null if invalid id
 	 */
-	public abstract function getBootEntryInternal($localData);
+	public abstract function getBootEntryInternal(array $localData): ?BootEntry;
 
-	public final function getBootEntry($data)
+	public final function getBootEntry(string $jsonString): ?BootEntry
 	{
-		if (!is_array($data)) {
-			$data = json_decode($data, true);
-		}
+		$data = json_decode($jsonString, true);
 		return $this->getBootEntryInternal($data);
 	}
 
-	public function setSelected($id)
+	/**
+	 * @param string $mixed either the plain ID if the entry to be marked as selected, or the JSON string representing
+	 *          the entire entry, which must have a key called 'id' that will be used as the ID then.
+	 */
+	public function setSelected(string $mixed): void
 	{
-		$json = @json_decode($id, true);
+		$json = @json_decode($mixed, true);
 		if (is_array($json)) {
 			$id = $json['id'];
 			$this->data = $json;
+		} else {
+			$id = $mixed;
 		}
 		$this->selectedId = $id;
 	}
 
-	public function renderExtraFields()
+	/**
+	 * @return string ID of entry that was marked as selected by setSelected()
+	 */
+	public function getSelected(): string
+	{
+		return $this->selectedId;
+	}
+
+	/**
+	 * @return HookExtraField[]
+	 */
+	public function renderExtraFields(): array
 	{
 		$list = $this->extraFields();
-		foreach ($list as &$entry) {
-			$entry->currentValue = isset($this->data[$entry->name]) ? $this->data[$entry->name] : $entry->default;
+		foreach ($list as $entry) {
+			$entry->currentValue = $this->data[$entry->name] ?? $entry->default;
 			$entry->hook = $this;
 		}
 		return $list;
@@ -126,14 +140,7 @@ class HookEntry
 	 */
 	public $selected;
 
-	/**
-	 * HookEntry constructor.
-	 *
-	 * @param string $id
-	 * @param string $name
-	 * @param bool $valid
-	 */
-	public function __construct($id, $name, $valid)
+	public function __construct(string $id, string $name, bool $valid)
 	{
 		$this->id = $id;
 		$this->name = $name;
@@ -164,7 +171,7 @@ class HookExtraField
 	 */
 	public $hook;
 
-	public function __construct($name, $type, $default)
+	public function __construct(string $name, string $type, $default)
 	{
 		$this->name = $name;
 		$this->type = $type;
@@ -185,10 +192,10 @@ class HookExtraField
 		return $val;
 	}
 
-	public function html()
+	public function html(): string
 	{
 		$fieldId = 'extra-' . $this->hook->moduleId . '-' . $this->name;
-		$fieldText = htmlspecialchars(Dictionary::translateFileModule($this->hook->moduleId, 'module', 'ipxe-' . $this->name, true));
+		$fieldText = htmlspecialchars(Dictionary::translateFileModule($this->hook->moduleId, 'module', 'ipxe-' . $this->name));
 		if (is_array($this->type)) {
 			$out = '<label for="' . $fieldId . '">' . $fieldText . '</label><select class="form-control" name="' . $fieldId . '" id="' . $fieldId . '">';
 			foreach ($this->type as $entry) {