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

---
 .../inc/permissiondbupdate.inc.php                  | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'modules-available/permissionmanager/inc/permissiondbupdate.inc.php')

diff --git a/modules-available/permissionmanager/inc/permissiondbupdate.inc.php b/modules-available/permissionmanager/inc/permissiondbupdate.inc.php
index 0cd89b3a..49988420 100644
--- a/modules-available/permissionmanager/inc/permissiondbupdate.inc.php
+++ b/modules-available/permissionmanager/inc/permissiondbupdate.inc.php
@@ -9,14 +9,14 @@ class PermissionDbUpdate
 	 * @param int[] $users userids
 	 * @param int[] $roles roleids
 	 */
-	public static function addRoleToUser($users, $roles)
+	public static function addRoleToUser(array $users, array $roles): int
 	{
 		if (empty($users) || empty($roles))
 			return 0;
-		$arg = array();
+		$arg = [];
 		foreach ($users AS $userid) {
 			foreach ($roles AS $roleid) {
-				$arg[] = compact('userid', 'roleid');
+				$arg[] = ['userid' => $userid, 'roleid' => $roleid];
 			}
 		}
 		return Database::exec("INSERT IGNORE INTO role_x_user (userid, roleid) VALUES :arg",
@@ -29,12 +29,12 @@ class PermissionDbUpdate
 	 * @param int[] $users userids
 	 * @param int[] $roles roleids
 	 */
-	public static function removeRoleFromUser($users, $roles)
+	public static function removeRoleFromUser(array $users, array $roles): int
 	{
 		if (empty($users) || empty($roles))
 			return 0;
 		$query = "DELETE FROM role_x_user WHERE userid IN (:users) AND roleid IN (:roles)";
-		return Database::exec($query, array("users" => $users, "roles" => $roles));
+		return Database::exec($query, ["users" => $users, "roles" => $roles]);
 	}
 
 	/**
@@ -44,7 +44,7 @@ class PermissionDbUpdate
 	 * @param int[] $users list of user ids
 	 * @param int[] $roles list of role ids
 	 */
-	public static function setRolesForUser($users, $roles)
+	public static function setRolesForUser(array $users, array $roles): int
 	{
 		$count = Database::exec("DELETE FROM role_x_user WHERE userid in (:users) AND roleid NOT IN (:roles)",
 			compact('users', 'roles'));
@@ -56,7 +56,7 @@ class PermissionDbUpdate
 	 *
 	 * @param int $roleid roleid
 	 */
-	public static function deleteRole($roleid)
+	public static function deleteRole(int $roleid): int
 	{
 		return Database::exec("DELETE FROM role WHERE roleid = :roleid", array("roleid" => $roleid));
 	}
@@ -69,7 +69,8 @@ class PermissionDbUpdate
 	 * @param string[] $permissions array of permissions
 	 * @param int|null $roleId roleid or null if the role does not exist yet
 	 */
-	public static function saveRole($roleName, $roleDescription, $locations, $permissions, $roleId = null)
+	public static function saveRole(string $roleName, string $roleDescription, array $locations, array $permissions,
+											  ?int $roleId = null): void
 	{
 		foreach ($permissions as &$permission) {
 			$permission = strtolower($permission);
@@ -92,14 +93,14 @@ class PermissionDbUpdate
 
 		if (!empty($locations)) {
 			$arg = array_map(function ($loc) use ($roleId) {
-				return compact('roleId', 'loc');
+				return ['roleId' => $roleId, 'loc' => $loc];
 			}, $locations);
 			Database::exec("INSERT IGNORE INTO role_x_location (roleid, locationid) VALUES :arg", ['arg' => $arg]);
 		}
 
 		if (!empty($permissions)) {
 			$arg = array_map(function ($perm) use ($roleId) {
-				return compact('roleId', 'perm');
+				return ['roleId' => $roleId, 'perm' => $perm];
 			}, $permissions);
 			Database::exec("INSERT IGNORE INTO role_x_permission (roleid, permissionid) VALUES :arg", ['arg' => $arg]);
 		}
-- 
cgit v1.2.3-55-g7522