Completed
Pull Request — master (#2042)
by
unknown
29s
created
lib/Db/RemoteRequest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -173,10 +173,10 @@  discard block
 block discarded – undo
173 173
 			$qb->leftJoin(
174 174
 				CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember,
175 175
 				$expr->andX(
176
-					$expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())),
177
-					$expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'),
176
+					$expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())),
177
+					$expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'),
178 178
 					$expr->gte(
179
-						$aliasMember . '.level',
179
+						$aliasMember.'.level',
180 180
 						$qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT)
181 181
 					)
182 182
 				)
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 
185 185
 			$orX[] = $expr->andX(
186 186
 				$qb->exprLimit('type', RemoteInstance::TYPE_EXTERNAL, '', false),
187
-				$expr->isNotNull($aliasMember . '.instance'),
187
+				$expr->isNotNull($aliasMember.'.instance'),
188 188
 			);
189 189
 		}
190 190
 
Please login to merge, or discard this patch.
lib/Db/GSSharesRequest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -97,11 +97,11 @@
 block discarded – undo
97 97
 
98 98
 	private function leftJoinMountPoint(IQueryBuilder $qb, string $userId) {
99 99
 		$expr = $qb->expr();
100
-		$pf = '' . $this->default_select_alias . '.';
100
+		$pf = ''.$this->default_select_alias.'.';
101 101
 
102 102
 		$on = $expr->andX(
103 103
 			$expr->eq('mp.user_id', $qb->createNamedParameter($userId)),
104
-			$expr->eq('mp.share_id', $pf . 'id'),
104
+			$expr->eq('mp.share_id', $pf.'id'),
105 105
 		);
106 106
 
107 107
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
Please login to merge, or discard this patch.
lib/Db/CoreQueryBuilder.php 1 patch
Spacing   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -377,8 +377,8 @@  discard block
 block discarded – undo
377 377
 			$andX = [];
378 378
 			foreach (explode(' ', $circle->getDisplayName()) as $word) {
379 379
 				$andX[] = $expr->iLike(
380
-					$this->getDefaultSelectAlias() . '.' . 'display_name',
381
-					$this->createNamedParameter('%' . $word . '%')
380
+					$this->getDefaultSelectAlias().'.'.'display_name',
381
+					$this->createNamedParameter('%'.$word.'%')
382 382
 				);
383 383
 			}
384 384
 		}
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
 			$this->generateRemoteInstanceSelectAlias($aliasRemoteInstance)
408 408
 				->leftJoin(
409 409
 					$alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance,
410
-					$expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance')
410
+					$expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance')
411 411
 				);
412 412
 		} catch (RequestBuilderException $e) {
413 413
 		}
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
 		$expr = $this->expr();
460 460
 		$this->leftJoin(
461 461
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote,
462
-			$expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance()))
462
+			$expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance()))
463 463
 		);
464 464
 	}
465 465
 
@@ -487,12 +487,12 @@  discard block
 block discarded – undo
487 487
 		$this->leftJoin(
488 488
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember,
489 489
 			$expr->andX(
490
-				$expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'),
490
+				$expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'),
491 491
 				$expr->eq(
492
-					$aliasRemoteMember . '.instance',
492
+					$aliasRemoteMember.'.instance',
493 493
 					$this->createNamedParameter($remoteInstance->getInstance())
494 494
 				),
495
-				$expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
495
+				$expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
496 496
 			)
497 497
 		);
498 498
 	}
@@ -524,21 +524,21 @@  discard block
 block discarded – undo
524 524
 		$this->leftJoin(
525 525
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle,
526 526
 			$expr->andX(
527
-				$expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'),
528
-				$expr->emptyString($aliasRemoteCircle . '.instance'),
529
-				$expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
527
+				$expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'),
528
+				$expr->emptyString($aliasRemoteCircle.'.instance'),
529
+				$expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
530 530
 			)
531 531
 		);
532 532
 		$this->leftJoin(
533 533
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner,
534 534
 			$expr->andX(
535
-				$expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'),
535
+				$expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'),
536 536
 				$expr->eq(
537
-					$aliasRemoteCircleOwner . '.instance',
537
+					$aliasRemoteCircleOwner.'.instance',
538 538
 					$this->createNamedParameter($remoteInstance->getInstance())
539 539
 				),
540 540
 				$expr->eq(
541
-					$aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)
541
+					$aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)
542 542
 				)
543 543
 			)
544 544
 		);
@@ -569,11 +569,11 @@  discard block
 block discarded – undo
569 569
 		$aliasRemoteCircleOwner = $this->generateAlias($aliasRemoteCircle, self::OWNER);
570 570
 
571 571
 		$expr = $this->expr();
572
-		$orX = [$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))];
572
+		$orX = [$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))];
573 573
 
574
-		$orExtOrPassive = [$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))];
574
+		$orExtOrPassive = [$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))];
575 575
 		if (!$sensitive) {
576
-			$orExtOrPassive[] = $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE));
576
+			$orExtOrPassive[] = $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE));
577 577
 		} else {
578 578
 			if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) {
579 579
 				$orExtOrPassive[] = $this->limitRemoteVisibility_Sensitive_Members($aliasRemote);
@@ -581,8 +581,8 @@  discard block
 block discarded – undo
581 581
 		}
582 582
 
583 583
 		$orInstance = $expr->orX(
584
-			$expr->isNotNull($aliasRemoteMember . '.instance'),
585
-			$expr->isNotNull($aliasRemoteCircleOwner . '.instance'),
584
+			$expr->isNotNull($aliasRemoteMember.'.instance'),
585
+			$expr->isNotNull($aliasRemoteCircleOwner.'.instance'),
586 586
 		);
