Completed
Push — master ( cd91c1...62d6de )
by Maxence
02:26
created
lib/Model/Membership.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -306,18 +306,18 @@
 block discarded – undo
306 306
 	 * @throws MembershipNotFoundException
307 307
 	 */
308 308
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
309
-		if ($this->get($prefix . 'single_id', $data) === '') {
309
+		if ($this->get($prefix.'single_id', $data) === '') {
310 310
 			throw new MembershipNotFoundException();
311 311
 		}
312 312
 
313
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
314
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
315
-		$this->setLevel($this->getInt($prefix . 'level', $data));
316
-		$this->setConfig($this->getInt($prefix . 'config', $data));
317
-		$this->setInheritanceFirst($this->get($prefix . 'inheritance_first', $data));
318
-		$this->setInheritanceLast($this->get($prefix . 'inheritance_last', $data));
319
-		$this->setInheritancePath($this->getArray($prefix . 'inheritance_path', $data));
320
-		$this->setInheritanceDepth($this->getInt($prefix . 'inheritance_depth', $data));
313
+		$this->setSingleId($this->get($prefix.'single_id', $data));
314
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
315
+		$this->setLevel($this->getInt($prefix.'level', $data));
316
+		$this->setConfig($this->getInt($prefix.'config', $data));
317
+		$this->setInheritanceFirst($this->get($prefix.'inheritance_first', $data));
318
+		$this->setInheritanceLast($this->get($prefix.'inheritance_last', $data));
319
+		$this->setInheritancePath($this->getArray($prefix.'inheritance_path', $data));
320
+		$this->setInheritanceDepth($this->getInt($prefix.'inheritance_depth', $data));
321 321
 
322 322
 		return $this;
323 323
 	}
Please login to merge, or discard this patch.
lib/Model/ShareWrapper.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -622,9 +622,9 @@  discard block
 block discarded – undo
622 622
 
623 623
 		$display = $circle->getDisplayName();
624 624
 		if ($circle->getSource() === 0) {
625
-			$display .= ' (Circle owned by ' . $circle->getOwner()->getDisplayName() . ')';
625
+			$display .= ' (Circle owned by '.$circle->getOwner()->getDisplayName().')';
626 626
 		} else {
627
-			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
627
+			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')';
628 628
 		}
629 629
 
630 630
 		$share->setSharedWithDisplayName($display);
@@ -713,20 +713,20 @@  discard block
 block discarded – undo
713 713
 	 */
714 714
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
715 715
 		$shareTime = new DateTime();
716
-		$shareTime->setTimestamp($this->getInt($prefix . 'stime', $data));
717
-
718
-		$this->setId($this->get($prefix . 'id', $data))
719
-			 ->setShareType($this->getInt($prefix . 'share_type', $data))
720
-			 ->setPermissions($this->getInt($prefix . 'permissions', $data))
721
-			 ->setItemType($this->get($prefix . 'item_type', $data))
722
-			 ->setItemSource($this->getInt($prefix . 'item_source', $data))
723
-			 ->setItemTarget($this->get($prefix . 'item_target', $data))
724
-			 ->setFileSource($this->getInt($prefix . 'file_source', $data))
725
-			 ->setFileTarget($this->get($prefix . 'file_target', $data))
726
-			 ->setSharedWith($this->get($prefix . 'share_with', $data))
727
-			 ->setSharedBy($this->get($prefix . 'uid_initiator', $data))
728
-			 ->setShareOwner($this->get($prefix . 'uid_owner', $data))
729
-			 ->setToken($this->get($prefix . 'token', $data))
716
+		$shareTime->setTimestamp($this->getInt($prefix.'stime', $data));
717
+
718
+		$this->setId($this->get($prefix.'id', $data))
719
+			 ->setShareType($this->getInt($prefix.'share_type', $data))
720
+			 ->setPermissions($this->getInt($prefix.'permissions', $data))
721
+			 ->setItemType($this->get($prefix.'item_type', $data))
722
+			 ->setItemSource($this->getInt($prefix.'item_source', $data))
723
+			 ->setItemTarget($this->get($prefix.'item_target', $data))
724
+			 ->setFileSource($this->getInt($prefix.'file_source', $data))
725
+			 ->setFileTarget($this->get($prefix.'file_target', $data))
726
+			 ->setSharedWith($this->get($prefix.'share_with', $data))
727
+			 ->setSharedBy($this->get($prefix.'uid_initiator', $data))
728
+			 ->setShareOwner($this->get($prefix.'uid_owner', $data))
729
+			 ->setToken($this->get($prefix.'token', $data))
730 730
 			 ->setShareTime($shareTime);
