Completed
Push — master ( 6f992f...80bf40 )
by Maxence
03:01
created
lib/Db/DeprecatedCirclesRequestBuilder.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 		}
246 246
 
247 247
 		$expr = $qb->expr();
248
-		$pf = '' . $this->default_select_alias . '.';
248
+		$pf = ''.$this->default_select_alias.'.';
249 249
 
250 250
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
251 251
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 		   ->leftJoin(
260 260
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_MEMBERS, 'u',
261 261
 			   $expr->andX(
262
-				   $expr->eq('u.circle_id', $pf . 'unique_id'),
262
+				   $expr->eq('u.circle_id', $pf.'unique_id'),
263 263
 				   $expr->eq('u.user_id', $qb->createNamedParameter($userId)),
264 264
 				   $expr->eq('u.instance', $qb->createNamedParameter($instanceId)),
265 265
 				   $expr->eq('u.user_type', $qb->createNamedParameter($type))
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 		}
282 282
 
283 283
 		$expr = $qb->expr();
284
-		$pf = $this->default_select_alias . '.';
284
+		$pf = $this->default_select_alias.'.';
285 285
 
286 286
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
287 287
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 		   ->leftJoin(
295 295
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_MEMBERS, 'o',
296 296
 			   $expr->andX(
297
-				   $expr->eq('o.circle_id', $pf . 'unique_id'),
297
+				   $expr->eq('o.circle_id', $pf.'unique_id'),
298 298
 				   $expr->eq('o.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_OWNER)),
299 299
 				   $expr->eq('o.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER))
300 300
 			   )
Please login to merge, or discard this patch.
lib/Db/DeprecatedCirclesRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -203,7 +203,7 @@
 block discarded – undo
203 203
 		$cursor->closeCursor();
204 204
 
205 205
 		if ($data === false) {
206
-			throw new CircleDoesNotExistException($this->l10n->t('Circle not found ' . $circleUniqueId));
206
+			throw new CircleDoesNotExistException($this->l10n->t('Circle not found '.$circleUniqueId));
207 207
 		}
208 208
 
209 209
 		$circle = $this->parseCirclesSelectSql($data);
Please login to merge, or discard this patch.
lib/Db/DeprecatedRequestBuilder.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -348,8 +348,8 @@  discard block
 block discarded – undo
348 348
 		$expr = $qb->expr();
349 349
 
350 350
 		if ($pf === '') {
351
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
352
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
351
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
352
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
353 353
 
354 354
 			return;
355 355
 		}
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
379 379
 				continue;
380 380
 			}
381
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
381
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
382 382
 		}
383 383
 
384 384
 		return $orX;
@@ -393,12 +393,12 @@  discard block
 block discarded – undo
393 393
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
394 394
 		$expr = $qb->expr();
395 395
 
396
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
396
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
397 397
 
398 398
 		$orX = $expr->orX();
399
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
400
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
401
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
399
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_MEMBER)));
400
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_INVITED)));
401
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(DeprecatedMember::STATUS_REQUEST)));
402 402
 
403 403
 		$qb->andWhere($orX);
404 404
 	}
@@ -411,8 +411,8 @@  discard block
 block discarded – undo
411 411
 	 */
412 412
 	public function limitToDBField(IQueryBuilder $qb, $field, $value) {
413 413
 		$expr = $qb->expr();
414
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
415
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
414
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
415
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
416 416
 	}
417 417
 
418 418
 
@@ -423,8 +423,8 @@  discard block
 block discarded – undo
423 423
 	 */
424 424
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
425 425
 		$expr = $qb->expr();
426
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
427
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
426
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
427
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
428 428
 	}
429 429
 
430 430
 
@@ -439,9 +439,9 @@  discard block
 block discarded – undo
439 439
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
440 440
 		$expr = $qb->expr();
441 441
 
442
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
442
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
443 443
 
444
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
444
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
445 445
 		if ($userId !== '') {
446 446
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
447 447
 		} else {
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 		}
465 465
 
466 466
 		$expr = $qb->expr();
467
-		$pf = $this->default_select_alias . '.';
467
+		$pf = $this->default_select_alias.'.';
468 468
 
469 469
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
470 470
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
 		   ->selectAlias('lc.settings', 'circle_settings')
474 474
 		   ->leftJoin(
475 475
 			   $this->default_select_alias, DeprecatedRequestBuilder::TABLE_CIRCLES, 'lc',
476
-			   $expr->eq($pf . 'circle_id', 'lc.unique_id')
476
+			   $expr->eq($pf.'circle_id', 'lc.unique_id')
477 477
 		   );