587 587
 
588 588
 		$andExternal = $expr->andX(
@@ -592,13 +592,13 @@  discard block
 block discarded – undo
592 592
 
593 593
 		$orExtOrTrusted = $expr->orX(
594 594
 			$andExternal,
595
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)),
595
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)),
596 596
 		);
597 597
 
598 598
 		$orX[] = $expr->andX(
599 599
 			$orExtOrTrusted,
600 600
 			$this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle),
601
-			$expr->emptyString($aliasOwner . '.instance'),
601
+			$expr->emptyString($aliasOwner.'.instance'),
602 602
 		);
603 603
 
604 604
 		$this->andWhere($expr->orX(...$orX));
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
 		}
626 626
 		$this->innerJoin(
627 627
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
628
-			$expr->eq($aliasMember . '.circle_id', $alias . '.unique_id')
628
+			$expr->eq($aliasMember.'.circle_id', $alias.'.unique_id')
629 629
 		);
630 630
 
631 631
 		$this->filterDirectMembership($aliasMember, $member);
@@ -650,12 +650,12 @@  discard block
 block discarded – undo
650 650
 			$aliasCircle,
651 651
 			'circles_membership',
652 652
 			$aliasMembership,
653
-			$this->expr()->eq($aliasCircle . '.unique_id', $aliasMembership . '.circle_id')
653
+			$this->expr()->eq($aliasCircle.'.unique_id', $aliasMembership.'.circle_id')
654 654
 		);
655 655
 
656 656
 		$this->andWhere(
657 657
 			$this->expr()->eq(
658
-				$aliasMembership . '.single_id',
658
+				$aliasMembership.'.single_id',
659 659
 				$this->createNamedParameter($federatedUser->getSingleId())
660 660
 			)
661 661
 		);
@@ -675,22 +675,22 @@  discard block
 block discarded – undo
675 675
 		$andX = [];
676 676
 
677 677
 		if ($member->getUserId() !== '') {
678
-			$andX[] = $expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId()));
678
+			$andX[] = $expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId()));
679 679
 		}
680 680
 
681 681
 		if ($member->getSingleId() !== '') {
682
-			$andX[] = $expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId()));
682
+			$andX[] = $expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId()));
683 683
 		}
684 684
 
685 685
 		if ($member->getUserType() > 0) {
686
-			$andX[] = $expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType()));
686
+			$andX[] = $expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType()));
687 687
 		}
688 688
 
689 689
 		$this->limitToInstance($this->getInstance($member));
690 690
 
691 691
 		if ($member->getLevel() > 0) {
692 692
 			$andX[] = $expr->gte(
693
-				$aliasMember . '.level',
693
+				$aliasMember.'.level',
694 694
 				$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
695 695
 			);
696 696
 		}
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
 			$helperAlias,
731 731
 			CoreRequestBuilder::TABLE_CIRCLE,
732 732
 			$aliasCircle,
733
-			$expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field)
733
+			$expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field)
734 734
 		);
735 735
 
736 736
 		if (!is_null($initiator)) {
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
 		$this->generateCircleSelectAlias($aliasInvitedBy)
762 762
 			->leftJoin(
763 763
 				$aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy,
764
-				$expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id')
764
+				$expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id')
765 765
 			);
766 766
 
767 767
 		$this->leftJoinOwner($aliasInvitedBy);
@@ -792,7 +792,7 @@  discard block
 block discarded – undo
792 792
 		$this->generateCircleSelectAlias($aliasBasedOn)
793 793
 			->leftJoin(
794 794
 				$aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn,
795
-				$expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id')
795
+				$expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id')
796 796
 			);
797 797
 
798 798
 		if (!is_null($initiator)) {
@@ -825,9 +825,9 @@  discard block
 block discarded – undo
825 825
 			->leftJoin(
826 826
 				$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
827 827
 				$expr->andX(
828
-					$expr->eq($aliasMember . '.circle_id', $alias . '.' . $field),
828
+					$expr->eq($aliasMember.'.circle_id', $alias.'.'.$field),
829 829
 					$expr->eq(
830
-						$aliasMember . '.level',
830
+						$aliasMember.'.level',
831 831
 						$this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT)
832 832
 					)
833 833
 				)
@@ -859,7 +859,7 @@  discard block
 block discarded – undo
859 859
 
860 860
 		$expr = $this->expr();
861 861
 
862
-		$on = $expr->andX($expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field));
862
+		$on = $expr->andX($expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field));
863 863
 
864 864
 		// limit on membership level if requested
865 865
 		$minLevel = $probe->getMinimumLevel();
@@ -900,8 +900,8 @@  discard block
 block discarded – undo
900 900
 			->leftJoin(
901 901
 				$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
902 902
 				$expr->andX(
903
-					$expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId),
904
-					$expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId),
903
+					$expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId),
904
+					$expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId),
905 905
 					$this->exprGt('level', Member::LEVEL_MEMBER, true, $aliasMember)
906 906
 				)
907 907
 			);
@@ -933,7 +933,7 @@  discard block
 block discarded – undo
933 933
 
934 934
 		$this->leftJoin(
935 935
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
936
-			$expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field)
936
+			$expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field)
937 937
 		);
938 938
 
939 939
 		//		if (!$this->getBool('getData', $options, false)) {
@@ -947,8 +947,8 @@  discard block
 block discarded – undo
947 947
 			->leftJoin(
948 948
 				$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
949 949
 				$expr->andX(
950
-					$expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'),
951
-					$expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id')
950
+					$expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'),
951
+					$expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id')
952 952
 				)
953 953
 			);
