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

1 files changed, 5 insertions, 6 deletions

diff --git a/modules-available/rebootcontrol/inc/rebootutils.inc.php b/modules-available/rebootcontrol/inc/rebootutils.inc.php
index f6843150..e05d90dc 100644
--- a/modules-available/rebootcontrol/inc/rebootutils.inc.php
+++ b/modules-available/rebootcontrol/inc/rebootutils.inc.php
@@ -8,13 +8,12 @@ class RebootUtils
 	 * @param string[] $list list of system UUIDs
 	 * @return array list of machines with machineuuid, hostname, clientip, state and locationid
 	 */
-	public static function getMachinesByUuid($list, $assoc = false, $columns = ['machineuuid', 'hostname', 'clientip', 'state', 'locationid'])
+	public static function getMachinesByUuid(array $list, bool $assoc = false,
+														  array $columns = ['machineuuid', 'hostname', 'clientip', 'state', 'locationid']): array
 	{
 		if (empty($list))
 			return array();
-		if (is_array($columns)) {
-			$columns = implode(',', $columns);
-		}
+		$columns = implode(',', $columns);
 		$res = Database::simpleQuery("SELECT $columns FROM machine
 				WHERE machineuuid IN (:list)", compact('list'));
 		if (!$assoc)
@@ -31,7 +30,7 @@ class RebootUtils
 	 * Requires the array elements to have key "state" from machine table.
 	 * @param array $clients list of clients
 	 */
-	public static function sortRunningFirst(&$clients)
+	public static function sortRunningFirst(array &$clients): void
 	{
 		usort($clients, function($a, $b) {
 			$a = ($a['state'] === 'IDLE' || $a['state'] === 'OCCUPIED');
@@ -49,7 +48,7 @@ class RebootUtils
 	 * @param string $permission name of location-aware permission to check
 	 * @return array|false List of clients the user has access to.
 	 */
-	public static function getFilteredMachineList($requestedClients, $permission)
+	public static function getFilteredMachineList(array $requestedClients, string $permission)
 	{
 		$actualClients = RebootUtils::getMachinesByUuid($requestedClients);
 		if (count($actualClients) !== count($requestedClients)) {