Completed
Pull Request — master (#1829)
by
unknown
35s
created
lib/Tools/Db/ExtendedQueryBuilder.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 */
196 196
 	public function limitToCreation(int $delay = 0): self {
197 197
 		$date = new DateTime('now');
198
-		$date->sub(new DateInterval('PT' . $delay . 'M'));
198
+		$date->sub(new DateInterval('PT'.$delay.'M'));
199 199
 
200 200
 		$this->limitToDBFieldDateTime('creation', $date, true);
201 201
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		$expr = $this->expr();
213 213
 		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias()
214 214
 																. '.' : '';
215
-		$field = $pf . $field;
215
+		$field = $pf.$field;
216 216
 
217 217
 		$orX = [$expr->lte($field, $this->createNamedParameter($date, IQueryBuilder::PARAM_DATE))];
218 218
 
@@ -239,8 +239,8 @@  discard block
 block discarded – undo
239 239
 		}
240 240
 
241 241
 		$expr = $this->expr();
242
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
243
-		$field = $pf . $field;
242
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
243
+		$field = $pf.$field;
244 244
 
245 245
 		$this->andWhere($expr->gte($field, $this->createNamedParameter($dTime, IQueryBuilder::PARAM_DATE)));
246 246
 	}
@@ -253,8 +253,8 @@  discard block
 block discarded – undo
253 253
 	public function searchInDBField(string $field, string $value): void {
254 254
 		$expr = $this->expr();
255 255
 
256
-		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias() . '.' : '';
257
-		$field = $pf . $field;
256
+		$pf = ($this->getType() === DBALQueryBuilder::SELECT) ? $this->getDefaultSelectAlias().'.' : '';
257
+		$field = $pf.$field;
258 258
 
259 259
 		$this->andWhere($expr->iLike($field, $this->createNamedParameter($value)));
260 260
 	}
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 	 */
378 378
 	public function exprLike(string $field, string $value, string $alias = '', bool $cs = true): string {
379 379
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
380
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
380
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
381 381
 		}
382 382
 
383 383
 		$expr = $this->expr();
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
 
391 391
 	public function exprLimit(string $field, string $value, string $alias = '', bool $cs = true): string {
392 392
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
393
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
393
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
394 394
 		}
395 395
 
396 396
 		$expr = $this->expr();
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 
409 409
 	public function exprLimitInt(string $field, int $value, string $alias = ''): string {
410 410
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
411
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
411
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
412 412
 		}
413 413
 
414 414
 		$expr = $this->expr();
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 	 */
427 427
 	public function exprLimitBool(string $field, bool $value, string $alias = ''): string {
428 428
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
429
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
429
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
430 430
 		}
431 431
 
432 432
 		$expr = $this->expr();
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 		string $alias = '',
448 448
 	): ICompositeExpression {
449 449
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
450
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
450
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
451 451
 		}
452 452
 
453 453
 		$expr = $this->expr();
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
 		string $alias = '',
473 473
 	): ICompositeExpression {
474 474
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
475
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
475
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
476 476
 		}
477 477
 
478 478
 		$expr = $this->expr();
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 		int $type = IQueryBuilder::PARAM_STR_ARRAY,
527 527
 	): string {
528 528
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
529
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
529
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
530 530
 		}
531 531
 
532 532
 		$expr = $this->expr();
@@ -543,7 +543,7 @@  discard block
 block discarded – undo
543 543
 	 */
544 544
 	public function exprLimitBitwise(string $field, int $flag, string $alias = ''): string {
545 545
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
546
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
546
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
547 547
 		}
548 548
 
549 549
 		$expr = $this->expr();
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
 	 */
566 566
 	public function exprLt(string $field, int $value, bool $lte = false, string $alias = ''): string {
567 567
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
568
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
568
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
569 569
 		}
570 570
 
571 571
 		$expr = $this->expr();
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 	 */
588 588
 	public function exprGt(string $field, int $value, bool $gte = false, string $alias = ''): string {
589 589
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
590
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
590
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
591 591
 		}
592 592
 
593 593
 		$expr = $this->expr();
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
 	 */
697 697
 	public function exprUnlike(string $field, string $value, string $alias = '', bool $cs = true): string {
698 698
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
699
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
699
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
700 700
 		}