954 954
 
@@ -965,12 +965,12 @@  discard block
 block discarded – undo
965 965
 		$aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options);
966 966
 		$this->leftJoin(
967 967
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership,
968
-			$expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId))
968
+			$expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId))
969 969
 		);
970 970
 
971 971
 		$orX = $expr->orX(
972
-			$expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field),
973
-			$expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId))
972
+			$expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field),
973
+			$expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId))
974 974
 		);
975 975
 
976 976
 		$this->andWhere($orX);
@@ -991,11 +991,11 @@  discard block
 block discarded – undo
991 991
 
992 992
 		$expr = $this->expr();
993 993
 		$aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS);
994
-		$this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId)));
994
+		$this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId)));
995 995
 		if ($level > 1) {
996 996
 			$this->andWhere(
997 997
 				$expr->gte(
998
-					$aliasMembership . '.level',
998
+					$aliasMembership.'.level',
999 999
 					$this->createNamedParameter($level, IQueryBuilder::PARAM_INT)
1000 1000
 				)
1001 1001
 			);
@@ -1023,8 +1023,8 @@  discard block
 block discarded – undo
1023 1023
 		$this->leftJoin(
1024 1024
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
1025 1025
 			$expr->andX(
1026
-				$expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field),
1027
-				$expr->eq($aliasMembership . '.single_id', $alias . '.single_id')
1026
+				$expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field),
1027
+				$expr->eq($aliasMembership.'.single_id', $alias.'.single_id')
1028 1028
 			)
1029 1029
 		);
1030 1030
 
@@ -1037,8 +1037,8 @@  discard block
 block discarded – undo
1037 1037
 			->leftJoin(
1038 1038
 				$aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom,
1039 1039
 				$expr->andX(
1040
-					$expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'),
1041
-					$expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id')
1040
+					$expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'),
1041
+					$expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id')
1042 1042
 				)
1043 1043
 			);
1044 1044
 	}
@@ -1078,7 +1078,7 @@  discard block
 block discarded – undo
1078 1078
 
1079 1079
 		$this->leftJoin(
1080 1080
 			$alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken,
1081
-			$expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field)
1081
+			$expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field)
1082 1082
 		);
1083 1083
 	}
1084 1084
 
@@ -1120,14 +1120,14 @@  discard block
 block discarded – undo
1120 1120
 		try {
1121 1121
 			$aliasConfig = $this->generateAlias($alias, self::CONFIG, $options);
1122 1122
 			$this->selectAlias(
1123
-				$aliasConfig . '.config',
1124
-				(($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'circle_config'
1123
+				$aliasConfig.'.config',
1124
+				(($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'circle_config'
1125 1125
 			);
1126 1126
 			$this->leftJoin(
1127 1127
 				$alias,
1128 1128
 				CoreRequestBuilder::TABLE_CIRCLE,
1129 1129
 				$aliasConfig,
1130
-				$expr->eq($alias . '.circle_id', $aliasConfig . '.unique_id')
1130
+				$expr->eq($alias.'.circle_id', $aliasConfig.'.unique_id')
1131 1131
 			);
1132 1132
 		} catch (RequestBuilderException $e) {
1133 1133
 		}
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 			$aliasMembership,
1166 1166
 			$expr->andX(
1167 1167
 				$this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership),
1168
-				$expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field)
1168
+				$expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field)
1169 1169
 			)
1170 1170
 		);
1171 1171
 
@@ -1183,10 +1183,10 @@  discard block
 block discarded – undo