731 731
 
732 732
 //		if (($password = $this->get('personal_password', $data, '')) !== '') {
@@ -735,8 +735,8 @@  discard block
 block discarded – undo
735 735
 //			$share->setPassword($this->get('password', $data, ''));
736 736
 //		}
737 737
 
738
-		$this->setChildId($this->getInt($prefix . 'child_id', $data))
739
-			 ->setChildFileTarget($this->get($prefix . 'child_file_target', $data))
738
+		$this->setChildId($this->getInt($prefix.'child_id', $data))
739
+			 ->setChildFileTarget($this->get($prefix.'child_file_target', $data))
740 740
 			 ->setProviderId(ShareByCircleProvider::IDENTIFIER)
741 741
 			 ->setStatus(Ishare::STATUS_ACCEPTED);
742 742
 
Please login to merge, or discard this patch.
lib/Db/CoreQueryBuilder.php 1 patch
Spacing   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 		}
378 378
 
379 379
 		if ($circle->getDisplayName() !== '') {
380
-			$this->searchInDBField('display_name', '%' . $circle->getDisplayName() . '%');
380
+			$this->searchInDBField('display_name', '%'.$circle->getDisplayName().'%');
381 381
 		}
382 382
 		if ($circle->getConfig() > 0) {
383 383
 			$this->limitBitwise('config', $circle->getConfig());
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 			$this->generateRemoteInstanceSelectAlias($aliasRemoteInstance)
397 397
 				 ->leftJoin(
398 398
 					 $alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance,
399
-					 $expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance')
399
+					 $expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance')
400 400
 				 );
401 401
 		} catch (RequestBuilderException $e) {
402 402
 		}
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 		$expr = $this->expr();
450 450
 		$this->leftJoin(
451 451
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote,
452
-			$expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance()))
452
+			$expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance()))
453 453
 		);
454 454
 	}
455 455
 
@@ -477,12 +477,12 @@  discard block
 block discarded – undo
477 477
 		$this->leftJoin(
478 478
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember,
479 479
 			$expr->andX(
480
-				$expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'),
480
+				$expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'),
481 481
 				$expr->eq(
482
-					$aliasRemoteMember . '.instance',
482
+					$aliasRemoteMember.'.instance',
483 483
 					$this->createNamedParameter($remoteInstance->getInstance())
484 484
 				),
485
-				$expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
485
+				$expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
486 486
 			)
487 487
 		);
488 488
 	}
@@ -514,21 +514,21 @@  discard block
 block discarded – undo
514 514
 		$this->leftJoin(
515 515
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle,
516 516
 			$expr->andX(
517
-				$expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'),
518
-				$expr->emptyString($aliasRemoteCircle . '.instance'),
519
-				$expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
517
+				$expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'),
518
+				$expr->emptyString($aliasRemoteCircle.'.instance'),
519
+				$expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
520 520
 			)
521 521
 		);
522 522
 		$this->leftJoin(
523 523
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner,
524 524
 			$expr->andX(
525
-				$expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'),
525
+				$expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'),
526 526
 				$expr->eq(
527
-					$aliasRemoteCircleOwner . '.instance',
527
+					$aliasRemoteCircleOwner.'.instance',
528 528
 					$this->createNamedParameter($remoteInstance->getInstance())
529 529
 				),
530 530
 				$expr->eq(
531
-					$aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)
531
+					$aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)
532 532
 				)
