Completed
Pull Request — master (#24189)
by Christoph
09:27
created
lib/private/Files/View.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 * and does not take the chroot into account )
196 196
 	 *
197 197
 	 * @param string $path
198
-	 * @return \OCP\Files\Mount\IMountPoint
198
+	 * @return Mount\MountPoint|null
199 199
 	 */
200 200
 	public function getMount($path) {
201 201
 		return Filesystem::getMountManager()->find($this->getAbsolutePath($path));
@@ -906,7 +906,7 @@  discard block
 block discarded – undo
906 906
 
907 907
 	/**
908 908
 	 * @param string $path
909
-	 * @return bool|string
909
+	 * @return string|false
910 910
 	 * @throws \OCP\Files\InvalidPathException
911 911
 	 */
912 912
 	public function toTmpFile($path) {
@@ -2029,7 +2029,7 @@  discard block
 block discarded – undo
2029 2029
 
2030 2030
 	/**
2031 2031
 	 * @param string $filename
2032
-	 * @return array
2032
+	 * @return string[]
2033 2033
 	 * @throws \OC\User\NoUserException
2034 2034
 	 * @throws NotFoundException
2035 2035
 	 */
Please login to merge, or discard this patch.
lib/private/user/session.php 1 patch
Doc Comments   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 	/**
178 178
 	 * get the current active user
179 179
 	 *
180
-	 * @return IUser|null Current user, otherwise null
180
+	 * @return null|User Current user, otherwise null
181 181
 	 */
182 182
 	public function getUser() {
183 183
 		// FIXME: This is a quick'n dirty work-around for the incognito mode as
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 
322 322
 	/**
323 323
 	 * Tries to login the user with HTTP Basic Authentication
324
-	 * @return boolean if the login was successful
324
+	 * @return boolean|null if the login was successful
325 325
 	 */
326 326
 	public function tryBasicAuthLogin() {
327 327
 		if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
@@ -343,6 +343,9 @@  discard block
 block discarded – undo
343 343
 		return false;
344 344
 	}
345 345
 
346
+	/**
347
+	 * @param string $uid
348
+	 */
346 349
 	private function loginWithToken($uid) {
347 350
 		//$this->manager->emit('\OC\User', 'preTokenLogin', array($uid));
348 351
 		$user = $this->manager->get($uid);
@@ -363,7 +366,7 @@  discard block
 block discarded – undo
363 366
 	 * @param IRequest $request
364 367
 	 * @param string $uid user UID
365 368
 	 * @param string $password
366
-	 * @return boolean
369
+	 * @return boolean|null
367 370
 	 */
368 371
 	public function createSessionToken(IRequest $request, $uid, $password) {
369 372
 		if (is_null($this->manager->get($uid))) {
Please login to merge, or discard this patch.