owncloud / core

lib/private/user/session.php

Doc Comments +5 added lines, -2 removed lines

@@ -170,7 +170,7 @@ 
 	/**
 	 * get the current active user
 	 *
-	 * @return IUser|null Current user, otherwise null
+	 * @return null|User Current user, otherwise null
 	 */
 	public function getUser() {
 		// FIXME: This is a quick'n dirty work-around for the incognito mode as
@@ -300,7 +300,7 @@ 
 
 	/**
 	 * Tries to login the user with HTTP Basic Authentication
-	 * @return boolean if the login was successful
+	 * @return boolean|null if the login was successful
 	 */
 	public function tryBasicAuthLogin() {
 		if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
@@ -322,6 +322,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $uid
+	 */
 	private function loginWithToken($uid) {
 		//$this->manager->emit('\OC\User', 'preTokenLogin', array($uid));
 		$user = $this->manager->get($uid);

lib/private/user.php

Doc Comments +2 added lines, -1 removed lines

@@ -155,7 +155,7 @@ 
 	 *
 	 * @param string $loginname The login name of the user to log in
 	 * @param string $password The password of the user
-	 * @return boolean|null
+	 * @return boolean
 	 *
 	 * Log in a user and regenerate a new session - if the password is ok
 	 *
@@ -245,6 +245,7 @@ 
 
 	/**
 	 * Sets user id for session and triggers emit
+	 * @param string $uid
 	 */
 	public static function setUserId($uid) {
 		$userSession = \OC::$server->getUserSession();