From 06bff0b9b84d47c43f9bc8aff06a29d85ebb7ed0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 14 Nov 2023 14:47:55 +0100
Subject: Add function param/return types, fix a lot more phpstorm complaints

---
 modules-available/minilinux/page.inc.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'modules-available/minilinux/page.inc.php')

diff --git a/modules-available/minilinux/page.inc.php b/modules-available/minilinux/page.inc.php
index 2099b8c5..349bbfad 100644
--- a/modules-available/minilinux/page.inc.php
+++ b/modules-available/minilinux/page.inc.php
@@ -25,8 +25,8 @@ class Page_MiniLinux extends Page
 		}
 
 		User::assertPermission('view');
-		Dashboard::addSubmenu('?do=minilinux', Dictionary::translate('menu-versions', true));
-		Dashboard::addSubmenu('?do=minilinux&show=sources', Dictionary::translate('menu-sources', true));
+		Dashboard::addSubmenu('?do=minilinux', Dictionary::translate('menu-versions'));
+		Dashboard::addSubmenu('?do=minilinux&show=sources', Dictionary::translate('menu-sources'));
 	}
 
 	protected function doRender()
@@ -107,7 +107,7 @@ class Page_MiniLinux extends Page
 		}
 	}
 
-	private function renderVersionList($versions, $usage)
+	private function renderVersionList(array $versions, array $usage): string
 	{
 		$def = Property::get(MiniLinux::PROPERTY_DEFAULT_BOOT);
 		//$eff = Property::get(MiniLinux::PROPERTY_DEFAULT_BOOT_EFFECTIVE);
@@ -152,7 +152,7 @@ class Page_MiniLinux extends Page
 		}
 		$data['versionid'] = $versionid;
 		$data['dltask'] = MiniLinux::validateDownloadTask($versionid, $ver['taskid']);
-		$data['verify_button'] = !$verify && $data['dltask'] === false;
+		$data['verify_button'] = !$verify && $data['dltask'] === null;
 		if (is_array($data['files'])) {
 			$valid = true;
 			$sort = [];
@@ -176,7 +176,7 @@ class Page_MiniLinux extends Page
 				if (isset($file['mtime'])) {
 					$file['mtime_s'] = Util::prettyTime($file['mtime']);
 				}
-				if ($data['dltask']) {
+				if ($data['dltask'] !== null) {
 					$file['fileid'] = MiniLinux::fileToId($versionid, $file['name']);
 				}
 			}
@@ -191,7 +191,7 @@ class Page_MiniLinux extends Page
 				MiniLinux::setInstalledState($versionid, true);
 			}
 		}
-		if ($data['dltask'] !== false || $ver['installed']) {
+		if ($data['dltask'] !== null || $ver['installed']) {
 			MiniLinux::checkStage4($data, $data['s4_errors']);
 		}
 		$data['changelog'] = Util::markup($ver['description'] ?? '');
@@ -204,7 +204,7 @@ class Page_MiniLinux extends Page
 	const FILE_CHECKSUM_BAD = 3;
 	const FILE_NOT_READABLE = 4;
 
-	private function getFileState($versionid, $file, $verify)
+	private function getFileState(string $versionid, array $file, bool $verify): int
 	{
 		$path = CONFIG_HTTP_DIR . '/' . $versionid . '/' . $file['name'];
 		if (!is_file($path))
@@ -231,15 +231,15 @@ class Page_MiniLinux extends Page
 	{
 		switch ($state) {
 		case self::FILE_CHECKSUM_BAD:
-			return Dictionary::translate('file-checksum-bad', true);
+			return Dictionary::translate('file-checksum-bad');
 		case self::FILE_SIZE_MISMATCH:
-			return Dictionary::translate('file-size-mismatch', true);
+			return Dictionary::translate('file-size-mismatch');
 		case self::FILE_MISSING:
-			return Dictionary::translate('file-missing', true);
+			return Dictionary::translate('file-missing');
 		case self::FILE_NOT_READABLE:
-			return Dictionary::translate('file-not-readable', true);
+			return Dictionary::translate('file-not-readable');
 		case self::FILE_OK:
-			return Dictionary::translate('file-ok', true);
+			return Dictionary::translate('file-ok');
 		}
 		return '???';
 	}
@@ -252,7 +252,7 @@ class Page_MiniLinux extends Page
 			die('No version');
 		}
 		$task = MiniLinux::downloadVersion($version);
-		if ($task === false) {
+		if ($task === null) {
 			Message::addError('no-such-version', $version);
 			Message::renderList();
 		} else {
-- 
cgit v1.2.3-55-g7522