1183 1183
 		try {
1184 1184
 			$aliasMembershipCircle = $this->generateAlias($aliasMembership, self::CONFIG, $options);
1185 1185
 			$orXMembershipCircle = $expr->orX(...array_map(
1186
-				function (string $alias) use ($aliasMembershipCircle) {
1186
+				function(string $alias) use ($aliasMembershipCircle) {
1187 1187
 					return $this->expr()->eq(
1188
-						$alias . '.circle_id',
1189
-						$aliasMembershipCircle . '.unique_id'
1188
+						$alias.'.circle_id',
1189
+						$aliasMembershipCircle.'.unique_id'
1190 1190
 					);
1191 1191
 				},
1192 1192
 				$listMembershipCircleAlias
@@ -1217,7 +1217,7 @@  discard block
 block discarded – undo
1217 1217
 						$aliasDirectInitiator,
1218 1218
 						$expr->andX(
1219 1219
 							$this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirectInitiator),
1220
-							$expr->eq($aliasDirectInitiator . '.circle_id', $helperAlias . '.' . $field)
1220
+							$expr->eq($aliasDirectInitiator.'.circle_id', $helperAlias.'.'.$field)
1221 1221
 						)
1222 1222
 					);
1223 1223
 			} catch (RequestBuilderException $e) {
@@ -1231,8 +1231,8 @@  discard block
 block discarded – undo
1231 1231
 			$this->leftJoin(
1232 1232
 				$aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
1233 1233
 				$expr->andX(
1234
-					$expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'),
1235
-					$expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id')
1234
+					$expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'),
1235
+					$expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id')
1236 1236
 				)
1237 1237
 			);
1238 1238
 
@@ -1240,8 +1240,8 @@  discard block
 block discarded – undo
1240 1240
 			$this->leftJoin(
1241 1241
 				$aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
1242 1242
 				$expr->andX(
1243
-					$expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'),
1244
-					$expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id')
1243
+					$expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'),
1244
+					$expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id')
1245 1245
 				)
1246 1246
 			);
1247 1247
 
@@ -1286,8 +1286,8 @@  discard block
 block discarded – undo
1286 1286
 			->leftJoin(
1287 1287
 				$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
1288 1288
 				$expr->andX(
1289
-					$expr->eq($aliasInitiator . '.circle_id', $alias . '.unique_id'),
1290
-					$expr->eq($aliasInitiator . '.' . $field, $helperAlias . '.inheritance_first'),
1289
+					$expr->eq($aliasInitiator.'.circle_id', $alias.'.unique_id'),
1290
+					$expr->eq($aliasInitiator.'.'.$field, $helperAlias.'.inheritance_first'),
1291 1291
 				)
1292 1292
 			);
1293 1293
 		//
@@ -1323,15 +1323,15 @@  discard block
 block discarded – undo
1323 1323
 		if (!$this->getBool('filterPersonalCircles', $options, false)) {
1324 1324
 			$orX[] = $expr->andX(
1325 1325
 				$this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle),
1326
-				$expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
1326
+				$expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
1327 1327
 			);
1328 1328
 		}
1329 1329
 
1330 1330
 		$minimumLevel = $this->getInt('minimumLevel', $options);
1331 1331
 		$orXLevelCheck = $expr->orX(...array_map(
1332
-			function (string $alias) use ($minimumLevel) {
1332
+			function(string $alias) use ($minimumLevel) {
1333 1333
 				return $this->expr()->gte(
1334
-					$alias . '.level',
1334
+					$alias.'.level',
1335 1335
 					$this->createNamedParameter($minimumLevel, self::PARAM_INT)
1336 1336
 				);
1337 1337
 			},
@@ -1411,13 +1411,13 @@  discard block
 block discarded – undo
1411 1411
 	private function limitRemoteVisibility_Sensitive_Members(string $alias): ICompositeExpression {
1412 1412
 		$expr = $this->expr();
1413 1413
 		return $expr->andX(
1414
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)),
1414
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)),
1415 1415
 			$expr->orX(
1416
-				$expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance'),
1416
+				$expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance'),
1417 1417
 				// TODO: do we need this ? (display members from the local instance)
1418
-				$expr->emptyString($this->getDefaultSelectAlias() . '.instance'),
1418
+				$expr->emptyString($this->getDefaultSelectAlias().'.instance'),
1419 1419
 				$expr->eq(
1420
-					$this->getDefaultSelectAlias() . '.level',
1420
+					$this->getDefaultSelectAlias().'.level',
1421 1421
 					$this->createNamedParameter(Member::LEVEL_OWNER)
1422 1422
 				),
1423 1423
 			),
@@ -1452,11 +1452,11 @@  discard block
 block discarded – undo
1452 1452
 			)
1453 1453
 			->leftJoin(
1454 1454
 				$aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache,
1455
-				$expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid')
1455
+				$expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid')
1456 1456
 			)
1457 1457
 			->leftJoin(
1458 1458
 				$aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages,
1459
-				$expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id')
1459
+				$expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id')
1460 1460
 			);
1461 1461
 	}
1462 1462
 
@@ -1478,8 +1478,8 @@  discard block
 block discarded – undo
1478 1478
 		$this->leftJoin(
1479 1479
 			$aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild,
1480 1480
 			$expr->andX(
1481
-				$expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'),
1482
-				$expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id')
1481
+				$expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'),
1482
+				$expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id')
1483 1483
 			)
1484 1484
 		);
1485 1485
 
@@ -1537,13 +1537,13 @@  discard block
 block discarded – undo
1537 1537
 		$this->leftJoin(
1538 1538
 			$aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint,
1539 1539
 			$expr->andX(
1540
-				$expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'),
1541
-				$expr->eq($aliasMountpoint . '.single_id', $this->createNamedParameter($federatedUser->getSingleId()))
1540
+				$expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'),
1541
+				$expr->eq($aliasMountpoint.'.single_id', $this->createNamedParameter($federatedUser->getSingleId()))
1542 1542
 			)
1543 1543
 		);
1544 1544
 
1545
-		$this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint');
1546
-		$this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash');
1545
+		$this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint');
1546
+		$this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash');
1547 1547
 	}
1548 1548
 
1549 1549
 
@@ -1651,10 +1651,10 @@  discard block
 block discarded – undo
1651 1651
 	 */
1652 1652
 	public function generateAlias(string $base, string $extension, ?array &$options = []): string {
1653 1653
 		$search = str_replace('_', '.', $base);
1654
-		$path = $search . '.' . $extension;
1654
+		$path = $search.'.'.$extension;
1655 1655
 		if (!$this->validKey($path, $this->getSqlPath())
1656 1656
 			&& !in_array($extension, $this->getArray($search, $this->getSqlPath()))) {
1657
-			throw new RequestBuilderException($extension . ' not found in ' . $search);
1657
+			throw new RequestBuilderException($extension.' not found in '.$search);
1658 1658
 		}
1659 1659
 
1660 1660
 		if (!is_array($options)) {
@@ -1663,15 +1663,15 @@  discard block
 block discarded – undo
1663 1663
 
1664 1664
 		$optionPath = '';
1665 1665
 		foreach (explode('.', $path) as $p) {
1666
-			$optionPath = trim($optionPath . '.' . $p, '.');
1666
+			$optionPath = trim($optionPath.'.'.$p, '.');
1667 1667
 			$options = array_merge(
1668 1668
 				$options,
1669
-				$this->getArray($optionPath . '.' . self::OPTIONS, $this->getSqlPath()),
1670
-				$this->getArray($optionPath . '.' . self::OPTIONS, $this->options)
1669
+				$this->getArray($optionPath.'.'.self::OPTIONS, $this->getSqlPath()),
1670
+				$this->getArray($optionPath.'.'.self::OPTIONS, $this->options)
1671 1671
 			);
1672 1672
 		}
1673 1673
 
1674
-		return $base . '_' . $extension;
1674
+		return $base.'_'.$extension;
1675 1675
 	}
1676 1676
 
1677 1677
 
@@ -1691,7 +1691,7 @@  discard block
 block discarded – undo
1691 1691
 			} else {
1692 1692
 				$k = $arr;
1693 1693
 			}
