@@ -377,7 +377,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | |
@@ -1146,7 +1146,7 @@ discard block |
||
1146 | 1146 | $orX = $expr->orX(); |
1147 | 1147 | $orX->add( |
1148 | 1148 | $expr->andX( |
1149 | - $expr->gte($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)), |
|
1149 | + $expr->gte($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)), |
|
1150 | 1150 | $this->exprFilterBitwise('config', Circle::CFG_PERSONAL, $alias) |
1151 | 1151 | ) |
1152 | 1152 | ); |
@@ -1155,7 +1155,7 @@ discard block |
||
1155 | 1155 | $orX->add( |
1156 | 1156 | $expr->andX( |
1157 | 1157 | $this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $alias), |
1158 | - $expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
1158 | + $expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
1159 | 1159 | ) |
1160 | 1160 | ); |
1161 | 1161 | } |
@@ -1164,7 +1164,7 @@ discard block |
||
1164 | 1164 | } |
1165 | 1165 | if ($this->getBool('canBeVisitor', $options, false)) { |
1166 | 1166 | // TODO: should find a better way, also filter on remote initiator on non-federated ? |
1167 | - $orX->add($expr->gte($alias . '.config', $this->createNamedParameter(0))); |
|
1167 | + $orX->add($expr->gte($alias.'.config', $this->createNamedParameter(0))); |
|
1168 | 1168 | } |
1169 | 1169 | if ($this->getBool('canBeVisitorOnOpen', $options, false)) { |
1170 | 1170 | $andOpen = $expr->andX(); |
@@ -1232,21 +1232,21 @@ discard block |
||
1232 | 1232 | $expr = $this->expr(); |
1233 | 1233 | $andPassive = $expr->andX(); |
1234 | 1234 | $andPassive->add( |
1235 | - $expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1235 | + $expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1236 | 1236 | ); |
1237 | 1237 | |
1238 | 1238 | $orMemberOrLevel = $expr->orX(); |
1239 | 1239 | $orMemberOrLevel->add( |
1240 | - $expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance') |
|
1240 | + $expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance') |
|
1241 | 1241 | ); |
1242 | 1242 | // TODO: do we need this ? (display members from the local instance) |
1243 | 1243 | $orMemberOrLevel->add( |
1244 | - $expr->emptyString($this->getDefaultSelectAlias() . '.instance') |
|
1244 | + $expr->emptyString($this->getDefaultSelectAlias().'.instance') |
|
1245 | 1245 | ); |
1246 | 1246 | |
1247 | 1247 | $orMemberOrLevel->add( |
1248 | 1248 | $expr->eq( |
1249 | - $this->getDefaultSelectAlias() . '.level', |
|
1249 | + $this->getDefaultSelectAlias().'.level', |
|
1250 | 1250 | $this->createNamedParameter(Member::LEVEL_OWNER) |
1251 | 1251 | ) |
1252 | 1252 | ); |
@@ -1283,11 +1283,11 @@ discard block |
||
1283 | 1283 | ) |
1284 | 1284 | ->leftJoin( |
1285 | 1285 | $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache, |
1286 | - $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid') |
|
1286 | + $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid') |
|
1287 | 1287 | ) |
1288 | 1288 | ->leftJoin( |
1289 | 1289 | $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages, |
1290 | - $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id') |
|
1290 | + $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id') |
|
1291 | 1291 | ); |
1292 | 1292 | } |
1293 | 1293 | |
@@ -1309,8 +1309,8 @@ discard block |
||
1309 | 1309 | $this->leftJoin( |
1310 | 1310 | $aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild, |
1311 | 1311 | $expr->andX( |
1312 | - $expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'), |
|
1313 | - $expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id') |
|
1312 | + $expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'), |
|
1313 | + $expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id') |
|
1314 | 1314 | ) |
1315 | 1315 | ); |
1316 | 1316 | |
@@ -1360,13 +1360,13 @@ discard block |
||
1360 | 1360 | $this->leftJoin( |
1361 | 1361 | $aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint, |
1362 | 1362 | $expr->andX( |
1363 | - $expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'), |
|
1364 | - $expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id') |
|
1363 | + $expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'), |
|
1364 | + $expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id') |
|
1365 | 1365 | ) |
1366 | 1366 | ); |
1367 | 1367 | |
1368 | - $this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint'); |
|
1369 | - $this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash'); |
|
1368 | + $this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint'); |
|
1369 | + $this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash'); |
|
1370 | 1370 | } |
1371 | 1371 | |
1372 | 1372 | |
@@ -1470,10 +1470,10 @@ discard block |
||
1470 | 1470 | */ |
1471 | 1471 | public function generateAlias(string $base, string $extension, ?array &$options = []): string { |
1472 | 1472 | $search = str_replace('_', '.', $base); |
1473 | - $path = $search . '.' . $extension; |
|
1473 | + $path = $search.'.'.$extension; |
|
1474 | 1474 | if (!$this->validKey($path, self::$SQL_PATH) |
1475 | 1475 | && !in_array($extension, $this->getArray($search, self::$SQL_PATH))) { |
1476 | - throw new RequestBuilderException($extension . ' not found in ' . $search); |
|
1476 | + throw new RequestBuilderException($extension.' not found in '.$search); |
|
1477 | 1477 | } |
1478 | 1478 | |
1479 | 1479 | if (!is_array($options)) { |
@@ -1482,15 +1482,15 @@ discard block |
||
1482 | 1482 | |
1483 | 1483 | $optionPath = ''; |
1484 | 1484 | foreach (explode('.', $path) as $p) { |
1485 | - $optionPath = trim($optionPath . '.' . $p, '.'); |
|
1485 | + $optionPath = trim($optionPath.'.'.$p, '.'); |
|
1486 | 1486 | $options = array_merge( |
1487 | 1487 | $options, |
1488 | - $this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH), |
|
1489 | - $this->getArray($optionPath . '.' . self::OPTIONS, $this->options) |
|
1488 | + $this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH), |
|
1489 | + $this->getArray($optionPath.'.'.self::OPTIONS, $this->options) |
|
1490 | 1490 | ); |
1491 | 1491 | } |
1492 | 1492 | |
1493 | - return $base . '_' . $extension; |
|
1493 | + return $base.'_'.$extension; |
|
1494 | 1494 | } |
1495 | 1495 | |
1496 | 1496 | |
@@ -1510,7 +1510,7 @@ discard block |
||
1510 | 1510 | } else { |
1511 | 1511 | $k = $arr; |
1512 | 1512 | } |
1513 | - $path[$k] = $prefix . '_' . $k . '_'; |
|
1513 | + $path[$k] = $prefix.'_'.$k.'_'; |
|
1514 | 1514 | } |
1515 | 1515 | |
1516 | 1516 | return $path; |