Fix psalm errors about groupExists return type

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Apr 27, 2023 · 3e399f5 · 3e399f5
1 parent 5149f1c
commit 3e399f5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/apps/user_ldap/lib/Group_Proxy.php b/apps/user_ldap/lib/Group_Proxy.php
@@ -307,14 +307,10 @@ public function groupExists($gid) {
 	 * {@inheritdoc}
 	 */
 	public function groupsExists(array $gids): array {
-		$existingGroups = [];
-		foreach ($gids as $gid) {
-			$exists = $this->handleRequest($gid, 'groupExists', [$gid]);
-			if ($exists) {
-				$existingGroups[$gid] = $gid;
-			}
-		}
-		return $existingGroups;
+		return array_values(array_filter(
+			$gids,
+			fn (string $gid): bool => $this->handleRequest($gid, 'groupExists', [$gid]),
+		));
 	}
 
 	/**

diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php
@@ -130,7 +130,7 @@ protected function isSingleBackend(): bool {
 	 * @param string $method string, the method of the user backend that shall be called
 	 * @param array $parameters an array of parameters to be passed
 	 * @param bool $passOnWhen
-	 * @return mixed, the result of the specified method
+	 * @return mixed the result of the specified method
 	 */
 	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
 		if (!$this->isSingleBackend()) {

diff --git a/lib/public/Group/Backend/ABackend.php b/lib/public/Group/Backend/ABackend.php
@@ -71,14 +71,10 @@ public function implementsActions($actions): bool {
 	 * @since 26.0.0
 	 */
 	public function groupsExists(array $gids): array {
-		$existingGroups = [];
-		foreach ($gids as $gid) {
-			$exists = $this->groupExists($gid);
-			if ($exists) {
-				$existingGroups[$gid] = $gid;
-			}
-		}
-		return $existingGroups;
+		return array_values(array_filter(
+			$gids,
+			fn (string $gid): bool => $this->groupExists($gid),
+		));
 	}
 
 	/**