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/baseconfig/inc/baseconfigutil.inc.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'modules-available/baseconfig/inc/baseconfigutil.inc.php')

diff --git a/modules-available/baseconfig/inc/baseconfigutil.inc.php b/modules-available/baseconfig/inc/baseconfigutil.inc.php
index a48eb93b..4d1ef8c1 100644
--- a/modules-available/baseconfig/inc/baseconfigutil.inc.php
+++ b/modules-available/baseconfig/inc/baseconfigutil.inc.php
@@ -16,7 +16,7 @@ class BaseConfigUtil
 	 * @param \Module $module optional, only consider given module, not all enabled modules
 	 * @return array all known config variables
 	 */
-	public static function getVariables($module = false)
+	public static function getVariables($module = false): array
 	{
 		$settings = array();
 		if ($module === false) {
@@ -39,16 +39,13 @@ class BaseConfigUtil
 
 	/**
 	 * Get configuration categories for given module, or all modules if false is passed.
-	 *
-	 * @param \Module $module
-	 * @return array
 	 */
-	public static function getCategories($module = false)
+	public static function getCategories(Module $module = null): array
 	{
 		$categories = array();
-		if ($module === false) {
+		if ($module === null) {
 			$module = '*';
-		} elseif (is_object($module)) {
+		} else {
 			$module = $module->getIdentifier();
 		}
 		foreach (glob("modules/{$module}/baseconfig/categories.json", GLOB_NOSORT) as $file) {
@@ -70,7 +67,8 @@ class BaseConfigUtil
 	 * @param array $vars list of vars as obtained from BaseConfigUtil::getVariables()
 	 * @param array $values key-value-pairs of variable assignments to work with
 	 */
-	public static function markShadowedVars(&$vars, $values) {
+	public static function markShadowedVars(array &$vars, array $values): void
+	{
 		foreach ($vars as $key => &$var) {
 			if (!isset($var['shadows']))
 				continue;
-- 
cgit v1.2.3-55-g7522