6 files changed, 8 insertions, 6 deletions
diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index 1a63755b980..094a8f2e2a4 100644
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -236,7 +236,7 @@ class OC_User_Database extends OC_User_Backend {
 	/**
 	 * @brief get the user's home directory
 	 * @param string $uid the username
-	 * @return boolean
+	 * @return string|false
 	 */
 	public function getHome($uid) {
 		if ($this->userExists($uid)) {
diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php
index fc15a630cf3..2fb51d02de3 100644
--- a/lib/private/user/dummy.php
+++ b/lib/private/user/dummy.php
@@ -100,7 +100,7 @@ class OC_User_Dummy extends OC_User_Backend {
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return array with all uids
+	 * @return string[] with all uids
 	 *
 	 * Get a list of all users.
 	 */
diff --git a/lib/private/user/http.php b/lib/private/user/http.php
index e99afe59ba7..a0394521012 100644
--- a/lib/private/user/http.php
+++ b/lib/private/user/http.php
@@ -98,7 +98,7 @@ class OC_User_HTTP extends OC_User_Backend {
 	/**
 	* @brief get the user's home directory
 	* @param string $uid the username
-	* @return boolean
+	* @return string|false
 	*/
 	public function getHome($uid) {
 		if($this->userExists($uid)) {
diff --git a/lib/private/user/interface.php b/lib/private/user/interface.php
index c72bdfaf3fd..cdcab3e5d00 100644
--- a/lib/private/user/interface.php
+++ b/lib/private/user/interface.php
@@ -30,6 +30,7 @@ interface OC_User_Interface {
 	*
 	* Returns the supported actions as int to be
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
+	* @return boolean
 	*/
 	public function implementsActions($actions);
 
@@ -39,6 +40,7 @@ interface OC_User_Interface {
 	* @returns true/false
 	*
 	* Deletes a user
+	* @return boolean
 	*/
 	public function deleteUser($uid);
 
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 90970ef9963..8583a451f2d 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -144,8 +144,8 @@ class Manager extends PublicEmitter {
 	/**
 	 * Check if the password is valid for the user
 	 *
-	 * @param $loginname
-	 * @param $password
+	 * @param string $loginname
+	 * @param string $password
 	 * @return mixed the User object on success, false otherwise
 	 */
 	public function checkPassword($loginname, $password) {
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 1e299416fb3..1740bad5abe 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -149,7 +149,7 @@ class Session implements Emitter, \OCP\IUserSession {
 	 *
 	 * @param string $uid
 	 * @param string $password
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function login($uid, $password) {
 		$this->manager->emit('\OC\User', 'preLogin', array($uid, $password));