533 533
 			)
534 534
 		);
@@ -561,16 +561,16 @@  discard block
 block discarded – undo
561 561
 		$expr = $this->expr();
562 562
 		$orX = $expr->orX();
563 563
 		$orX->add(
564
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))
564
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))
565 565
 		);
566 566
 
567 567
 		$orExtOrPassive = $expr->orX();
568 568
 		$orExtOrPassive->add(
569
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
569
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
570 570
 		);
571 571
 		if (!$sensitive) {
572 572
 			$orExtOrPassive->add(
573
-				$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
573
+				$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
574 574
 			);
575 575
 		} else {
576 576
 			if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) {
@@ -579,8 +579,8 @@  discard block
 block discarded – undo
579 579
 		}
580 580
 
581 581
 		$orInstance = $expr->orX();
582
-		$orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance'));
583
-		$orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance'));
582
+		$orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance'));
583
+		$orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance'));
584 584
 
585 585
 		$andExternal = $expr->andX();
586 586
 		$andExternal->add($orExtOrPassive);
@@ -589,13 +589,13 @@  discard block
 block discarded – undo
589 589
 		$orExtOrTrusted = $expr->orX();
590 590
 		$orExtOrTrusted->add($andExternal);
591 591
 		$orExtOrTrusted->add(
592
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
592
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
593 593
 		);
594 594
 
595 595
 		$andTrusted = $expr->andX();
596 596
 		$andTrusted->add($orExtOrTrusted);
597 597
 		$andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle));
598
-		$andTrusted->add($expr->emptyString($aliasOwner . '.instance'));
598
+		$andTrusted->add($expr->emptyString($aliasOwner.'.instance'));
599 599
 		$orX->add($andTrusted);
600 600
 
601 601
 		$this->andWhere($orX);
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
 		}
623 623
 		$this->leftJoin(
624 624
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
625
-			$expr->eq($aliasMember . '.circle_id', $alias . '.unique_id')
625
+			$expr->eq($aliasMember.'.circle_id', $alias.'.unique_id')
626 626
 		);
627 627
 
628 628
 		$this->filterDirectMembership($aliasMember, $member);
@@ -643,30 +643,30 @@  discard block
 block discarded – undo
643 643
 
644 644
 		if ($member->getUserId() !== '') {
645 645
 			$andX->add(
646
-				$expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId()))
646
+				$expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId()))
647 647
 			);
648 648
 		}
649 649
 
650 650
 		if ($member->getSingleId() !== '') {
651 651
 			$andX->add(
652
-				$expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId()))
652
+				$expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId()))
653 653
 			);
654 654
 		}
655 655
 
656 656
 		if ($member->getUserType() > 0) {
657 657
 			$andX->add(
658
-				$expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType()))
658
+				$expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType()))
659 659
 			);
660 660
 		}
661 661
 
662 662
 		$andX->add(
663
-			$expr->eq($aliasMember . '.instance', $this->createNamedParameter($this->getInstance($member)))
663
+			$expr->eq($aliasMember.'.instance', $this->createNamedParameter($this->getInstance($member)))
664 664
 		);
665 665
 