478 478
 	}
479 479
 
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	 * Limit the request to the owner
177 177
 	 *
178 178
 	 * @param IQueryBuilder $qb
179
-	 * @param $owner
179
+	 * @param string $owner
180 180
 	 */
181 181
 	protected function limitToOwner(IQueryBuilder $qb, $owner) {
182 182
 		$this->limitToDBField($qb, 'owner', $owner);
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 	 *
343 343
 	 * @param IQueryBuilder $qb
344 344
 	 * @param int $level
345
-	 * @param string|array $pf
345
+	 * @param string[] $pf
346 346
 	 */
347 347
 	protected function limitToLevel(IQueryBuilder $qb, int $level, $pf = '') {
348 348
 		$expr = $qb->expr();
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 	/**
420 420
 	 * @param IQueryBuilder $qb
421 421
 	 * @param string $field
422
-	 * @param string|integer $value
422
+	 * @param string $value
423 423
 	 */
424 424
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
425 425
 		$expr = $qb->expr();
Please login to merge, or discard this patch.
lib/Model/Federated/FederatedEvent.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
 	}
112 112
 
113 113
 	/**
114
-	 * @param mixed $class
114
+	 * @param string $class
115 115
 	 *
116 116
 	 * @return self
117 117
 	 */
Please login to merge, or discard this patch.
lib/Service/FederatedEventService.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -238,16 +238,16 @@
 block discarded – undo
238 238
 		try {
239 239
 			$test = new ReflectionClass($class);
240 240
 		} catch (ReflectionException $e) {
241
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
241
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
242 242
 		}
243 243
 
244 244
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
245
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
245
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
246 246
 		}
247 247
 
248 248
 		$item = OC::$server->get($class);
249 249
 		if (!($item instanceof IFederatedItem)) {
250
-			throw new FederatedEventException($class . ' not an IFederatedItem');
250
+			throw new FederatedEventException($class.' not an IFederatedItem');
251 251
 		}
252 252
 
253 253
 		$this->setFederatedEventBypass($event, $item);
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,6 @@
 block discarded – undo
47 47
 use OCA\Circles\Exceptions\FederatedShareBelongingException;
48 48
 use OCA\Circles\Exceptions\FederatedShareNotFoundException;
49 49
 use OCA\Circles\Exceptions\InitiatorNotConfirmedException;
50
-use OCA\Circles\Exceptions\JsonException;
51 50
 use OCA\Circles\Exceptions\ModelException;
52 51
 use OCA\Circles\Exceptions\OwnerNotFoundException;
53 52
 use OCA\Circles\Exceptions\RemoteInstanceException;
Please login to merge, or discard this patch.
lib/Service/RemoteService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@
 block discarded – undo
189 189
 			$loop++;
190 190
 			if ($loop > 10 || in_array($instance, $knownInstance)) {
191 191
 				throw new CircleNotFoundException(
192
-					'circle not found after browsing ' . implode(', ', $knownInstance)
192
+					'circle not found after browsing '.implode(', ', $knownInstance)
193 193
 				);
194 194
 			}
195 195
 			$knownInstance[] = $instance;
Please login to merge, or discard this patch.
lib/Db/CoreRequestBuilder.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 
111 111
 
112 112
 	/**
113
-	 * @param array $ids
113
+	 * @param string[] $ids
114 114
 	 *
115 115
 	 * @throws InvalidIdException
116 116
 	 */
Please login to merge, or discard this patch.
lib/Db/FileSharesRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 		$expr = $qb->expr();
106 106
 
107 107
 		$this->limitToShareType($qb, self::SHARE_TYPE);
108
-		$qb->andWhere($expr->isNull($this->default_select_alias . '.parent'));
108
+		$qb->andWhere($expr->isNull($this->default_select_alias.'.parent'));
109 109
 
110 110
 		$shares = [];
111 111
 		$cursor = $qb->execute();
Please login to merge, or discard this patch.
lib/Service/FederatedShareService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 		/** @var FederatedShare $share */
111 111
 		$share = $data->gObj('federatedShare', FederatedShare::class);
112 112
 		if ($share->getLockStatus() === ItemLock::STATUS_INSTANCE_LOCKED) {
113
-			throw new FederatedShareAlreadyLockedException('item already locked by ' . $share->getInstance());
113
+			throw new FederatedShareAlreadyLockedException('item already locked by '.$share->getInstance());
114 114
 		}
115 115
 
116 116
 		return $share;
Please login to merge, or discard this patch.