summaryrefslogtreecommitdiffstats
path: root/lib/private/user.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-02-19 07:04:37 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-02-19 07:04:37 +0100
commit1e321406ee2d973e937637ab090cbd83a6eb40cf (patch)
tree78eca74636ab68b3f52ebac9c013c55a1526bd43 /lib/private/user.php
parent635b8f6b83ae37ac262c5f7a0bd40697824b9b67 (diff)
parentc6f4f85e27a10459422ab9789c894d13f0cd34c7 (diff)
downloadnextcloud-server-1e321406ee2d973e937637ab090cbd83a6eb40cf.tar.gz
nextcloud-server-1e321406ee2d973e937637ab090cbd83a6eb40cf.zip
Merge pull request #7114 from owncloud/scrutinizer_documentation_patches
polish documentation based on scrutinizer patches
Diffstat (limited to 'lib/private/user.php')
-rw-r--r--lib/private/user.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/private/user.php b/lib/private/user.php
index 2519200d0f0..a8e7967783e 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -222,7 +222,7 @@ class OC_User {
* @brief Try to login a user
* @param $uid The username of the user to log in
* @param $password The password of the user
- * @return bool
+ * @return boolean|null
*
* Log in a user and regenerate a new session - if the password is ok
*/
@@ -290,6 +290,7 @@ class OC_User {
/**
* @brief Sets user display name for session
+ * @param string $uid
*/
public static function setDisplayName($uid, $displayName = null) {
if (is_null($displayName)) {
@@ -481,7 +482,7 @@ class OC_User {
* @brief Check if the password is correct
* @param string $uid The username
* @param string $password The password
- * @return mixed user id a string on success, false otherwise
+ * @return string|false user id a string on success, false otherwise
*
* Check if the password is correct without logging in the user
* returns the user id or false
@@ -609,7 +610,7 @@ class OC_User {
/**
* @brief Returns the first active backend from self::$_usedBackends.
- * @return null if no backend active, otherwise OCP\Authentication\IApacheBackend
+ * @return OCP\Authentication\IApacheBackend|null if no backend active, otherwise OCP\Authentication\IApacheBackend
*/
private static function findFirstActiveUsedBackend() {
foreach (self::$_usedBackends as $backend) {