Completed
Pull Request — master (#453)
by Maxence
02:12
created
lib/Db/CoreRequestBuilder.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -344,8 +344,8 @@  discard block
 block discarded – undo
344 344
 		$expr = $qb->expr();
345 345
 
346 346
 		if ($pf === '') {
347
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
348
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
347
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
348
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
349 349
 
350 350
 			return;
351 351
 		}
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
374 374
 				continue;
375 375
 			}
376
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
376
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
377 377
 		}
378 378
 
379 379
 		return $orX;
@@ -388,12 +388,12 @@  discard block
 block discarded – undo
388 388
 	protected function limitToMembersAndAlmost(IQueryBuilder &$qb) {
389 389
 		$expr = $qb->expr();
390 390
 
391
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
391
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
392 392
 
393 393
 		$orX = $expr->orX();
394
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
395
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
396
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
394
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
395
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
396
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
397 397
 
398 398
 		$qb->andWhere($orX);
399 399
 	}
@@ -406,8 +406,8 @@  discard block
 block discarded – undo
406 406
 	 */
407 407
 	private function limitToDBField(IQueryBuilder &$qb, $field, $value) {
408 408
 		$expr = $qb->expr();
409
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
410
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
409
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
410
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
411 411
 	}
412 412
 
413 413
 
@@ -418,8 +418,8 @@  discard block
 block discarded – undo
418 418
 	 */
419 419
 	private function limitToDBFieldOrGreater(IQueryBuilder &$qb, $field, $value) {
420 420
 		$expr = $qb->expr();
421
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
422
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
421
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
422
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
423 423
 	}
424 424
 
425 425
 
@@ -434,9 +434,9 @@  discard block
 block discarded – undo
434 434
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
435 435
 		$expr = $qb->expr();
436 436
 
437
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
437
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
438 438
 
439
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
439
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
440 440
 		if ($userId !== '') {
441 441
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
442 442
 		} else {
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
 		}
460 460
 
461 461
 		$expr = $qb->expr();
462
-		$pf = $this->default_select_alias . '.';
462
+		$pf = $this->default_select_alias.'.';
463 463
 
464 464
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
465 465
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
 		   ->selectAlias('lc.settings', 'circle_settings')
468 468
 		   ->leftJoin(
469 469
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_CIRCLES, 'lc',
470
-			   $expr->eq($pf . 'circle_id', 'lc.unique_id')
470
+			   $expr->eq($pf.'circle_id', 'lc.unique_id')
471 471
 		   );
472 472
 	}
473 473
 
Please login to merge, or discard this patch.