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

1 files changed, 10 insertions, 13 deletions

diff --git a/modules-available/locationinfo/inc/infopanel.inc.php b/modules-available/locationinfo/inc/infopanel.inc.php
index 14d2d949..c0352c26 100644
--- a/modules-available/locationinfo/inc/infopanel.inc.php
+++ b/modules-available/locationinfo/inc/infopanel.inc.php
@@ -7,16 +7,16 @@ class InfoPanel
 	 * Gets the config of the location.
 	 *
 	 * @param int $locationID ID of the location
-	 * @param mixed $config the panel config will be returned here
-	 * @return string|bool paneltype, false if not exists
+	 * @param ?array $config the panel config will be returned here
+	 * @return ?string panel type, null if not exists
 	 */
-	public static function getConfig($paneluuid, &$config)
+	public static function getConfig(string $paneluuid, ?array &$config): ?string
 	{
 		$panel = Database::queryFirst('SELECT panelname, panelconfig, paneltype, locationids FROM locationinfo_panel WHERE paneluuid = :paneluuid',
 			compact('paneluuid'));
 
 		if ($panel === false) {
-			return false;
+			return null;
 		}
 
 		$config = LocationInfo::defaultPanelConfig($panel['paneltype']);
@@ -87,13 +87,10 @@ class InfoPanel
 	 * @param array $array location list to populate with machine data
 	 * @param bool $withPosition Defines if coords should be included or not.
 	 */
-	public static function appendMachineData(&$array, $idList = false, $withPosition = false, $withHostname = false)
+	public static function appendMachineData(?array &$array, array $idList, bool $withPosition = false, bool $withHostname = false): void
 	{
-		if (empty($array) && $idList === false)
+		if (empty($array) || empty($idList))
 			return;
-		if ($idList === false) {
-			$idList = array_keys($array);
-		}
 
 		$ignoreList = array();
 		if (Module::isAvailable('runmode')) {
@@ -217,12 +214,12 @@ class InfoPanel
 	 * @param int[] $idList location ids
 	 * @return  int[] more location ids
 	 */
-	private static function getLocationsWithParents($idList)
+	private static function getLocationsWithParents(array $idList): array
 	{
 		$locations = Location::getLocationsAssoc();
 		$allIds = $idList;
 		foreach ($idList as $id) {
-			if (isset($locations[$id]) && isset($locations[$id]['parents'])) {
+			if (isset($locations[$id]['parents'])) {
 				$allIds = array_merge($allIds, $locations[$id]['parents']);
 			}
 		}
@@ -238,9 +235,9 @@ class InfoPanel
 	 * 'HourClose' => hh, 'MinutesClose' => mm }
 	 *
 	 * @param array $openingtime The opening time in the db saved format.
-	 * @return mixed The opening time in the frontend needed format.
+	 * @return array The opening time in the frontend needed format.
 	 */
-	private static function formatOpeningtime($openingtime)
+	private static function formatOpeningtime(array $openingtime): array
 	{
 		$result = array();
 		foreach ($openingtime as $entry) {