666 666
 		if ($member->getLevel() > 0) {
667 667
 			$andX->add(
668 668
 				$expr->gte(
669
-					$aliasMember . '.level',
669
+					$aliasMember.'.level',
670 670
 					$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
671 671
 				)
672 672
 			);
@@ -697,12 +697,12 @@  discard block
 block discarded – undo
697 697
 
698 698
 		$expr = $this->expr();
699 699
 		$this->selectAlias(
700
-			$this->createFunction('COUNT(`' . $aliasMemberCount . '`.`member_id`)'),
701
-			(($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'population'
700
+			$this->createFunction('COUNT(`'.$aliasMemberCount.'`.`member_id`)'),
701
+			(($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'population'
702 702
 		);
703 703
 		$this->leftJoin(
704 704
 			$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMemberCount,
705
-			$expr->eq($alias . '.unique_id', $aliasMemberCount . '.circle_id')
705
+			$expr->eq($alias.'.unique_id', $aliasMemberCount.'.circle_id')
706 706
 		);
707 707
 	}
708 708
 
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 			$helperAlias,
739 739
 			CoreRequestBuilder::TABLE_CIRCLE,
740 740
 			$aliasCircle,
741
-			$expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field)
741
+			$expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field)
742 742
 		);
743 743
 
744 744
 		if (!is_null($initiator)) {
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
 		$this->generateCircleSelectAlias($aliasInvitedBy)
770 770
 			 ->leftJoin(
771 771
 				 $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy,
772
-				 $expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id')
772
+				 $expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id')
773 773
 			 );
774 774
 
775 775
 		$this->leftJoinOwner($aliasInvitedBy);
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
800 800
 		$this->generateCircleSelectAlias($aliasBasedOn)
801 801
 			 ->leftJoin(
802 802
 				 $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn,
803
-				 $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id')
803
+				 $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id')
804 804
 			 );
805 805
 
806 806
 		if (!is_null($initiator)) {
@@ -833,9 +833,9 @@  discard block
 block discarded – undo
833 833
 			 ->leftJoin(
834 834
 				 $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
835 835
 				 $expr->andX(
836
-					 $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field),
836
+					 $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field),
837 837
 					 $expr->eq(
838
-						 $aliasMember . '.level',
838
+						 $aliasMember.'.level',
839 839
 						 $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT)
840 840
 					 )
841 841
 				 )
@@ -873,10 +873,10 @@  discard block
 block discarded – undo
873 873
 			 ->leftJoin(
874 874
 				 $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
875 875
 				 $expr->andX(
876
-					 $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId),
877
-					 $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId),
876
+					 $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId),
877
+					 $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId),
878 878
 					 $expr->gte(
879
-						 $aliasMember . '.level',
879
+						 $aliasMember.'.level',
880 880
 						 $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT)
881 881
 					 )
882 882
 				 )
@@ -909,7 +909,7 @@  discard block
 block discarded – undo
909 909
 
910 910
 		$this->leftJoin(
911 911
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
912
-			$expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field)
912
+			$expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field)
913 913
 		);
914 914
 
915 915
 //		if (!$this->getBool('getData', $options, false)) {
@@ -923,8 +923,8 @@  discard block
 block discarded – undo
923 923
 			 ->leftJoin(
924 924
 				 $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
925 925
 				 $expr->andX(
926
-					 $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'),
927
-					 $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id')
926
+					 $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'),
927
+					 $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id')
928 928
 				 )
929 929
 			 );
930 930
 
@@ -941,12 +941,12 @@  discard block
 block discarded – undo
941 941
 		$aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options);
942 942
 		$this->leftJoin(
943 943
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership,
944
-			$expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId))
944
+			$expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId))
945 945
 		);
946 946
 
947 947
 		$orX = $expr->orX(
948
-			$expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field),
949
-			$expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId))
948
+			$expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field),
949
+			$expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId))
950 950
 		);
951 951
 
952 952
 		$this->andWhere($orX);
@@ -967,11 +967,11 @@  discard block
 block discarded – undo
967 967
 
968 968
 		$expr = $this->expr();
969 969
 		$aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS);
970
-		$this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId)));
970
+		$this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId)));
971 971
 		if ($level > 1) {
972 972
 			$this->andWhere(
973 973
 				$expr->gte(
974
-					$aliasMembership . '.level',
974
+					$aliasMembership.'.level',
975 975
 					$this->createNamedParameter($level, IQueryBuilder::PARAM_INT)
976 976
 				)
977 977
 			);
@@ -999,8 +999,8 @@  discard block
 block discarded – undo
999 999
 		$this->leftJoin(
1000 1000
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
1001 1001
 			$expr->andX(
1002
-				$expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field),
1003
-				$expr->eq($aliasMembership . '.single_id', $alias . '.single_id')
1002
+				$expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field),
1003
+				$expr->eq($aliasMembership.'.single_id', $alias.'.single_id')
1004 1004
 			)