1694
-			$path[$k] = $prefix . '_' . $k . '_';
1694
+			$path[$k] = $prefix.'_'.$k.'_';
1695 1695
 		}
1696 1696
 
1697 1697
 		return $path;
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.
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' . ((string)$delay) . 'M'));
198
+		$date->sub(new DateInterval('PT'.((string)$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/Service/SyncService.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	 * @throws SingleCircleNotFoundException
227 227
 	 */
228 228
 	public function syncNextcloudUser(string $userId): FederatedUser {
229
-		$this->outputService->output('Syncing Nextcloud Account \'' . $userId . '\'', true);
229
+		$this->outputService->output('Syncing Nextcloud Account \''.$userId.'\'', true);
230 230
 
231 231
 		return $this->federatedUserService->getLocalFederatedUser($userId, false, true);
232 232
 	}
@@ -270,12 +270,12 @@  discard block
 block discarded – undo
270 270
 	 * @throws RequestBuilderException
271 271
 	 */
272 272
 	public function syncNextcloudGroup(string $groupId): Circle {
273
-		$this->outputService->output('Syncing Nextcloud Group \'' . $groupId . '\'', true);
273
+		$this->outputService->output('Syncing Nextcloud Group \''.$groupId.'\'', true);
274 274
 
275 275
 		$circle = $this->federatedUserService->getGroupCircle($groupId);
276 276
 		$this->circleService->updateDisplayName($circle->getSingleId(), $this->groupManager->getDisplayName($groupId));
277 277
 
278
-		$members = array_map(function (Member $member): string {
278
+		$members = array_map(function(Member $member): string {
279 279
 			return $member->getSingleId();
280 280
 		}, $this->memberRequest->getMembers($circle->getSingleId()));
281 281
 
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
 	 */
354 354
 	public function groupDeleted(string $groupId): void {
355 355
 		$circle = new Circle();
356
-		$circle->setName('group:' . $groupId)
356
+		$circle->setName('group:'.$groupId)
357 357
 			->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
358 358
 			->setSource(Member::TYPE_GROUP);
359 359
 
Please login to merge, or discard this patch.
lib/Command/MigrateCustomGroups.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -78,15 +78,15 @@  discard block
 block discarded – undo
78 78
 
79 79
 			$name = $rowCG['display_name'];
80 80
 			while (strlen($name) < 3) {
81
-				$name = '_' . $name;
81
+				$name = '_'.$name;
82 82
 			}
83 83
 
84
-			$this->output->writeln('+ New Team <info>' . $name . '</info>, owned by <info>' . $ownerId . '</info>');
84
+			$this->output->writeln('+ New Team <info>'.$name.'</info>, owned by <info>'.$ownerId.'</info>');
85 85
 
86 86
 			// based on owner's userid, we create federateduser and a new circle
87 87
 			$owner = $this->cachedFed($ownerId);
88 88
 			if ($owner === null) {
89
-				$this->output->writeln('<error>unknown user</error> ' . $ownerId);
89
+				$this->output->writeln('<error>unknown user</error> '.$ownerId);
90 90
 				continue;
91 91
 			}
92 92
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 			try {
96 96
 				$circle = $this->circlesManager->createCircle($name);
97 97
 			} catch (\Exception $e) {
98
-				$this->output->writeln('<error>' . get_class($e) . ' ' . $e->getMessage() . '</error> with data ' . json_encode($rowCG));
98
+				$this->output->writeln('<error>'.get_class($e).' '.$e->getMessage().'</error> with data '.json_encode($rowCG));
99 99
 				$this->logger->log(2, 'error while creating circle', ['exception' => $e]);
100 100
 				$this->circlesManager->stopSession();
101 101
 				continue;
@@ -124,17 +124,17 @@  discard block
 block discarded – undo
124 124
 
125 125
 					$fedUser = $this->cachedFed($userId);
126 126
 					if ($fedUser === null) {
127
-						$this->output->writeln('<error>unknown user</error> ' . $userId);
127
+						$this->output->writeln('<error>unknown user</error> '.$userId);
128 128
 						continue;
129 129
 					}
130
-					$this->output->writeln(' - new member <info>' . $userId . '</info>');
130
+					$this->output->writeln(' - new member <info>'.$userId.'</info>');
131 131
 
132 132
 					$member = $this->circlesManager->addMember($circle->getSingleId(), $fedUser);
133 133
 					if ($rowM['role'] === '1') {
134 134
 						$this->circlesManager->levelMember($member->getId(), Member::LEVEL_ADMIN);
135 135
 					}
136 136
 				} catch (\Exception $e) {
137
-					$this->output->writeln('<error>' . get_class($e) . ' ' . $e->getMessage() . '</error>');
137
+					$this->output->writeln('<error>'.get_class($e).' '.$e->getMessage().'</error>');
138 138
 					$this->logger->log(2, 'error while migrating custom group member', ['exception' => $e]);
139 139
 				}
140 140
 			}
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 			->where($update->expr()->in('id', $update->createNamedParameter($shareIds, IQueryBuilder::PARAM_INT_ARRAY)));
171 171
 
172 172
 		$count = $update->executeStatement();
173
-		$this->output->writeln('> ' . ((string)$count) . ' shares updated');
173
+		$this->output->writeln('> '.((string)$count).' shares updated');
174 174
 
175 175
 		$this->fixShareChildren($shareIds, $memberIds);
176 176
 	}
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 			try {
187 187
 				$this->fedList[$userId] = $this->circlesManager->getLocalFederatedUser($userId);
188 188
 			} catch (\Exception $e) {
189
-				$this->logger->warning('unknown local user ' . $userId, ['exception' => $e]);
189
+				$this->logger->warning('unknown local user '.$userId, ['exception' => $e]);
190 190
 				$this->fedList[$userId] = null;
191 191
 			}
192 192
 		}
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 			$count += $update->executeStatement();
221 221
 		}
222 222
 
223
-		$this->output->writeln('> ' . ((string)$count) . ' children shares updated');
223
+		$this->output->writeln('> '.((string)$count).' children shares updated');
224 224
 	}
225 225
 
226 226
 
Please login to merge, or discard this patch.
lib/Command/CirclesMaintenance.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 				'<error>WARNING! You are about to delete all data related to the Circles App!</error>'
92 92
 			);
93 93
 			$question = new ConfirmationQuestion(
94
-				'<comment>Do you really want to ' . $action . ' Circles ?</comment> (y/N) ', false,
94
+				'<comment>Do you really want to '.$action.' Circles ?</comment> (y/N) ', false,
95 95
 				'/^(y|Y)/i'
96 96
 			);
97 97
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 			$output->writeln('<error>WARNING! This operation is not reversible.</error>');
108 108
 
109 109
 			$question = new Question(
110
-				'<comment>Please confirm this destructive operation by typing \'' . $action
110
+				'<comment>Please confirm this destructive operation by typing \''.$action
111 111
 				. '\'</comment>: ', ''
112 112
 			);
113 113
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 				$this->coreRequestBuilder->uninstall();
126 126
 			}
