@@ -400,8 +400,8 @@ discard block |
||
400 | 400 | foreach (explode(' ', $circle->getDisplayName()) as $word) { |
401 | 401 | $andX->add( |
402 | 402 | $expr->iLike( |
403 | - $this->getDefaultSelectAlias() . '.' . 'display_name', |
|
404 | - $this->createNamedParameter('%' . $word . '%') |
|
403 | + $this->getDefaultSelectAlias().'.'.'display_name', |
|
404 | + $this->createNamedParameter('%'.$word.'%') |
|
405 | 405 | ) |
406 | 406 | ); |
407 | 407 | } |
@@ -412,8 +412,8 @@ discard block |
||
412 | 412 | foreach (explode(' ', $circle->getDescription()) as $word) { |
413 | 413 | $orDescription->add( |
414 | 414 | $expr->iLike( |
415 | - $this->getDefaultSelectAlias() . '.' . 'description', |
|
416 | - $this->createNamedParameter('%' . $word . '%') |
|
415 | + $this->getDefaultSelectAlias().'.'.'description', |
|
416 | + $this->createNamedParameter('%'.$word.'%') |
|
417 | 417 | ) |
418 | 418 | ); |
419 | 419 | } |
@@ -443,7 +443,7 @@ discard block |
||
443 | 443 | $this->generateRemoteInstanceSelectAlias($aliasRemoteInstance) |
444 | 444 | ->leftJoin( |
445 | 445 | $alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance, |
446 | - $expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance') |
|
446 | + $expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance') |
|
447 | 447 | ); |
448 | 448 | } catch (RequestBuilderException $e) { |
449 | 449 | } |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | $expr = $this->expr(); |
496 | 496 | $this->leftJoin( |
497 | 497 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote, |
498 | - $expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
498 | + $expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
499 | 499 | ); |
500 | 500 | } |
501 | 501 | |
@@ -523,12 +523,12 @@ discard block |
||
523 | 523 | $this->leftJoin( |
524 | 524 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember, |
525 | 525 | $expr->andX( |
526 | - $expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'), |
|
526 | + $expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'), |
|
527 | 527 | $expr->eq( |
528 | - $aliasRemoteMember . '.instance', |
|
528 | + $aliasRemoteMember.'.instance', |
|
529 | 529 | $this->createNamedParameter($remoteInstance->getInstance()) |
530 | 530 | ), |
531 | - $expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
531 | + $expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
532 | 532 | ) |
533 | 533 | ); |
534 | 534 | } |
@@ -560,21 +560,21 @@ discard block |
||
560 | 560 | $this->leftJoin( |
561 | 561 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle, |
562 | 562 | $expr->andX( |
563 | - $expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'), |
|
564 | - $expr->emptyString($aliasRemoteCircle . '.instance'), |
|
565 | - $expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
563 | + $expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'), |
|
564 | + $expr->emptyString($aliasRemoteCircle.'.instance'), |
|
565 | + $expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
566 | 566 | ) |
567 | 567 | ); |
568 | 568 | $this->leftJoin( |
569 | 569 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner, |
570 | 570 | $expr->andX( |
571 | - $expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'), |
|
571 | + $expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'), |
|
572 | 572 | $expr->eq( |
573 | - $aliasRemoteCircleOwner . '.instance', |
|
573 | + $aliasRemoteCircleOwner.'.instance', |
|
574 | 574 | $this->createNamedParameter($remoteInstance->getInstance()) |
575 | 575 | ), |
576 | 576 | $expr->eq( |
577 | - $aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
577 | + $aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
578 | 578 | ) |
579 | 579 | ) |
580 | 580 | ); |
@@ -607,16 +607,16 @@ discard block |
||
607 | 607 | $expr = $this->expr(); |
608 | 608 | $orX = $expr->orX(); |
609 | 609 | $orX->add( |
610 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
610 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
611 | 611 | ); |
612 | 612 | |
613 | 613 | $orExtOrPassive = $expr->orX(); |
614 | 614 | $orExtOrPassive->add( |
615 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
615 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
616 | 616 | ); |
617 | 617 | if (!$sensitive) { |
618 | 618 | $orExtOrPassive->add( |
619 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
619 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
620 | 620 | ); |
621 | 621 | } else { |
622 | 622 | if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) { |
@@ -625,8 +625,8 @@ discard block |
||
625 | 625 | } |
626 | 626 | |
627 | 627 | $orInstance = $expr->orX(); |
628 | - $orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance')); |
|
629 | - $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance')); |
|
628 | + $orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance')); |
|
629 | + $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance')); |
|
630 | 630 | |
631 | 631 | $andExternal = $expr->andX(); |
632 | 632 | $andExternal->add($orExtOrPassive); |
@@ -635,13 +635,13 @@ discard block |
||
635 | 635 | $orExtOrTrusted = $expr->orX(); |
636 | 636 | $orExtOrTrusted->add($andExternal); |
637 | 637 | $orExtOrTrusted->add( |
638 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
638 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
639 | 639 | ); |
640 | 640 | |
641 | 641 | $andTrusted = $expr->andX(); |
642 | 642 | $andTrusted->add($orExtOrTrusted); |
643 | 643 | $andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle)); |
644 | - $andTrusted->add($expr->emptyString($aliasOwner . '.instance')); |
|
644 | + $andTrusted->add($expr->emptyString($aliasOwner.'.instance')); |
|
645 | 645 | $orX->add($andTrusted); |
646 | 646 | |
647 | 647 | $this->andWhere($orX); |
@@ -668,7 +668,7 @@ discard block |
||
668 | 668 | } |
669 | 669 | $this->innerJoin( |
670 | 670 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
671 | - $expr->eq($aliasMember . '.circle_id', $alias . '.unique_id') |
|
671 | + $expr->eq($aliasMember.'.circle_id', $alias.'.unique_id') |
|
672 | 672 | ); |
673 | 673 | |
674 | 674 | $this->filterDirectMembership($aliasMember, $member); |
@@ -689,19 +689,19 @@ discard block |
||
689 | 689 | |
690 | 690 | if ($member->getUserId() !== '') { |
691 | 691 | $andX->add( |
692 | - $expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId())) |
|
692 | + $expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId())) |
|
693 | 693 | ); |
694 | 694 | } |
695 | 695 | |
696 | 696 | if ($member->getSingleId() !== '') { |
697 | 697 | $andX->add( |
698 | - $expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId())) |
|
698 | + $expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId())) |
|
699 | 699 | ); |
700 | 700 | } |
701 | 701 | |
702 | 702 | if ($member->getUserType() > 0) { |
703 | 703 | $andX->add( |
704 | - $expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType())) |
|
704 | + $expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType())) |
|
705 | 705 | ); |
706 | 706 | } |
707 | 707 | |
@@ -710,7 +710,7 @@ discard block |
||
710 | 710 | if ($member->getLevel() > 0) { |
711 | 711 | $andX->add( |
712 | 712 | $expr->gte( |
713 | - $aliasMember . '.level', |
|
713 | + $aliasMember.'.level', |
|
714 | 714 | $this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT) |
715 | 715 | ) |
716 | 716 | ); |
@@ -751,7 +751,7 @@ discard block |
||
751 | 751 | $helperAlias, |
752 | 752 | CoreRequestBuilder::TABLE_CIRCLE, |
753 | 753 | $aliasCircle, |
754 | - $expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field) |
|
754 | + $expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field) |
|
755 | 755 | ); |
756 | 756 | |
757 | 757 | if (!is_null($initiator)) { |
@@ -782,7 +782,7 @@ discard block |
||
782 | 782 | $this->generateCircleSelectAlias($aliasInvitedBy) |
783 | 783 | ->leftJoin( |
784 | 784 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy, |
785 | - $expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id') |
|
785 | + $expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id') |
|
786 | 786 | ); |
787 | 787 | |
788 | 788 | $this->leftJoinOwner($aliasInvitedBy); |
@@ -813,7 +813,7 @@ discard block |
||
813 | 813 | $this->generateCircleSelectAlias($aliasBasedOn) |
814 | 814 | ->leftJoin( |
815 | 815 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn, |
816 | - $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id') |
|
816 | + $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id') |
|
817 | 817 | ); |
818 | 818 | |
819 | 819 | if (!is_null($initiator)) { |
@@ -846,9 +846,9 @@ discard block |
||
846 | 846 | ->leftJoin( |
847 | 847 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
848 | 848 | $expr->andX( |
849 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field), |
|
849 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field), |
|
850 | 850 | $expr->eq( |
851 | - $aliasMember . '.level', |
|
851 | + $aliasMember.'.level', |
|
852 | 852 | $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT) |
853 | 853 | ) |
854 | 854 | ) |
@@ -886,10 +886,10 @@ discard block |
||
886 | 886 | ->leftJoin( |
887 | 887 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
888 | 888 | $expr->andX( |
889 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId), |
|
890 | - $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId), |
|
889 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId), |
|
890 | + $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId), |
|
891 | 891 | $expr->gte( |
892 | - $aliasMember . '.level', |
|
892 | + $aliasMember.'.level', |
|
893 | 893 | $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT) |
894 | 894 | ) |
895 | 895 | ) |
@@ -922,7 +922,7 @@ discard block |
||
922 | 922 | |
923 | 923 | $this->leftJoin( |
924 | 924 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
925 | - $expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field) |
|
925 | + $expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field) |
|
926 | 926 | ); |
927 | 927 | |
928 | 928 | // if (!$this->getBool('getData', $options, false)) { |
@@ -936,8 +936,8 @@ discard block |
||
936 | 936 | ->leftJoin( |
937 | 937 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
938 | 938 | $expr->andX( |
939 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'), |
|
940 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id') |
|
939 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'), |
|
940 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id') |
|
941 | 941 | ) |
942 | 942 | ); |
943 | 943 | |
@@ -954,12 +954,12 @@ discard block |
||
954 | 954 | $aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options); |
955 | 955 | $this->leftJoin( |
956 | 956 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership, |
957 | - $expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId)) |
|
957 | + $expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId)) |
|
958 | 958 | ); |
959 | 959 | |
960 | 960 | $orX = $expr->orX( |
961 | - $expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field), |
|
962 | - $expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId)) |
|
961 | + $expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field), |
|
962 | + $expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId)) |
|
963 | 963 | ); |
964 | 964 | |
965 | 965 | $this->andWhere($orX); |
@@ -980,11 +980,11 @@ discard block |
||
980 | 980 | |
981 | 981 | $expr = $this->expr(); |
982 | 982 | $aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS); |
983 | - $this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId))); |
|
983 | + $this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId))); |
|
984 | 984 | if ($level > 1) { |
985 | 985 | $this->andWhere( |
986 | 986 | $expr->gte( |
987 | - $aliasMembership . '.level', |
|
987 | + $aliasMembership.'.level', |
|
988 | 988 | $this->createNamedParameter($level, IQueryBuilder::PARAM_INT) |
989 | 989 | ) |
990 | 990 | ); |
@@ -1012,8 +1012,8 @@ discard block |
||
1012 | 1012 | $this->leftJoin( |
1013 | 1013 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
1014 | 1014 | $expr->andX( |
1015 | - $expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field), |
|
1016 | - $expr->eq($aliasMembership . '.single_id', $alias . '.single_id') |
|
1015 | + $expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field), |
|
1016 | + $expr->eq($aliasMembership.'.single_id', $alias.'.single_id') |
|
1017 | 1017 | ) |
1018 | 1018 | ); |
1019 | 1019 | |
@@ -1026,8 +1026,8 @@ discard block |
||
1026 | 1026 | ->leftJoin( |
1027 | 1027 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom, |
1028 | 1028 | $expr->andX( |
1029 | - $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'), |
|
1030 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id') |
|
1029 | + $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'), |
|
1030 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id') |
|
1031 | 1031 | ) |
1032 | 1032 | ); |
1033 | 1033 | } |
@@ -1067,7 +1067,7 @@ discard block |
||
1067 | 1067 | |
1068 | 1068 | $this->leftJoin( |
1069 | 1069 | $alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken, |
1070 | - $expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field) |
|
1070 | + $expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field) |
|
1071 | 1071 | ); |
1072 | 1072 | } |
1073 | 1073 | |
@@ -1109,14 +1109,14 @@ discard block |
||
1109 | 1109 | try { |
1110 | 1110 | $aliasConfig = $this->generateAlias($alias, self::CONFIG, $options); |
1111 | 1111 | $this->selectAlias( |
1112 | - $aliasConfig . '.config', |
|
1113 | - (($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'circle_config' |
|
1112 | + $aliasConfig.'.config', |
|
1113 | + (($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'circle_config' |
|
1114 | 1114 | ); |
1115 | 1115 | $this->leftJoin( |
1116 | 1116 | $alias, |
1117 | 1117 | CoreRequestBuilder::TABLE_CIRCLE, |
1118 | 1118 | $aliasConfig, |
1119 | - $expr->eq($alias . '.circle_id', $aliasConfig . '.unique_id') |
|
1119 | + $expr->eq($alias.'.circle_id', $aliasConfig.'.unique_id') |
|
1120 | 1120 | ); |
1121 | 1121 | } catch (RequestBuilderException $e) { |
1122 | 1122 | } |
@@ -1154,7 +1154,7 @@ discard block |
||
1154 | 1154 | $aliasMembership, |
1155 | 1155 | $expr->andX( |
1156 | 1156 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership), |
1157 | - $expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field) |
|
1157 | + $expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field) |
|
1158 | 1158 | ) |
1159 | 1159 | ); |
1160 | 1160 | |
@@ -1173,11 +1173,11 @@ discard block |
||
1173 | 1173 | $aliasMembershipCircle = $this->generateAlias($aliasMembership, self::CONFIG, $options); |
1174 | 1174 | $orXMembershipCircle = $expr->orX(); |
1175 | 1175 | array_map( |
1176 | - function (string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) { |
|
1176 | + function(string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) { |
|
1177 | 1177 | $orXMembershipCircle->add( |
1178 | 1178 | $this->expr()->eq( |
1179 | - $alias . '.circle_id', |
|
1180 | - $aliasMembershipCircle . '.unique_id' |
|
1179 | + $alias.'.circle_id', |
|
1180 | + $aliasMembershipCircle.'.unique_id' |
|
1181 | 1181 | ) |
1182 | 1182 | ); |
1183 | 1183 | }, |
@@ -1209,7 +1209,7 @@ discard block |
||
1209 | 1209 | $aliasDirectInitiator, |
1210 | 1210 | $expr->andX( |
1211 | 1211 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirectInitiator), |
1212 | - $expr->eq($aliasDirectInitiator . '.circle_id', $helperAlias . '.' . $field) |
|
1212 | + $expr->eq($aliasDirectInitiator.'.circle_id', $helperAlias.'.'.$field) |
|
1213 | 1213 | ) |
1214 | 1214 | ); |
1215 | 1215 | } catch (RequestBuilderException $e) { |
@@ -1223,8 +1223,8 @@ discard block |
||
1223 | 1223 | $this->leftJoin( |
1224 | 1224 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator, |
1225 | 1225 | $expr->andX( |
1226 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'), |
|
1227 | - $expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id') |
|
1226 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'), |
|
1227 | + $expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id') |
|
1228 | 1228 | ) |
1229 | 1229 | ); |
1230 | 1230 | |
@@ -1232,8 +1232,8 @@ discard block |
||
1232 | 1232 | $this->leftJoin( |
1233 | 1233 | $aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
1234 | 1234 | $expr->andX( |
1235 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'), |
|
1236 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id') |
|
1235 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'), |
|
1236 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id') |
|
1237 | 1237 | ) |
1238 | 1238 | ); |
1239 | 1239 | |
@@ -1284,7 +1284,7 @@ discard block |
||
1284 | 1284 | $orX->add( |
1285 | 1285 | $expr->andX( |
1286 | 1286 | $this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle), |
1287 | - $expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
1287 | + $expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
1288 | 1288 | ) |
1289 | 1289 | ); |
1290 | 1290 | } |
@@ -1294,10 +1294,10 @@ discard block |
||
1294 | 1294 | $orXLevelCheck = $expr->orX(); |
1295 | 1295 | |
1296 | 1296 | array_map( |
1297 | - function (string $alias) use ($orXLevelCheck, $minimumLevel) { |
|
1297 | + function(string $alias) use ($orXLevelCheck, $minimumLevel) { |
|
1298 | 1298 | $orXLevelCheck->add( |
1299 | 1299 | $this->expr()->gte( |
1300 | - $alias . '.level', |
|
1300 | + $alias.'.level', |
|
1301 | 1301 | $this->createNamedParameter($minimumLevel) |
1302 | 1302 | ) |
1303 | 1303 | ); |
@@ -1387,21 +1387,21 @@ discard block |
||
1387 | 1387 | $expr = $this->expr(); |
1388 | 1388 | $andPassive = $expr->andX(); |
1389 | 1389 | $andPassive->add( |
1390 | - $expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1390 | + $expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1391 | 1391 | ); |
1392 | 1392 | |
1393 | 1393 | $orMemberOrLevel = $expr->orX(); |
1394 | 1394 | $orMemberOrLevel->add( |
1395 | - $expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance') |
|
1395 | + $expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance') |
|
1396 | 1396 | ); |
1397 | 1397 | // TODO: do we need this ? (display members from the local instance) |
1398 | 1398 | $orMemberOrLevel->add( |
1399 | - $expr->emptyString($this->getDefaultSelectAlias() . '.instance') |
|
1399 | + $expr->emptyString($this->getDefaultSelectAlias().'.instance') |
|
1400 | 1400 | ); |
1401 | 1401 | |
1402 | 1402 | $orMemberOrLevel->add( |
1403 | 1403 | $expr->eq( |
1404 | - $this->getDefaultSelectAlias() . '.level', |
|
1404 | + $this->getDefaultSelectAlias().'.level', |
|
1405 | 1405 | $this->createNamedParameter(Member::LEVEL_OWNER) |
1406 | 1406 | ) |
1407 | 1407 | ); |
@@ -1438,11 +1438,11 @@ discard block |
||
1438 | 1438 | ) |
1439 | 1439 | ->leftJoin( |
1440 | 1440 | $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache, |
1441 | - $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid') |
|
1441 | + $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid') |
|
1442 | 1442 | ) |
1443 | 1443 | ->leftJoin( |
1444 | 1444 | $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages, |
1445 | - $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id') |
|
1445 | + $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id') |
|
1446 | 1446 | ); |
1447 | 1447 | } |
1448 | 1448 | |
@@ -1464,8 +1464,8 @@ discard block |
||
1464 | 1464 | $this->leftJoin( |
1465 | 1465 | $aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild, |
1466 | 1466 | $expr->andX( |
1467 | - $expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'), |
|
1468 | - $expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id') |
|
1467 | + $expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'), |
|
1468 | + $expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id') |
|
1469 | 1469 | ) |
1470 | 1470 | ); |
1471 | 1471 | |
@@ -1515,13 +1515,13 @@ discard block |
||
1515 | 1515 | $this->leftJoin( |
1516 | 1516 | $aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint, |
1517 | 1517 | $expr->andX( |
1518 | - $expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'), |
|
1519 | - $expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id') |
|
1518 | + $expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'), |
|
1519 | + $expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id') |
|
1520 | 1520 | ) |
1521 | 1521 | ); |
1522 | 1522 | |
1523 | - $this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint'); |
|
1524 | - $this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash'); |
|
1523 | + $this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint'); |
|
1524 | + $this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash'); |
|
1525 | 1525 | } |
1526 | 1526 | |
1527 | 1527 | |
@@ -1625,10 +1625,10 @@ discard block |
||
1625 | 1625 | */ |
1626 | 1626 | public function generateAlias(string $base, string $extension, ?array &$options = []): string { |
1627 | 1627 | $search = str_replace('_', '.', $base); |
1628 | - $path = $search . '.' . $extension; |
|
1628 | + $path = $search.'.'.$extension; |
|
1629 | 1629 | if (!$this->validKey($path, self::$SQL_PATH) |
1630 | 1630 | && !in_array($extension, $this->getArray($search, self::$SQL_PATH))) { |
1631 | - throw new RequestBuilderException($extension . ' not found in ' . $search); |
|
1631 | + throw new RequestBuilderException($extension.' not found in '.$search); |
|
1632 | 1632 | } |
1633 | 1633 | |
1634 | 1634 | if (!is_array($options)) { |
@@ -1637,15 +1637,15 @@ discard block |
||
1637 | 1637 | |
1638 | 1638 | $optionPath = ''; |
1639 | 1639 | foreach (explode('.', $path) as $p) { |
1640 | - $optionPath = trim($optionPath . '.' . $p, '.'); |
|
1640 | + $optionPath = trim($optionPath.'.'.$p, '.'); |
|
1641 | 1641 | $options = array_merge( |
1642 | 1642 | $options, |
1643 | - $this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH), |
|
1644 | - $this->getArray($optionPath . '.' . self::OPTIONS, $this->options) |
|
1643 | + $this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH), |
|
1644 | + $this->getArray($optionPath.'.'.self::OPTIONS, $this->options) |
|
1645 | 1645 | ); |
1646 | 1646 | } |
1647 | 1647 | |
1648 | - return $base . '_' . $extension; |
|
1648 | + return $base.'_'.$extension; |
|
1649 | 1649 | } |
1650 | 1650 | |
1651 | 1651 | |
@@ -1665,7 +1665,7 @@ discard block |
||
1665 | 1665 | } else { |
1666 | 1666 | $k = $arr; |
1667 | 1667 | } |
1668 | - $path[$k] = $prefix . '_' . $k . '_'; |
|
1668 | + $path[$k] = $prefix.'_'.$k.'_'; |
|
1669 | 1669 | } |
1670 | 1670 | |
1671 | 1671 | return $path; |