1005 1005
 		);
1006 1006
 
@@ -1013,8 +1013,8 @@  discard block
 block discarded – undo
1013 1013
 			 ->leftJoin(
1014 1014
 				 $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom,
1015 1015
 				 $expr->andX(
1016
-					 $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'),
1017
-					 $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id')
1016
+					 $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'),
1017
+					 $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id')
1018 1018
 				 )
1019 1019
 			 );
1020 1020
 	}
@@ -1080,7 +1080,7 @@  discard block
 block discarded – undo
1080 1080
 			$aliasMembership,
1081 1081
 			$expr->andX(
1082 1082
 				$this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership),
1083
-				$expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field)
1083
+				$expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field)
1084 1084
 			)
1085 1085
 		);
1086 1086
 
@@ -1093,8 +1093,8 @@  discard block
 block discarded – undo
1093 1093
 			$this->leftJoin(
1094 1094
 				$aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
1095 1095
 				$expr->andX(
1096
-					$expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'),
1097
-					$expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id')
1096
+					$expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'),
1097
+					$expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id')
1098 1098
 				)
1099 1099
 			);
1100 1100
 
@@ -1102,8 +1102,8 @@  discard block
 block discarded – undo
1102 1102
 			$this->leftJoin(
1103 1103
 				$aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
1104 1104
 				$expr->andX(
1105
-					$expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'),
1106
-					$expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id')
1105
+					$expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'),
1106
+					$expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id')
1107 1107
 				)
1108 1108
 			);
1109 1109
 
@@ -1149,14 +1149,14 @@  discard block
 block discarded – undo
1149 1149
 			$orX->add(
1150 1150
 				$expr->andX(
1151 1151
 					$this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $aliasMembership),
1152
-					$expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
1152
+					$expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
1153 1153
 				)
1154 1154
 			);
1155 1155
 		}
1156 1156
 
1157 1157
 		$andXMember = $expr->andX();