127 127
 
128
-			$output->writeln('<info>' . $action . ' done</info>');
128
+			$output->writeln('<info>'.$action.' done</info>');
129 129
 
130 130
 			return 0;
131 131
 		}
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 				$this->maintenanceService->runMaintenance($i, $input->getOption('force-refresh'));
139 139
 			} catch (MaintenanceException $e) {
140 140
 				$this->logger->warning('issue while performing maintenance', ['level' => $i, ['exception' => $e]]);
141
-				$output->writeln('- <error>issue while performing maintenance</error> ' . $e->getMessage() . ' (more details in logs)');
141
+				$output->writeln('- <error>issue while performing maintenance</error> '.$e->getMessage().' (more details in logs)');
142 142
 			}
143 143
 		}
144 144
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 		$federatedUser = $this->federatedUserService->getLocalFederatedUser($userId);
159 159
 		$displayName = $this->maintenanceService->updateDisplayName($federatedUser);
160 160
 		if ($displayName !== '') {
161
-			$output->writeln('Display name of ' . $federatedUser->getSingleId() . ' updated to ' . $displayName);
161
+			$output->writeln('Display name of '.$federatedUser->getSingleId().' updated to '.$displayName);
162 162
 		}
163 163
 
164 164
 		return 0;
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 			try {
174 174
 				$this->refreshSingleDisplayName($row['uid'], $output);
175 175
 			} catch (Exception $e) {
176
-				$output->writeln(get_class($e) . ' while trying to update display name of ' . $row['uid']);
176
+				$output->writeln(get_class($e).' while trying to update display name of '.$row['uid']);
177 177
 			}
178 178
 		}
179 179
 	}
Please login to merge, or discard this patch.
tests/stubs/doctrine_dbal_schema_schema.php 1 patch
Indentation   +245 added lines, -245 removed lines patch added patch discarded remove patch
@@ -40,276 +40,276 @@
 block discarded – undo
40 40
  */
41 41
 class Schema extends AbstractAsset
