owncloud / core

lib/private/user/session.php

Doc Comments +7 added lines, -3 removed lines

@@ -96,6 +96,7 @@ 
 	 * @param IUserManager $manager
 	 * @param ISession $session
 	 * @param IProvider[] $tokenProviders
+	 * @param OC\AppFramework\Utility\TimeFactory $tokenProvider
 	 */
 	public function __construct(IUserManager $manager, ISession $session, $tokenProvider, array $tokenProviders = []) {
 		$this->manager = $manager;
@@ -177,7 +178,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
@@ -325,7 +326,7 @@ 
 	 * Tries to login the user with HTTP Basic Authentication
 	 *
 	 * @param IRequest $request
-	 * @return boolean if the login was successful
+	 * @return boolean|null if the login was successful
 	 */
 	public function tryBasicAuthLogin(IRequest $request) {
 		// TODO: use $request->server instead of super globals
@@ -348,6 +349,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $uid
+	 */
 	private function loginWithToken($uid) {
 		//$this->manager->emit('\OC\User', 'preTokenLogin', array($uid));
 		$user = $this->manager->get($uid);
@@ -368,7 +372,7 @@ 
 	 * @param IRequest $request
 	 * @param string $uid user UID
 	 * @param string $password
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function createSessionToken(IRequest $request, $uid, $password) {
 		if (is_null($this->manager->get($uid))) {