1 files changed, 17 insertions, 18 deletions

diff --git a/inc/dashboard.inc.php b/inc/dashboard.inc.php
index 0b0f69e3..449fe7c0 100644
--- a/inc/dashboard.inc.php
+++ b/inc/dashboard.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 class Dashboard
 {
 	
@@ -7,12 +9,12 @@ class Dashboard
 	private static $subMenu = array();
 	private static $disabled = false;
 
-	public static function disable()
+	public static function disable(): void
 	{
 		self::$disabled = true;
 	}
 	
-	public static function createMenu()
+	public static function createMenu(): void
 	{
 		if (self::$disabled)
 			return;
@@ -22,7 +24,7 @@ class Dashboard
 		if (isset($MENU_CAT_OVERRIDE)) {
 			foreach ($MENU_CAT_OVERRIDE as $cat => $list) {
 				foreach ($list as $mod) {
-					$modByCategory[$cat][$mod] = false;
+					$modByCategory[$cat][$mod] = null;
 					$modById[$mod] =& $modByCategory[$cat][$mod];
 				}
 			}
@@ -30,10 +32,10 @@ class Dashboard
 		$all = Module::getEnabled(true);
 		foreach ($all as $module) {
 			$cat = $module->getCategory();
-			if ($cat === false)
+			if (empty($cat))
 				continue;
 			$modId = $module->getIdentifier();
-			if (isset($modById[$modId])) {
+			if (array_key_exists($modId, $modById)) {
 				$modById[$modId] = $module;
 			} else {
 				$modByCategory[$cat][$modId] = $module;
@@ -43,10 +45,10 @@ class Dashboard
 		$categories = array();
 		foreach ($modByCategory as $catId => $modList) {
 			$collapse = true;
-			/* @var Module[] $modList */
+			/* @var (?Module)[] $modList */
 			$modules = array();
-			foreach ($modList as $modId => $module) {
-				if ($module === false)
+			foreach ($modList as $module) {
+				if ($module === null)
 					continue; // Was set in $MENU_CAT_OVERRIDE, but is not enabled
 				$newEntry = array(
 					'displayName' => $module->getDisplayName(),
@@ -62,28 +64,25 @@ class Dashboard
 				}
 				$modules[] = $newEntry;
 			}
-			$categories[] = array(
+			$categories[] = [
 				'icon' => self::getCategoryIcon($catId),
 				'displayName' => Dictionary::getCategoryName($catId),
 				'modules' => $modules,
 				'collapse' => $collapse,
-			);
+			];
 		}
-		Render::setDashboard(array(
+		Render::setDashboard([
 			'categories' => $categories,
 			'url' => urlencode($_SERVER['REQUEST_URI']),
 			'langs' => Dictionary::getLanguages(true),
 			'user' => User::getName(),
 			'warning' => User::getName() !== false && User::hasPermission('.eventlog.*') && User::getLastSeenEvent() < Property::getLastWarningId(),
 			'needsSetup' => User::getName() !== false && Property::getNeedsSetup()
-		));
+		]);
 	}
 	
-	public static function getCategoryIcon($category)
+	public static function getCategoryIcon(string $category): string
 	{
-		if ($category === false) {
-			return '';
-		}
 		if (!preg_match('/^(\w+)\.(.*)$/', $category, $out)) {
 			error_log('Requested category icon for invalid category "' . $category . '"');
 			return '';
@@ -105,12 +104,12 @@ class Dashboard
 		return 'glyphicon glyphicon-' . self::$iconCache[$module][$icon];
 	}
 
-	public static function addSubmenu($url, $name)
+	public static function addSubmenu(string $url, string $name): void
 	{
 		self::$subMenu[] = array('url' => $url, 'name' => $name);
 	}
 
-	public static function getSubmenus()
+	public static function getSubmenus(): array
 	{
 		return self::$subMenu;
 	}