42 42
 {
43
-    /** @var Table[] */
44
-    protected $_tables = [];
43
+	/** @var Table[] */
44
+	protected $_tables = [];
45 45
 
46
-    /** @var Sequence[] */
47
-    protected $_sequences = [];
46
+	/** @var Sequence[] */
47
+	protected $_sequences = [];
48 48
 
49
-    /** @var SchemaConfig */
50
-    protected $_schemaConfig;
49
+	/** @var SchemaConfig */
50
+	protected $_schemaConfig;
51 51
 
52
-    /**
53
-     * @param Table[]    $tables
54
-     * @param Sequence[] $sequences
55
-     * @param string[]   $namespaces
56
-     *
57
-     * @throws SchemaException
58
-     */
59
-    public function __construct(array $tables = [], array $sequences = [], ?SchemaConfig $schemaConfig = null, array $namespaces = [])
60
-    {
61
-    }
52
+	/**
53
+	 * @param Table[]    $tables
54
+	 * @param Sequence[] $sequences
55
+	 * @param string[]   $namespaces
56
+	 *
57
+	 * @throws SchemaException
58
+	 */
59
+	public function __construct(array $tables = [], array $sequences = [], ?SchemaConfig $schemaConfig = null, array $namespaces = [])
60
+	{
61
+	}
62 62
 
63
-    /**
64
-     * @deprecated
65
-     *
66
-     * @return bool
67
-     */
68
-    public function hasExplicitForeignKeyIndexes()
69
-    {
70
-    }
63
+	/**
64
+	 * @deprecated
65
+	 *
66
+	 * @return bool
67
+	 */
68
+	public function hasExplicitForeignKeyIndexes()
69
+	{
70
+	}
71 71
 
72
-    /**
73
-     * @return void
74
-     *
75
-     * @throws SchemaException
76
-     */
77
-    protected function _addTable(Table $table)
78
-    {
79
-    }
72
+	/**
73
+	 * @return void
74
+	 *
75
+	 * @throws SchemaException
76
+	 */
77
+	protected function _addTable(Table $table)
78
+	{
79
+	}
80 80
 
81
-    /**
82
-     * @return void
83
-     *
84
-     * @throws SchemaException
85
-     */
86
-    protected function _addSequence(Sequence $sequence)
87
-    {
88
-    }
81
+	/**
82
+	 * @return void
83
+	 *
84
+	 * @throws SchemaException
85
+	 */
86
+	protected function _addSequence(Sequence $sequence)
87
+	{
88
+	}
89 89
 
90
-    /**
91
-     * Returns the namespaces of this schema.
92
-     *
93
-     * @return string[] A list of namespace names.
94
-     */
95
-    public function getNamespaces()
96
-    {
97
-    }
90
+	/**
91
+	 * Returns the namespaces of this schema.
92
+	 *
93
+	 * @return string[] A list of namespace names.
94
+	 */
95
+	public function getNamespaces()
96
+	{
97
+	}
98 98
 
99
-    /**
100
-     * Gets all tables of this schema.
101
-     *
102
-     * @return Table[]
103
-     */
104
-    public function getTables()
105
-    {
106
-    }
99
+	/**
100
+	 * Gets all tables of this schema.
101
+	 *
102
+	 * @return Table[]
103
+	 */
104
+	public function getTables()
105
+	{
106
+	}
107 107
 
108
-    /**
109
-     * @param string $name
110
-     *
111
-     * @return Table
112
-     *
113
-     * @throws SchemaException
114
-     */
115
-    public function getTable($name)
116
-    {
117
-    }
108
+	/**
109
+	 * @param string $name
110
+	 *
111
+	 * @return Table
112
+	 *
113
+	 * @throws SchemaException
114
+	 */
115
+	public function getTable($name)
116
+	{
117
+	}
118 118
 
119
-    /**
120
-     * Does this schema have a namespace with the given name?
121
-     *
122
-     * @param string $name
123
-     *
124
-     * @return bool
125
-     */
126
-    public function hasNamespace($name)
127
-    {
128
-    }
119
+	/**
120
+	 * Does this schema have a namespace with the given name?
121
+	 *
122
+	 * @param string $name
123
+	 *
124
+	 * @return bool
125
+	 */
126
+	public function hasNamespace($name)
127
+	{
128
+	}
129 129
 
130
-    /**
131
-     * Does this schema have a table with the given name?
132
-     *
133
-     * @param string $name
134
-     *
135
-     * @return bool
136
-     */
137
-    public function hasTable($name)
138
-    {
139
-    }
130
+	/**
131
+	 * Does this schema have a table with the given name?
132
+	 *
133
+	 * @param string $name
134
+	 *
135
+	 * @return bool
136
+	 */
137
+	public function hasTable($name)
138
+	{
139
+	}
140 140
 
141
-    /**
142
-     * Gets all table names, prefixed with a schema name, even the default one if present.
143
-     *
144
-     * @deprecated Use {@see getTables()} and {@see Table::getName()} instead.
145
-     *
146
-     * @return string[]
147
-     */
148
-    public function getTableNames()
149
-    {
150
-    }
141
+	/**
142
+	 * Gets all table names, prefixed with a schema name, even the default one if present.
143
+	 *
144
+	 * @deprecated Use {@see getTables()} and {@see Table::getName()} instead.
145
+	 *
146
+	 * @return string[]
147
+	 */
148
+	public function getTableNames()
149
+	{
150
+	}
151 151
 
152
-    /**
153
-     * @param string $name
154
-     *
155
-     * @return bool
156
-     */
157
-    public function hasSequence($name)
158
-    {
159
-    }
152
+	/**
153
+	 * @param string $name
154
+	 *
155
+	 * @return bool
156
+	 */
157
+	public function hasSequence($name)
158
+	{
159
+	}
160 160
 
161
-    /**
162
-     * @param string $name
163
-     *
164
-     * @return Sequence
165
-     *
166
-     * @throws SchemaException
167
-     */
168
-    public function getSequence($name)
169
-    {
170
-    }
161
+	/**
162
+	 * @param string $name
163
+	 *
164
+	 * @return Sequence
165
+	 *
166
+	 * @throws SchemaException
167
+	 */
168
+	public function getSequence($name)
169
+	{
170
+	}
171 171
 
172
-    /** @return Sequence[] */
173
-    public function getSequences()
174
-    {
175
-    }
172
+	/** @return Sequence[] */
173
+	public function getSequences()
174
+	{
175
+	}
176 176
 
177
-    /**
178
-     * Creates a new namespace.
179
-     *
180
-     * @param string $name The name of the namespace to create.
181
-     *
182
-     * @return Schema This schema instance.
183
-     *
184
-     * @throws SchemaException
185
-     */
186
-    public function createNamespace($name)
187
-    {
188
-    }
177
+	/**
178
+	 * Creates a new namespace.
179
+	 *
180
+	 * @param string $name The name of the namespace to create.
181
+	 *
182
+	 * @return Schema This schema instance.
183
+	 *
184
+	 * @throws SchemaException
185
+	 */
186
+	public function createNamespace($name)
187
+	{
188
+	}
189 189
 
190
-    /**
191
-     * Creates a new table.
192
-     *
193
-     * @param string $name
194
-     *
195
-     * @return Table
196
-     *
197
-     * @throws SchemaException
198
-     */
199
-    public function createTable($name)
200
-    {
201
-    }
190
+	/**
191
+	 * Creates a new table.
192
+	 *
193
+	 * @param string $name
194
+	 *
195
+	 * @return Table
196
+	 *
197
+	 * @throws SchemaException
198
+	 */
199
+	public function createTable($name)
200
+	{
201
+	}
202 202
 
203
-    /**
204
-     * Renames a table.
205
-     *
206
-     * @param string $oldName
207
-     * @param string $newName
208
-     *
209
-     * @return Schema
210
-     *
211
-     * @throws SchemaException
212
-     */
213
-    public function renameTable($oldName, $newName)
214
-    {
215
-    }
203
+	/**
204
+	 * Renames a table.
205
+	 *
206
+	 * @param string $oldName
207
+	 * @param string $newName
208
+	 *
209
+	 * @return Schema
210
+	 *
211
+	 * @throws SchemaException
212
+	 */
213
+	public function renameTable($oldName, $newName)
214
+	{
215
+	}
216 216
 
217
-    /**
218
-     * Drops a table from the schema.
219
-     *
220
-     * @param string $name
221
-     *
222
-     * @return Schema
223
-     *
224
-     * @throws SchemaException
225
-     */
226
-    public function dropTable($name)
227
-    {
228
-    }
217
+	/**
218
+	 * Drops a table from the schema.
219
+	 *
220
+	 * @param string $name
221
+	 *
222
+	 * @return Schema
223
+	 *
224
+	 * @throws SchemaException
225
+	 */
226
+	public function dropTable($name)
227
+	{
228
+	}
229 229
 
230
-    /**
231
-     * Creates a new sequence.
232
-     *
233
-     * @param string $name
234
-     * @param int    $allocationSize
235
-     * @param int    $initialValue
236
-     *
237
-     * @return Sequence
238
-     *
239
-     * @throws SchemaException
240
-     */
241
-    public function createSequence($name, $allocationSize = 1, $initialValue = 1)
242
-    {
243
-    }
230
+	/**
231
+	 * Creates a new sequence.
232
+	 *
233
+	 * @param string $name
234
+	 * @param int    $allocationSize
235
+	 * @param int    $initialValue
236
+	 *
237
+	 * @return Sequence
238
+	 *
239
+	 * @throws SchemaException
240
+	 */
241
+	public function createSequence($name, $allocationSize = 1, $initialValue = 1)
242
+	{
243
+	}
244 244
 
245
-    /**
246
-     * @param string $name
247
-     *
248
-     * @return Schema
249
-     */
250
-    public function dropSequence($name)
251
-    {
252
-    }
245
+	/**
246
+	 * @param string $name
247
+	 *
248
+	 * @return Schema
249
+	 */
250
+	public function dropSequence($name)
251
+	{
252
+	}
253 253
 
254
-    /**
255
-     * Returns an array of necessary SQL queries to create the schema on the given platform.
256
-     *
257
-     * @return list<string>
258
-     *
259
-     * @throws Exception
260
-     */
261
-    public function toSql(AbstractPlatform $platform)
262
-    {
263
-    }
254
+	/**
255
+	 * Returns an array of necessary SQL queries to create the schema on the given platform.
256
+	 *
257
+	 * @return list<string>
258
+	 *
259
+	 * @throws Exception
260
+	 */
261
+	public function toSql(AbstractPlatform $platform)
262
+	{
263
+	}
264 264
 
265
-    /**
266
-     * Return an array of necessary SQL queries to drop the schema on the given platform.
267
-     *
268
-     * @return list<string>
269
-     *
270
-     * @throws Exception
271
-     */
272
-    public function toDropSql(AbstractPlatform $platform)
273
-    {
274
-    }
265
+	/**
266
+	 * Return an array of necessary SQL queries to drop the schema on the given platform.
267
+	 *
268
+	 * @return list<string>
269
+	 *
270
+	 * @throws Exception
271
+	 */
272
+	public function toDropSql(AbstractPlatform $platform)
273
+	{
274
+	}
275 275
 
276
-    /**
277
-     * @deprecated
278
-     *
279
-     * @return string[]
280
-     *
281
-     * @throws SchemaException
282
-     */
283
-    public function getMigrateToSql(Schema $toSchema, AbstractPlatform $platform)
284
-    {
285
-    }
276
+	/**
277
+	 * @deprecated
278
+	 *
279
+	 * @return string[]
280
+	 *
281
+	 * @throws SchemaException
282
+	 */
283
+	public function getMigrateToSql(Schema $toSchema, AbstractPlatform $platform)
284
+	{
285
+	}
286 286
 
287
-    /**
288
-     * @deprecated
289
-     *
290
-     * @return string[]
291
-     *
292
-     * @throws SchemaException
293
-     */
294
-    public function getMigrateFromSql(Schema $fromSchema, AbstractPlatform $platform)
295
-    {
296
-    }
287
+	/**
288
+	 * @deprecated
289
+	 *
290
+	 * @return string[]
291
+	 *
292
+	 * @throws SchemaException
293
+	 */
294
+	public function getMigrateFromSql(Schema $fromSchema, AbstractPlatform $platform)
295
+	{
296
+	}
297 297
 
298
-    /**
299
-     * @deprecated
300
-     *
301
-     * @return void
302
-     */
303
-    public function visit(Visitor $visitor)
304
-    {
305
-    }
298
+	/**
299
+	 * @deprecated
300
+	 *
301
+	 * @return void
302
+	 */
303
+	public function visit(Visitor $visitor)
304
+	{
305
+	}
306 306
 
307
-    /**
308
-     * Cloning a Schema triggers a deep clone of all related assets.
309
-     *
310
-     * @return void
311
-     */
312
-    public function __clone()
313
-    {
314
-    }
307
+	/**
308
+	 * Cloning a Schema triggers a deep clone of all related assets.
309
+	 *
310
+	 * @return void
311
+	 */
312
+	public function __clone()
313
+	{
314
+	}
315 315
 }
Please login to merge, or discard this patch.