Add function param/return types, fix a lot more phpstorm complaints

1 files changed, 9 insertions, 10 deletions

diff --git a/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php
index 7d15cd99..ddbce00d 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php
@@ -24,10 +24,7 @@ class IPxeMenu
 	 */
 	public $items = [];
 
-	/**
-	 * @param int $menuId
-	 */
-	public static function get($menuId, $emptyFallback = false)
+	public static function get(int $menuId, bool $emptyFallback = false): ?IPxeMenu
 	{
 		$menu = Database::queryFirst("SELECT menuid, timeoutms, title, defaultentryid FROM serversetup_menu
 			WHERE menuid = :menuid LIMIT 1", ['menuid' => $menuId]);
@@ -43,7 +40,7 @@ class IPxeMenu
 	 *
 	 * @param array $menu array for according menu row
 	 */
-	public function __construct($menu)
+	public function __construct(array $menu)
 	{
 		$this->menuid = (int)$menu['menuid'];
 		$this->timeoutMs = (int)$menu['timeoutms'];
@@ -86,7 +83,7 @@ class IPxeMenu
 	/**
 	 * @return MenuEntry|null Return preselected menu entry
 	 */
-	public function defaultEntry()
+	public function defaultEntry(): ?MenuEntry
 	{
 		foreach ($this->items as $item) {
 			if ($item->menuEntryId() === $this->defaultEntryId)
@@ -183,16 +180,18 @@ class IPxeMenu
 		return new IPxeMenu($menu);
 	}
 
-	public static function forClient(string $ip, string $uuid): IPxeMenu
+	public static function forClient(string $ip, ?string $uuid): IPxeMenu
 	{
 		$locationId = 0;
 		if (Module::isAvailable('locations')) {
 			$locationId = Location::getFromIpAndUuid($ip, $uuid);
 		}
 		$menu = self::forLocation($locationId);
-		// Super specialcase hackery: If this is a dedicated PVS, force the default to
-		// be bwlp/"minilinux"
-		$menu->maybeOverrideDefault($uuid);
+		if ($uuid !== null) {
+			// Super specialcase hackery: If this is a dedicated PVS, force the default to
+			// be bwlp/"minilinux"
+			$menu->maybeOverrideDefault($uuid);
+		}
 		return $menu;
 	}