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

1 files changed, 8 insertions, 9 deletions

diff --git a/modules-available/minilinux/inc/linuxbootentryhook.inc.php b/modules-available/minilinux/inc/linuxbootentryhook.inc.php
index 03d7f11f..56b3db69 100644
--- a/modules-available/minilinux/inc/linuxbootentryhook.inc.php
+++ b/modules-available/minilinux/inc/linuxbootentryhook.inc.php
@@ -10,9 +10,9 @@
 class LinuxBootEntryHook extends BootEntryHook
 {
 
-	public function name()
+	public function name(): string
 	{
-		return Dictionary::translateFileModule('minilinux', 'module', 'module_name', true);
+		return Dictionary::translateFileModule('minilinux', 'module', 'module_name');
 	}
 
 	public function extraFields(): array
@@ -44,7 +44,7 @@ class LinuxBootEntryHook extends BootEntryHook
 		$array = [];
 		$array[] = new HookEntryGroup($this->name(), [
 			new HookEntry('default',
-				Dictionary::translateFileModule('minilinux', 'module', 'default_boot_entry', true),
+				Dictionary::translateFileModule('minilinux', 'module', 'default_boot_entry'),
 				MiniLinux::updateCurrentBootSetting())
 		]);
 		$branches = Database::queryAll('SELECT sourceid, branchid, title FROM minilinux_branch ORDER BY title');
@@ -56,7 +56,7 @@ class LinuxBootEntryHook extends BootEntryHook
 					new HookEntry($branch['branchid'],
 						$branch['branchid'] . ' '
 							. Dictionary::translateFileModule('minilinux', 'module',
-							'latest_of_branch', true),
+							'latest_of_branch'),
 						true),
 				];
 				foreach ($versions[$branch['branchid']] as $version) {
@@ -64,7 +64,7 @@ class LinuxBootEntryHook extends BootEntryHook
 					$title = $version['versionid'] . ' ' . $version['title'];
 					if (!$valid) {
 						$title .= ' ' . Dictionary::translateFileModule('minilinux', 'module',
-								'not_installed_hint', true);
+								'not_installed_hint');
 					}
 					$group[] = new HookEntry($version['versionid'], $title, $valid);
 				}
@@ -75,10 +75,9 @@ class LinuxBootEntryHook extends BootEntryHook
 	}
 
 	/**
-	 * @param $localData
-	 * @return BootEntry the actual boot entry instance for given entry, false if invalid id
+	 * @return ?BootEntry the actual boot entry instance for given entry, false if invalid id
 	 */
-	public function getBootEntryInternal($localData): BootEntry
+	public function getBootEntryInternal(array $localData): ?BootEntry
 	{
 		$id = $localData['id'];
 		if ($id === 'default') { // Special case
@@ -183,7 +182,7 @@ class LinuxBootEntryHook extends BootEntryHook
 		return $exec;
 	}
 
-	public function isValidId($id)
+	public function isValidId(string $id): bool
 	{
 		if ($id === 'default')
 			return true; // Meta-version that links to whatever the default is set to