diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-03-13 14:36:00 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-03-13 14:36:00 +0100 |
| commit | f668ed25fe2997f54085982352df36630a4e1efa (patch) | |
| tree | f41f25e8698e52efb1f2c886cc9dfaabbcdf1f3d | |
| parent | d5e884d6295800d27e046289d713bc27242ecfbb (diff) | |
| parent | 38fec9b0959daa29647aa2b4c277f9a35cb00821 (diff) | |
| download | nextcloud-server-f668ed25fe2997f54085982352df36630a4e1efa.tar.gz nextcloud-server-f668ed25fe2997f54085982352df36630a4e1efa.zip | |
Merge pull request #14874 from owncloud/correct-typehint
Can also be null
| -rw-r--r-- | lib/private/user/manager.php | 2 | ||||
| -rw-r--r-- | lib/public/iusermanager.php | 2 |
2 files changed, 2 insertions, 2 deletions
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); |