Completed
Pull Request — master (#31335)
by Jörn Friedrich
10:02
created
lib/private/Share/MailNotifications.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -189,10 +189,10 @@
 block discarded – undo
189 189
 	 * inform recipient about public link share
190 190
 	 *
191 191
 	 * @param string $recipient recipient email address
192
-	 * @param string $filename the shared file
193
-	 * @param string $link the public link
194 192
 	 * @param array $options allows ['cc'] and ['bcc'] recipients
195
-	 * @param int $expiration expiration date (timestamp)
193
+	 * @param string $subject
194
+	 * @param boolean|string $htmlBody
195
+	 * @param boolean|string $textBody
196 196
 	 * @return string[] $result of failed recipients
197 197
 	 */
198 198
 	public function sendLinkShareMailFromBody($recipient, $subject, $htmlBody, $textBody, $options = []) {
Please login to merge, or discard this patch.
lib/private/legacy/template.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -322,6 +322,7 @@
 block discarded – undo
322 322
 		* @param string $error_msg The error message to show
323 323
 		* @param string $hint An optional hint message - needs to be properly escaped
324 324
 		* @param int HTTP Status Code
325
+		* @param integer $httpStatusCode
325 326
 		*/
326 327
 	public static function printErrorPage($error_msg, $hint = '', $httpStatusCode = null) {
327 328
 		if ($error_msg === $hint) {
Please login to merge, or discard this patch.
lib/private/AppFramework/Utility/ControllerMethodReflector.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 	}
44 44
 
45 45
 	/**
46
-	 * @param object|string $object an object or classname
46
+	 * @param \OCP\AppFramework\Controller $object an object or classname
47 47
 	 * @param string $method the method which we want to inspect
48 48
 	 * @throws \ReflectionException
49 49
 	 */
Please login to merge, or discard this patch.
lib/private/Files/Stream/Checksum.php 1 patch
Doc Comments   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 	}
62 62
 
63 63
 	/**
64
-	 * @param $source
65
-	 * @param $path
64
+	 * @param resource $source
65
+	 * @param string $path
66 66
 	 * @return resource
67 67
 	 */
68 68
 	public static function wrap($source, $path) {
@@ -122,6 +122,9 @@  discard block
 block discarded – undo
122 122
 		return parent::stream_write($data);
123 123
 	}
124 124
 
125
+	/**
126
+	 * @param string $data
127
+	 */
125 128
 	private function updateHashingContexts($data) {
126 129
 		foreach ($this->hashingContexts as $ctx) {
127 130
 			\hash_update($ctx, $data);
@@ -195,7 +198,7 @@  discard block
 block discarded – undo
195 198
 	}
196 199
 
197 200
 	/**
198
-	 * @return mixed
201
+	 * @return string
199 202
 	 * @return string
200 203
 	 */
201 204
 	private function getPathFromStreamContext() {
Please login to merge, or discard this patch.
core/Command/User/ListUsers.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -77,6 +77,8 @@
 block discarded – undo
77 77
 
78 78
 	/**
79 79
 	 * If only a single attribute should be listed omit the key to make it fit in one row
80
+	 * @param string $key
81
+	 * @param boolean $useKey
80 82
 	 */
81 83
 	private function add(&$row, $key, $val, $useKey) {
82 84
 		if ($useKey) {
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/CorsPlugin.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	 * This method should set up the required event subscriptions.
92 92
 	 *
93 93
 	 * @param \Sabre\DAV\Server $server
94
-	 * @return void
94
+	 * @return false|null
95 95
 	 */
96 96
 	public function initialize(\Sabre\DAV\Server $server) {
97 97
 		$this->server = $server;
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	 * @param RequestInterface $request
130 130
 	 * @param ResponseInterface $response
131 131
 	 *
132
-	 * @return false
132
+	 * @return false|null
133 133
 	 * @throws \InvalidArgumentException
134 134
 	 */
135 135
 	public function setOptionsRequestHeaders(RequestInterface $request, ResponseInterface $response) {
Please login to merge, or discard this patch.
lib/private/Files/Mount/LocalHomeMountProvider.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 	 *
35 35
 	 * @param IUser $user
36 36
 	 * @param IStorageFactory $loader
37
-	 * @return \OCP\Files\Mount\IMountPoint[]
37
+	 * @return MountPoint
38 38
 	 */
39 39
 	public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
40 40
 		$arguments = ['user' => $user];
Please login to merge, or discard this patch.
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.