Make code clearer and bump @ deprecated annotations

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Dec 22, 2022 · fc4212d · fc4212d
1 parent 8385eba
commit fc4212d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/private/Group/Group.php b/lib/private/Group/Group.php
@@ -253,9 +253,11 @@ public function searchUsers(string $search, ?int $limit = null, ?int $offset = n
 			} else {
 				$userIds = $backend->usersInGroup($this->gid, $search, $limit ?? -1, $offset ?? 0);
 				$userManager = \OCP\Server::get(IUserManager::class);
-				$users = array_merge($users, array_map(function (string $userId) use ($userManager): IUser {
-					return new LazyUser($userId, $userManager);
-				}, $userIds));
+				$userObjects = array_map(
+					fn (string $userId): IUser => new LazyUser($userId, $userManager),
+					$userIds
+				);
+				$users = array_merge($users, $userObjects);
 			}
 			if (!is_null($limit) and $limit <= 0) {
 				return $users;
@@ -312,7 +314,7 @@ public function countDisabled() {
 	 * @param int $limit
 	 * @param int $offset
 	 * @return IUser[]
-	 * @deprecated 25.0.0 Use searchUsers instead (same implementation)
+	 * @deprecated 26.0.0 Use searchUsers instead (same implementation)
 	 */
 	public function searchDisplayName($search, $limit = null, $offset = null) {
 		return $this->searchUsers($search, $limit, $offset);

diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
@@ -298,7 +298,7 @@ public function checkPasswordNoLogging($loginName, $password) {
 	 * @param int $limit
 	 * @param int $offset
 	 * @return IUser[]
-	 * @deprecated since 25.0.0, use searchDisplayName instead
+	 * @deprecated since 26.0.0, use searchDisplayName instead
 	 */
 	public function search($pattern, $limit = null, $offset = null) {
 		$users = [];