From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 13 Mar 2015 12:19:29 +0000 (+0100)
Subject: Can also be null
X-Git-Tag: v8.1.0alpha1~293^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=38fec9b0959daa29647aa2b4c277f9a35cb00821;p=nextcloud-server.git

Can also be null

If the user does not exist this returns null and can lead to nasty bugs since the IDE is not indicating this...
---

diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 85abd001ca8..99619bcba3a 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -103,7 +103,7 @@ class Manager extends PublicEmitter implements IUserManager {
 	 * get a user by user id
 	 *
 	 * @param string $uid
-	 * @return \OC\User\User
+	 * @return \OC\User\User|null Either the user or null if the specified user does not exist
 	 */
 	public function get($uid) {
 		if (isset($this->cachedUsers[$uid])) { //check the cache first to prevent having to loop over the backends
diff --git a/lib/public/iusermanager.php b/lib/public/iusermanager.php
index 1691aee8e7d..e2079ef8cc2 100644
--- a/lib/public/iusermanager.php
+++ b/lib/public/iusermanager.php
@@ -53,7 +53,7 @@ interface IUserManager {
 	 * get a user by user id
 	 *
 	 * @param string $uid
-	 * @return \OCP\IUser
+	 * @return \OCP\IUser|null Either the user or null if the specified user does not exist
 	 */
 	public function get($uid);