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/sysconfig/page.inc.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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

diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php
index e868ec67..41c4a2db 100644
--- a/modules-available/sysconfig/page.inc.php
+++ b/modules-available/sysconfig/page.inc.php
@@ -152,11 +152,12 @@ class Page_SysConfig extends Page
 			$listid = Request::post('list', Request::REQUIRED, 'int');
 			$this->listConfigContents($listid);
 			return;
+		default:
 		}
 		Message::addError('invalid-action', $action, 'main');
 	}
 
-	private function getLocationNames($locations, $ids)
+	private function getLocationNames(array $locations, array $ids): string
 	{
 		$ret = array();
 		foreach ($ids as $id) {
@@ -236,7 +237,7 @@ class Page_SysConfig extends Page
 	private function listModules()
 	{
 		// Config modules
-		$modules = ConfigModule::getAll();
+		$modules = ConfigModule::getAll() ?? [];
 		$types = array_map(function ($mod) { return $mod->moduleType(); }, $modules);
 		$titles = array_map(function ($mod) { return $mod->title(); }, $modules);
 		array_multisort($types, SORT_ASC, $titles, SORT_ASC, $modules);
@@ -336,7 +337,7 @@ class Page_SysConfig extends Page
 	{
 		$configid = Request::post('rebuild', Request::REQUIRED, 'int');
 		$config = ConfigTgz::get($configid);
-		if ($config === false) {
+		if ($config === null) {
 			Message::addError('config-invalid', $configid);
 			Util::redirect('?do=sysconfig&locationid=' . $this->currentLoc);
 		}
@@ -377,7 +378,7 @@ class Page_SysConfig extends Page
 		// Rebuild depending config.tgz
 		foreach ($existing as $crow) {
 			$config = ConfigTgz::get($crow['configid']);
-			if ($config !== false) {
+			if ($config !== null) {
 				$config->generate();
 			}
 		}
@@ -401,7 +402,7 @@ class Page_SysConfig extends Page
 	{
 		$moduleid = Request::post('rebuild', Request::REQUIRED);
 		$module = ConfigModule::get($moduleid);
-		if ($module === false) {
+		if ($module === null) {
 			Message::addError('config-invalid', $moduleid);
 			Util::redirect('?do=sysconfig');
 		}
@@ -419,7 +420,7 @@ class Page_SysConfig extends Page
 	{
 		$configid = Request::post('del', Request::REQUIRED);
 		$config = ConfigTgz::get($configid);
-		if ($config === false) {
+		if ($config === null) {
 			Message::addError('config-invalid', $configid);
 			Util::redirect('?do=sysconfig&locationid=' . $this->currentLoc);
 		}
-- 
cgit v1.2.3-55-g7522