Completed
Pull Request — master (#31335)
by Jörn Friedrich
10:02
created
lib/private/User/Database.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -212,7 +212,6 @@  discard block
 block discarded – undo
212 212
 
213 213
 	/**
214 214
 	 * Check if the password is correct
215
-	 * @param string $uid The username
216 215
 	 * @param string $password The password
217 216
 	 * @return string
218 217
 	 *
@@ -332,7 +331,7 @@  discard block
 block discarded – undo
332 331
 	/**
333 332
 	 * counts the users in the database
334 333
 	 *
335
-	 * @return int|bool
334
+	 * @return integer
336 335
 	 */
337 336
 	public function countUsers() {
338 337
 		$query = \OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`');
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,6 @@
 block discarded – undo
54 54
 use OCP\AppFramework\Db\DoesNotExistException;
55 55
 use OCP\IUserBackend;
56 56
 use OCP\User\IProvidesDisplayNameBackend;
57
-use OCP\User\IProvidesEMailBackend;
58 57
 use OCP\User\IProvidesHomeBackend;
59 58
 use OCP\Util;
60 59
 
Please login to merge, or discard this patch.
lib/private/User/Session.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -303,7 +303,6 @@  discard block
 block discarded – undo
303 303
 	/**
304 304
 	 * try to log in with the provided credentials
305 305
 	 *
306
-	 * @param string $uid
307 306
 	 * @param string $password
308 307
 	 * @return boolean|null
309 308
 	 * @throws LoginException
@@ -323,13 +322,12 @@  discard block
 block discarded – undo
323 322
 	 * Checks token auth enforced
324 323
 	 * Checks 2FA enabled
325 324
 	 *
326
-	 * @param string $loginName
327 325
 	 * @param string $password
328 326
 	 * @param IRequest $request
329 327
 	 * @throws \InvalidArgumentException
330 328
 	 * @throws LoginException
331 329
 	 * @throws PasswordLoginForbiddenException
332
-	 * @return boolean
330
+	 * @return boolean|null
333 331
 	 */
334 332
 	public function logClientIn($user, $password, IRequest $request) {
335 333
 		$isTokenPassword = $this->isTokenPassword($password);
@@ -999,6 +997,9 @@  discard block
 block discarded – undo
999 997
 		}
1000 998
 	}
1001 999
 
1000
+	/**
1001
+	 * @param IRequest $request
1002
+	 */
1002 1003
 	public function verifyAuthHeaders($request) {
1003 1004
 		$shallLogout = false;
1004 1005
 		try {
@@ -1030,7 +1031,7 @@  discard block
 block discarded – undo
1030 1031
 	}
1031 1032
 
1032 1033
 	/**
1033
-	 * @param $includeBuiltIn
1034
+	 * @param boolean $includeBuiltIn
1034 1035
 	 * @return \Generator | IAuthModule[]
1035 1036
 	 * @throws Exception
1036 1037
 	 */
Please login to merge, or discard this patch.