701 701
 
702 702
 		$expr = $this->expr();
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
720 720
 	 */
721 721
 	public function exprFilter(string $field, string $value, string $alias = '', bool $cs = true): string {
722 722
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
723
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
723
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
724 724
 		}
725 725
 
726 726
 		$expr = $this->expr();
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 	 */
747 747
 	public function exprFilterInt(string $field, int $value, string $alias = ''): string {
748 748
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
749
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
749
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
750 750
 		}
751 751
 
752 752
 		$expr = $this->expr();
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
 	 */
765 765
 	public function exprFilterBool(string $field, bool $value, string $alias = ''): string {
766 766
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
767
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
767
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
768 768
 		}
769 769
 
770 770
 		$expr = $this->expr();
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
 		string $alias = '',
786 786
 	): ICompositeExpression {
787 787
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
788
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
788
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
789 789
 		}
790 790
 
791 791
 		$expr = $this->expr();
@@ -810,7 +810,7 @@  discard block
 block discarded – undo
810 810
 		string $alias = '',
811 811
 	): ICompositeExpression {
812 812
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
813
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
813
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
814 814
 		}
815 815
 
816 816
 		$expr = $this->expr();
@@ -838,7 +838,7 @@  discard block
 block discarded – undo
838 838
 		bool $cs = true,
839 839
 	): ICompositeExpression {
840 840
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
841
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
841
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
842 842
 		}
843 843
 
844 844
 		$orX = [];
@@ -863,7 +863,7 @@  discard block
 block discarded – undo
863 863
 	 */
864 864
 	public function exprFilterInArray(string $field, array $values, string $alias = ''): string {
865 865
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
866
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
866
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
867 867
 		}
868 868
 
869 869
 		$expr = $this->expr();
@@ -881,7 +881,7 @@  discard block
 block discarded – undo
881 881
 	 */
882 882
 	public function exprFilterBitwise(string $field, int $flag, string $alias = ''): string {
883 883
 		if ($this->getType() === DBALQueryBuilder::SELECT) {
884
-			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias) . '.' . $field;
884
+			$field = (($alias === '') ? $this->getDefaultSelectAlias() : $alias).'.'.$field;
885 885
 		}
886 886
 
887 887
 		$expr = $this->expr();
@@ -1042,12 +1042,12 @@  discard block
 block discarded – undo
1042 1042
 		string $alias = '',
1043 1043
 	): self {
1044 1044
 		$selectFields = array_map(
1045
-			function (string $item) use ($alias) {
1045
+			function(string $item) use ($alias) {
1046 1046
 				if ($alias === '') {
1047 1047
 					return $item;
1048 1048
 				}
1049 1049
 
1050
-				return $alias . '.' . $item;
1050
+				return $alias.'.'.$item;
1051 1051
 			}, $fields
1052 1052
 		);
1053 1053
 
@@ -1073,13 +1073,13 @@  discard block
 block discarded – undo
1073 1073
 		string $prefix,
1074 1074
 		array $default = [],
1075 1075
 	): self {
1076
-		$prefix = trim($prefix) . '_';
1076
+		$prefix = trim($prefix).'_';
1077 1077
 		foreach ($default as $k => $v) {
1078
-			$this->addDefaultValue($prefix . $k, (string)$v);
1078
+			$this->addDefaultValue($prefix.$k, (string)$v);
1079 1079
 		}
1080 1080
 
1081 1081
 		foreach ($fields as $field) {
1082
-			$this->selectAlias($alias . '.' . $field, $prefix . $field);
1082
+			$this->selectAlias($alias.'.'.$field, $prefix.$field);
1083 1083
 		}
1084 1084
 
1085 1085
 		return $this;
Please login to merge, or discard this patch.
lib/Listeners/GroupChanged.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 		$groupId = $event->getGroup()->getGID();
42 42
 
43 43
 		$circle = new Circle();
44
-		$circle->setName('group:' . $groupId)
44
+		$circle->setName('group:'.$groupId)
45 45
 			->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
46 46
 			->setSource(Member::TYPE_GROUP);
47 47
 
Please login to merge, or discard this patch.