1158 1158
 		$andXMember->add(
1159
-			$expr->gte($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
1159
+			$expr->gte($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
1160 1160
 		);
1161 1161
 		if ($filterPersonalCircleAsMember) {
1162 1162
 			$andXMember->add($this->exprFilterBitwise('config', Circle::CFG_PERSONAL, $aliasMembership));
@@ -1168,7 +1168,7 @@  discard block
 block discarded – undo
1168 1168
 		}
1169 1169
 		if ($this->getBool('canBeVisitor', $options, false)) {
1170 1170
 			// TODO: should find a better way, also filter on remote initiator on non-federated ?
1171
-			$orX->add($expr->gte($alias . '.config', $this->createNamedParameter(0)));
1171
+			$orX->add($expr->gte($alias.'.config', $this->createNamedParameter(0)));
1172 1172
 		}
1173 1173
 		if ($this->getBool('canBeVisitorOnOpen', $options, false)) {
1174 1174
 			$andOpen = $expr->andX();
@@ -1236,21 +1236,21 @@  discard block
 block discarded – undo
1236 1236
 		$expr = $this->expr();
1237 1237
 		$andPassive = $expr->andX();
1238 1238
 		$andPassive->add(
1239
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
1239
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
1240 1240
 		);
1241 1241
 
1242 1242
 		$orMemberOrLevel = $expr->orX();
1243 1243
 		$orMemberOrLevel->add(
1244
-			$expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance')
1244
+			$expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance')
1245 1245
 		);
1246 1246
 		// TODO: do we need this ? (display members from the local instance)
1247 1247
 		$orMemberOrLevel->add(
1248
-			$expr->emptyString($this->getDefaultSelectAlias() . '.instance')
1248
+			$expr->emptyString($this->getDefaultSelectAlias().'.instance')
1249 1249
 		);
1250 1250
 
1251 1251
 		$orMemberOrLevel->add(
1252 1252
 			$expr->eq(
1253
-				$this->getDefaultSelectAlias() . '.level',
1253
+				$this->getDefaultSelectAlias().'.level',
1254 1254
 				$this->createNamedParameter(Member::LEVEL_OWNER)
1255 1255
 			)
1256 1256
 		);
@@ -1287,11 +1287,11 @@  discard block
 block discarded – undo
1287 1287
 			 )
1288 1288
 			 ->leftJoin(
1289 1289
 				 $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache,
1290
-				 $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid')
1290
+				 $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid')
1291 1291
 			 )
1292 1292
 			 ->leftJoin(
1293 1293
 				 $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages,
1294
-				 $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id')
1294
+				 $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id')
1295 1295
 			 );
1296 1296
 	}
1297 1297
 
@@ -1313,8 +1313,8 @@  discard block
 block discarded – undo
1313 1313
 		$this->leftJoin(
1314 1314
 			$aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild,
1315 1315
 			$expr->andX(
1316
-				$expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'),
1317
-				$expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id')
1316
+				$expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'),
1317
+				$expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id')
1318 1318
 			)
1319 1319
 		);
1320 1320
 
@@ -1364,13 +1364,13 @@  discard block
 block discarded – undo
1364 1364
 		$this->leftJoin(
1365 1365
 			$aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint,
1366 1366
 			$expr->andX(
1367
-				$expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'),
1368
-				$expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id')
1367
+				$expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'),
1368
+				$expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id')
1369 1369
 			)
1370 1370
 		);
1371 1371
 
1372
-		$this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint');
1373
-		$this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash');
1372
+		$this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint');
1373
+		$this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash');
1374 1374
 	}
1375 1375
 
1376 1376
 
@@ -1474,10 +1474,10 @@  discard block
 block discarded – undo
1474 1474
 	 */
1475 1475
 	public function generateAlias(string $base, string $extension, ?array &$options = []): string {
1476 1476
 		$search = str_replace('_', '.', $base);
1477
-		$path = $search . '.' . $extension;
1477
+		$path = $search.'.'.$extension;
1478 1478
 		if (!$this->validKey($path, self::$SQL_PATH)
1479 1479
 			&& !in_array($extension, $this->getArray($search, self::$SQL_PATH))) {
1480
-			throw new RequestBuilderException($extension . ' not found in ' . $search);
1480
+			throw new RequestBuilderException($extension.' not found in '.$search);
1481 1481
 		}
1482 1482
 
1483 1483
 		if (!is_array($options)) {
@@ -1486,15 +1486,15 @@  discard block
 block discarded – undo
1486 1486
 
1487 1487
 		$optionPath = '';
1488 1488
 		foreach (explode('.', $path) as $p) {
1489
-			$optionPath = trim($optionPath . '.' . $p, '.');
1489
+			$optionPath = trim($optionPath.'.'.$p, '.');
1490 1490
 			$options = array_merge(
1491 1491
 				$options,
1492
-				$this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH),
1493
-				$this->getArray($optionPath . '.' . self::OPTIONS, $this->options)
1492
+				$this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH),
1493
+				$this->getArray($optionPath.'.'.self::OPTIONS, $this->options)
1494 1494
 			);
1495 1495
 		}
1496 1496
 
1497
-		return $base . '_' . $extension;
1497
+		return $base.'_'.$extension;
1498 1498
 	}
1499 1499
 
1500 1500
 
@@ -1514,7 +1514,7 @@  discard block
 block discarded – undo
1514 1514
 			} else {
1515 1515
 				$k = $arr;
1516 1516
 			}
1517
-			$path[$k] = $prefix . '_' . $k . '_';
1517
+			$path[$k] = $prefix.'_'.$k.'_';
1518 1518
 		}
1519 1519
 
1520 1520
 		return $path;
Please login to merge, or discard this patch.