owncloud / core

lib/private/User/Session.php

Doc Comments +7 added lines, -5 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
@@ -282,7 +282,7 @@ 
 	 *
 	 * @param string $uid
 	 * @param string $password
-	 * @return boolean|null
+	 * @return boolean
 	 * @throws LoginException
 	 */
 	public function login($uid, $password) {
@@ -355,6 +355,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $uid
+	 */
 	private function loginWithToken($uid) {
 		// TODO: $this->manager->emit('\OC\User', 'preTokenLogin', array($uid));
 		$user = $this->manager->get($uid);
@@ -404,9 +407,8 @@ 
 	}
 
 	/**
-	 * @param type $uid
-	 * @param type $password
-	 * @param type $sessionId
+	 * @param string $uid
+	 * @param string $password
 	 * @throws InvalidTokenException
 	 * @return string
 	 */