Completed
Pull Request — master (#28166)
by Jörn Friedrich
12:47
created
lib/private/Encryption/Util.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,6 @@
 block discarded – undo
31 31
 use OC\Files\Filesystem;
32 32
 use OC\Files\View;
33 33
 use OCP\Encryption\IEncryptionModule;
34
-use OCP\Files\Storage;
35 34
 use OCP\IConfig;
36 35
 use OCP\IUser;
37 36
 
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/SharesPlugin.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,6 @@
 block discarded – undo
68 68
 	/**
69 69
 	 * @param \Sabre\DAV\Tree $tree tree
70 70
 	 * @param IUserSession $userSession user session
71
-	 * @param \OCP\Files\Folder $userFolder user home folder
72 71
 	 * @param \OCP\Share\IManager $shareManager share manager
73 72
 	 */
74 73
 	public function __construct(
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/FilesReportPlugin.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	 * This will be used in the {DAV:}supported-report-set property.
153 153
 	 *
154 154
 	 * @param string $uri
155
-	 * @return array
155
+	 * @return string[]
156 156
 	 */
157 157
 	public function getSupportedReportSet($uri) {
158 158
 		return [self::REPORT_NAME];
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 	 * @param string $reportName
165 165
 	 * @param mixed $report
166 166
 	 * @param string $uri
167
-	 * @return bool
167
+	 * @return null|false
168 168
 	 * @throws BadRequest
169 169
 	 * @throws PreconditionFailed
170 170
 	 * @internal param $ [] $report
@@ -350,6 +350,7 @@  discard block
 block discarded – undo
350 350
 	 * with a leading slash but no trailing slash
351 351
 	 * @param string[] $requestedProps requested properties
352 352
 	 * @param Node[] nodes nodes for which to fetch and prepare responses
353
+	 * @param Node[] $nodes
353 354
 	 * @return Response[]
354 355
 	 */
355 356
 	public function prepareResponses($filesUri, $requestedProps, $nodes) {
Please login to merge, or discard this patch.
lib/private/Share20/DefaultShareProvider.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1051,7 +1051,7 @@
 block discarded – undo
1051 1051
 	/**
1052 1052
 	 * Check whether the share object fits the expectations of this provider
1053 1053
 	 *
1054
-	 * @param IShare $share share
1054
+	 * @param \OCP\Share\IShare $share share
1055 1055
 	 *
1056 1056
 	 * @throws InvalidArgumentException if the share validation failed
1057 1057
 	 */
Please login to merge, or discard this patch.
apps/dav/lib/Connector/LegacyDAVACL.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -49,6 +49,10 @@
 block discarded – undo
49 49
 		);
50 50
 	}
51 51
 
52
+	/**
53
+	 * @param string $principal
54
+	 * @param boolean $toV2
55
+	 */
52 56
 	private function convertPrincipal($principal, $toV2) {
53 57
 		list(, $name) = URLUtil::splitPath($principal);
54 58
 		if ($toV2) {
Please login to merge, or discard this patch.
lib/private/User/AccountMapper.php 1 patch
Doc Comments   +13 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
 	/**
44 44
 	 * Delegate to term mapper to avoid needing to inject term mapper
45
-	 * @param $account_id
45
+	 * @param integer $account_id
46 46
 	 * @param array $terms
47 47
 	 */
48 48
 	public function setTermsForAccount($account_id, array $terms) {
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 
52 52
 	/**
53 53
 	 * Delegate to term mapper to avoid needing to inject term mapper
54
-	 * @param $account_id
54
+	 * @param integer $account_id
55 55
 	 * @return AccountTerm[] $terms
56 56
 	 */
57 57
 	public function findByAccountId($account_id) {
@@ -164,6 +164,9 @@  discard block
 block discarded – undo
164 164
 		return $this->findEntities($qb->getSQL(), $qb->getParameters(), $limit, $offset);
165 165
 	}
166 166
 
167
+	/**
168
+	 * @param boolean $hasLoggedIn
169
+	 */
167 170
 	public function getUserCountPerBackend($hasLoggedIn) {
168 171
 		$qb = $this->db->getQueryBuilder();
169 172
 		$qb->select(['backend', $qb->createFunction('count(*) as `count`')])
@@ -186,6 +189,9 @@  discard block
 block discarded – undo
186 189
 		return $return;
187 190
 	}
188 191
 
192
+	/**
193
+	 * @param boolean $hasLoggedIn
194
+	 */
189 195
 	public function getUserCount($hasLoggedIn) {
190 196
 		$qb = $this->db->getQueryBuilder();
191 197
 		$qb->select([$qb->createFunction('count(*) as `count`')])
@@ -202,6 +208,11 @@  discard block
 block discarded – undo
202 208
 		return (int) $data['count'];
203 209
 	}
204 210
 
211
+	/**
212
+	 * @param \Closure $callback
213
+	 * @param string $search
214
+	 * @param boolean $onlySeen
215
+	 */
205 216
 	public function callForAllUsers($callback, $search, $onlySeen) {
206 217
 		$qb = $this->db->getQueryBuilder();
207 218
 		$qb->select(['*'])
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 	 *
362 362
 	 * @param string $column
363 363
 	 * @param mixed $type One of IQueryBuilder::PARAM_*
364
-	 * @return string
364
+	 * @return QueryFunction
365 365
 	 */
366 366
 	public function castColumn($column, $type) {
367 367
 		return new QueryFunction(
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 	/**
373 373
 	 * Returns a query function to find the number of characters in a string column
374 374
 	 * @param string $column
375
-	 * @return string
375
+	 * @return QueryFunction
376 376
 	 */
377 377
 	public function length($column) {
378 378
 		$column = $this->helper->quoteColumnName($column);
Please login to merge, or discard this patch.
lib/private/Encryption/DecryptAll.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@
 block discarded – undo
127 127
 	/**
128 128
 	 * prepare encryption modules to perform the decrypt all function
129 129
 	 *
130
-	 * @param $user
130
+	 * @param string $user
131 131
 	 * @return bool
132 132
 	 */
133 133
 	protected function prepareEncryptionModules($user) {
Please login to merge, or discard this patch.
lib/private/Files/Cache/Scanner.php 1 patch
Doc Comments   +10 added lines patch added patch discarded remove patch
@@ -391,6 +391,13 @@  discard block
 block discarded – undo
391 391
 		return $size;
392 392
 	}
393 393
 
394
+	/**
395
+	 * @param string $path
396
+	 * @param boolean $recursive
397
+	 * @param integer $reuse
398
+	 * @param boolean $lock
399
+	 * @param integer $size
400
+	 */
394 401
 	private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$size) {
395 402
 		// we put this in it's own function so it cleans up the memory before we start recursing
396 403
 		$existingChildren = $this->getExistingChildren($folderId);
@@ -490,6 +497,9 @@  discard block
 block discarded – undo
490 497
 		}
491 498
 	}
492 499
 
500
+	/**
501
+	 * @param string|boolean $path
502
+	 */
493 503
 	private function runBackgroundScanJob(callable $callback, $path) {
494 504
 		try {
495 505
 			$callback();
Please login to merge, or discard this patch.