fixup! Fix some tests

nextcloud · May 3, 2022 · 121e074 · 121e074
1 parent 1909145
commit 121e074
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/apps/user_ldap/lib/GroupPluginManager.php b/apps/user_ldap/lib/GroupPluginManager.php
@@ -165,7 +165,7 @@ public function countUsersInGroup(string $gid, string $search = ''): int {
 		if ($plugin) {
 			$count = $plugin->countUsersInGroup($gid,$search);
 			if ($count === false) {
-				return -1;
+				return 0; // no entry found
 			}
 			return $count;
 		}

diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php
@@ -78,6 +78,7 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP,
 	protected $ldapGroupMemberAssocAttr;
 
 	public function __construct(Access $access, GroupPluginManager $groupPluginManager) {
+		parent::__construct();
 		$this->access = $access;
 		$filter = $this->access->connection->ldapGroupFilter;
 		$gAssoc = $this->access->connection->ldapGroupMemberAssocAttr;

diff --git a/apps/user_ldap/lib/Group_Proxy.php b/apps/user_ldap/lib/Group_Proxy.php
@@ -312,9 +312,7 @@ public function searchInGroup(string $gid, string $search = '', int $limit = -1,
 
 		foreach ($this->backends as $backend) {
 			$backendUsers = $backend->searchInGroup($gid, $search, $limit, $offset);
-			if (is_array($backendUsers)) {
-				$users = array_merge($users, $backendUsers);
-			}
+			$users = array_merge($users, $backendUsers);
 		}
 
 		return $users;

diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php
@@ -426,12 +426,7 @@ public function searchInGroup(string $gid, string $search = '', int $limit = -1,
 		$userManager = \OC::$server->get(IUserManager::class);
 		$displayNameCache = \OC::$server->get(DisplayNameCache::class);
 		while ($row = $result->fetch()) {
-			if (isset($row['displayname'])) {
-				$users[$row['uid']] = new LazyUser($row['uid'], $displayNameCache, $userManager, $row['displayname']);
-			} else {
-				// TODO maybe also fetch the displayname directly here
-				$users[$row['uid']] = new LazyUser($row['uid'], $displayNameCache, $userManager);
-			}
+			$users[$row['uid']] = new LazyUser($row['uid'], $displayNameCache, $userManager, $row['displayname'] ?? null);
 		}
 		$result->closeCursor();
 

diff --git a/lib/private/Group/Group.php b/lib/private/Group/Group.php
@@ -235,6 +235,7 @@ public function removeUser(IUser $user): void {
 
 	/**
 	 * Search for users in the group by userid or display name
+	 * @return IUser[]
 	 */
 	public function searchUsers(string $search, ?int $limit = null, ?int $offset = null): array {
 		$users = [];

diff --git a/lib/public/Group/Backend/IGroupDetailsBackend.php b/lib/public/Group/Backend/IGroupDetailsBackend.php
@@ -6,6 +6,7 @@
  * @copyright Copyright (c) 2018 Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Carl Schwan <carl@carlschwan.eu>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,11 +27,18 @@
 namespace OCP\Group\Backend;
 
 /**
+ * @brief Optional interface for group backends
  * @since 14.0.0
  */
 interface IGroupDetailsBackend {
 
 	/**
+	 * @brief Get additional details for a group, for example the display name.
+	 *
+	 * The array returned can be empty when no additional information is available
+	 * for the group.
+	 *
+	 * @return array{displayName?: string}
 	 * @since 14.0.0
 	 */
 	public function getGroupDetails(string $gid): array;