From a022e652857870893348de7aa146e7e8d946aaec Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 19 Dec 2014 14:14:38 +0100 Subject: [PATCH 1/2] Clarify return values This function returns `null` when no user is logged-in. --- lib/private/user/session.php | 2 +- lib/public/iusersession.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/user/session.php b/lib/private/user/session.php index 53662d00952..a7bd65cc2ca 100644 --- a/lib/private/user/session.php +++ b/lib/private/user/session.php @@ -121,7 +121,7 @@ class Session implements IUserSession, Emitter { /** * get the current active user * - * @return \OC\User\User + * @return \OCP\IUser|null Current user, otherwise null */ public function getUser() { if ($this->activeUser) { diff --git a/lib/public/iusersession.php b/lib/public/iusersession.php index 4c5b4d1ba51..52752758ee8 100644 --- a/lib/public/iusersession.php +++ b/lib/public/iusersession.php @@ -61,7 +61,7 @@ interface IUserSession { /** * get the current active user * - * @return \OCP\IUser + * @return \OCP\IUser|null Current user, otherwise null */ public function getUser(); From dbbf56819227af9501cf35a018c4d18c4af31e70 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 19 Dec 2014 14:36:00 +0100 Subject: [PATCH 2/2] Fix typo --- lib/private/user/session.php | 2 +- lib/public/iusersession.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/user/session.php b/lib/private/user/session.php index a7bd65cc2ca..43c4a0b36d0 100644 --- a/lib/private/user/session.php +++ b/lib/private/user/session.php @@ -138,7 +138,7 @@ class Session implements IUserSession, Emitter { } /** - * Checks wether the user is logged in + * Checks whether the user is logged in * * @return bool if logged in */ diff --git a/lib/public/iusersession.php b/lib/public/iusersession.php index 52752758ee8..7128366590f 100644 --- a/lib/public/iusersession.php +++ b/lib/public/iusersession.php @@ -66,7 +66,7 @@ interface IUserSession { public function getUser(); /** - * Checks wether the user is logged in + * Checks whether the user is logged in * * @return bool if logged in */