@@ -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,30 +689,30 @@ 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 | |
708 | 708 | $andX->add( |
709 | - $expr->eq($aliasMember . '.instance', $this->createNamedParameter($this->getInstance($member))) |
|
709 | + $expr->eq($aliasMember.'.instance', $this->createNamedParameter($this->getInstance($member))) |
|
710 | 710 | ); |
711 | 711 | |
712 | 712 | if ($member->getLevel() > 0) { |
713 | 713 | $andX->add( |
714 | 714 | $expr->gte( |
715 | - $aliasMember . '.level', |
|
715 | + $aliasMember.'.level', |
|
716 | 716 | $this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT) |
717 | 717 | ) |
718 | 718 | ); |
@@ -738,12 +738,12 @@ discard block |
||
738 | 738 | |
739 | 739 | $expr = $this->expr(); |
740 | 740 | $this->selectAlias( |
741 | - $this->createFunction('COUNT(`' . $aliasMemberCount . '`.`member_id`)'), |
|
742 | - (($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'population' |
|
741 | + $this->createFunction('COUNT(`'.$aliasMemberCount.'`.`member_id`)'), |
|
742 | + (($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'population' |
|
743 | 743 | ); |
744 | 744 | $this->leftJoin( |
745 | 745 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMemberCount, |
746 | - $expr->eq($alias . '.unique_id', $aliasMemberCount . '.circle_id') |
|
746 | + $expr->eq($alias.'.unique_id', $aliasMemberCount.'.circle_id') |
|
747 | 747 | ); |
748 | 748 | } |
749 | 749 | |
@@ -779,7 +779,7 @@ discard block |
||
779 | 779 | $helperAlias, |
780 | 780 | CoreRequestBuilder::TABLE_CIRCLE, |
781 | 781 | $aliasCircle, |
782 | - $expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field) |
|
782 | + $expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field) |
|
783 | 783 | ); |
784 | 784 | |
785 | 785 | if (!is_null($initiator)) { |
@@ -810,7 +810,7 @@ discard block |
||
810 | 810 | $this->generateCircleSelectAlias($aliasInvitedBy) |
811 | 811 | ->leftJoin( |
812 | 812 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy, |
813 | - $expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id') |
|
813 | + $expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id') |
|
814 | 814 | ); |
815 | 815 | |
816 | 816 | $this->leftJoinOwner($aliasInvitedBy); |
@@ -841,7 +841,7 @@ discard block |
||
841 | 841 | $this->generateCircleSelectAlias($aliasBasedOn) |
842 | 842 | ->leftJoin( |
843 | 843 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn, |
844 | - $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id') |
|
844 | + $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id') |
|
845 | 845 | ); |
846 | 846 | |
847 | 847 | if (!is_null($initiator)) { |
@@ -874,9 +874,9 @@ discard block |
||
874 | 874 | ->leftJoin( |
875 | 875 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
876 | 876 | $expr->andX( |
877 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field), |
|
877 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field), |
|
878 | 878 | $expr->eq( |
879 | - $aliasMember . '.level', |
|
879 | + $aliasMember.'.level', |
|
880 | 880 | $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT) |
881 | 881 | ) |
882 | 882 | ) |
@@ -914,10 +914,10 @@ discard block |
||
914 | 914 | ->leftJoin( |
915 | 915 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
916 | 916 | $expr->andX( |
917 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId), |
|
918 | - $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId), |
|
917 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId), |
|
918 | + $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId), |
|
919 | 919 | $expr->gte( |
920 | - $aliasMember . '.level', |
|
920 | + $aliasMember.'.level', |
|
921 | 921 | $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT) |
922 | 922 | ) |
923 | 923 | ) |
@@ -950,7 +950,7 @@ discard block |
||
950 | 950 | |
951 | 951 | $this->leftJoin( |
952 | 952 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
953 | - $expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field) |
|
953 | + $expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field) |
|
954 | 954 | ); |
955 | 955 | |
956 | 956 | // if (!$this->getBool('getData', $options, false)) { |
@@ -964,8 +964,8 @@ discard block |
||
964 | 964 | ->leftJoin( |
965 | 965 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
966 | 966 | $expr->andX( |
967 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'), |
|
968 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id') |
|
967 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'), |
|
968 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id') |
|
969 | 969 | ) |
970 | 970 | ); |
971 | 971 | |
@@ -982,12 +982,12 @@ discard block |
||
982 | 982 | $aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options); |
983 | 983 | $this->leftJoin( |
984 | 984 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership, |
985 | - $expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId)) |
|
985 | + $expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId)) |
|
986 | 986 | ); |
987 | 987 | |
988 | 988 | $orX = $expr->orX( |
989 | - $expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field), |
|
990 | - $expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId)) |
|
989 | + $expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field), |
|
990 | + $expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId)) |
|
991 | 991 | ); |
992 | 992 | |
993 | 993 | $this->andWhere($orX); |
@@ -1008,11 +1008,11 @@ discard block |
||
1008 | 1008 | |
1009 | 1009 | $expr = $this->expr(); |
1010 | 1010 | $aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS); |
1011 | - $this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId))); |
|
1011 | + $this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId))); |
|
1012 | 1012 | if ($level > 1) { |
1013 | 1013 | $this->andWhere( |
1014 | 1014 | $expr->gte( |
1015 | - $aliasMembership . '.level', |
|
1015 | + $aliasMembership.'.level', |
|
1016 | 1016 | $this->createNamedParameter($level, IQueryBuilder::PARAM_INT) |
1017 | 1017 | ) |
1018 | 1018 | ); |
@@ -1040,8 +1040,8 @@ discard block |
||
1040 | 1040 | $this->leftJoin( |
1041 | 1041 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
1042 | 1042 | $expr->andX( |
1043 | - $expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field), |
|
1044 | - $expr->eq($aliasMembership . '.single_id', $alias . '.single_id') |
|
1043 | + $expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field), |
|
1044 | + $expr->eq($aliasMembership.'.single_id', $alias.'.single_id') |
|
1045 | 1045 | ) |
1046 | 1046 | ); |
1047 | 1047 | |
@@ -1054,8 +1054,8 @@ discard block |
||
1054 | 1054 | ->leftJoin( |
1055 | 1055 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom, |
1056 | 1056 | $expr->andX( |
1057 | - $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'), |
|
1058 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id') |
|
1057 | + $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'), |
|
1058 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id') |
|
1059 | 1059 | ) |
1060 | 1060 | ); |
1061 | 1061 | } |
@@ -1095,7 +1095,7 @@ discard block |
||
1095 | 1095 | |
1096 | 1096 | $this->leftJoin( |
1097 | 1097 | $alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken, |
1098 | - $expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field) |
|
1098 | + $expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field) |
|
1099 | 1099 | ); |
1100 | 1100 | } |
1101 | 1101 | |
@@ -1137,14 +1137,14 @@ discard block |
||
1137 | 1137 | try { |
1138 | 1138 | $aliasConfig = $this->generateAlias($alias, self::CONFIG, $options); |
1139 | 1139 | $this->selectAlias( |
1140 | - $aliasConfig . '.config', |
|
1141 | - (($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'circle_config' |
|
1140 | + $aliasConfig.'.config', |
|
1141 | + (($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'circle_config' |
|
1142 | 1142 | ); |
1143 | 1143 | $this->leftJoin( |
1144 | 1144 | $alias, |
1145 | 1145 | CoreRequestBuilder::TABLE_CIRCLE, |
1146 | 1146 | $aliasConfig, |
1147 | - $expr->eq($alias . '.circle_id', $aliasConfig . '.unique_id') |
|
1147 | + $expr->eq($alias.'.circle_id', $aliasConfig.'.unique_id') |
|
1148 | 1148 | ); |
1149 | 1149 | } catch (RequestBuilderException $e) { |
1150 | 1150 | } |
@@ -1182,7 +1182,7 @@ discard block |
||
1182 | 1182 | $aliasMembership, |
1183 | 1183 | $expr->andX( |
1184 | 1184 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership), |
1185 | - $expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field) |
|
1185 | + $expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field) |
|
1186 | 1186 | ) |
1187 | 1187 | ); |
1188 | 1188 | |
@@ -1201,11 +1201,11 @@ discard block |
||
1201 | 1201 | $aliasMembershipCircle = $this->generateAlias($aliasMembership, self::CONFIG, $options); |
1202 | 1202 | $orXMembershipCircle = $expr->orX(); |
1203 | 1203 | array_map( |
1204 | - function (string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) { |
|
1204 | + function(string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) { |
|
1205 | 1205 | $orXMembershipCircle->add( |
1206 | 1206 | $this->expr()->eq( |
1207 | - $alias . '.circle_id', |
|
1208 | - $aliasMembershipCircle . '.unique_id' |
|
1207 | + $alias.'.circle_id', |
|
1208 | + $aliasMembershipCircle.'.unique_id' |
|
1209 | 1209 | ) |
1210 | 1210 | ); |
1211 | 1211 | }, |
@@ -1237,7 +1237,7 @@ discard block |
||
1237 | 1237 | $aliasDirectInitiator, |
1238 | 1238 | $expr->andX( |
1239 | 1239 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirectInitiator), |
1240 | - $expr->eq($aliasDirectInitiator . '.circle_id', $helperAlias . '.' . $field) |
|
1240 | + $expr->eq($aliasDirectInitiator.'.circle_id', $helperAlias.'.'.$field) |
|
1241 | 1241 | ) |
1242 | 1242 | ); |
1243 | 1243 | } catch (RequestBuilderException $e) { |
@@ -1251,8 +1251,8 @@ discard block |
||
1251 | 1251 | $this->leftJoin( |
1252 | 1252 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator, |
1253 | 1253 | $expr->andX( |
1254 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'), |
|
1255 | - $expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id') |
|
1254 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'), |
|
1255 | + $expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id') |
|
1256 | 1256 | ) |
1257 | 1257 | ); |
1258 | 1258 | |
@@ -1260,8 +1260,8 @@ discard block |
||
1260 | 1260 | $this->leftJoin( |
1261 | 1261 | $aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
1262 | 1262 | $expr->andX( |
1263 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'), |
|
1264 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id') |
|
1263 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'), |
|
1264 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id') |
|
1265 | 1265 | ) |
1266 | 1266 | ); |
1267 | 1267 | |
@@ -1312,7 +1312,7 @@ discard block |
||
1312 | 1312 | $orX->add( |
1313 | 1313 | $expr->andX( |
1314 | 1314 | $this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle), |
1315 | - $expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
1315 | + $expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
1316 | 1316 | ) |
1317 | 1317 | ); |
1318 | 1318 | } |
@@ -1322,10 +1322,10 @@ discard block |
||
1322 | 1322 | $orXLevelCheck = $expr->orX(); |
1323 | 1323 | |
1324 | 1324 | array_map( |
1325 | - function (string $alias) use ($orXLevelCheck, $minimumLevel) { |
|
1325 | + function(string $alias) use ($orXLevelCheck, $minimumLevel) { |
|
1326 | 1326 | $orXLevelCheck->add( |
1327 | 1327 | $this->expr()->gte( |
1328 | - $alias . '.level', |
|
1328 | + $alias.'.level', |
|
1329 | 1329 | $this->createNamedParameter($minimumLevel) |
1330 | 1330 | ) |
1331 | 1331 | ); |
@@ -1415,21 +1415,21 @@ discard block |
||
1415 | 1415 | $expr = $this->expr(); |
1416 | 1416 | $andPassive = $expr->andX(); |
1417 | 1417 | $andPassive->add( |
1418 | - $expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1418 | + $expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1419 | 1419 | ); |
1420 | 1420 | |
1421 | 1421 | $orMemberOrLevel = $expr->orX(); |
1422 | 1422 | $orMemberOrLevel->add( |
1423 | - $expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance') |
|
1423 | + $expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance') |
|
1424 | 1424 | ); |
1425 | 1425 | // TODO: do we need this ? (display members from the local instance) |
1426 | 1426 | $orMemberOrLevel->add( |
1427 | - $expr->emptyString($this->getDefaultSelectAlias() . '.instance') |
|
1427 | + $expr->emptyString($this->getDefaultSelectAlias().'.instance') |
|
1428 | 1428 | ); |
1429 | 1429 | |
1430 | 1430 | $orMemberOrLevel->add( |
1431 | 1431 | $expr->eq( |
1432 | - $this->getDefaultSelectAlias() . '.level', |
|
1432 | + $this->getDefaultSelectAlias().'.level', |
|
1433 | 1433 | $this->createNamedParameter(Member::LEVEL_OWNER) |
1434 | 1434 | ) |
1435 | 1435 | ); |
@@ -1466,11 +1466,11 @@ discard block |
||
1466 | 1466 | ) |
1467 | 1467 | ->leftJoin( |
1468 | 1468 | $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache, |
1469 | - $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid') |
|
1469 | + $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid') |
|
1470 | 1470 | ) |
1471 | 1471 | ->leftJoin( |
1472 | 1472 | $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages, |
1473 | - $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id') |
|
1473 | + $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id') |
|
1474 | 1474 | ); |
1475 | 1475 | } |
1476 | 1476 | |
@@ -1492,8 +1492,8 @@ discard block |
||
1492 | 1492 | $this->leftJoin( |
1493 | 1493 | $aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild, |
1494 | 1494 | $expr->andX( |
1495 | - $expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'), |
|
1496 | - $expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id') |
|
1495 | + $expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'), |
|
1496 | + $expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id') |
|
1497 | 1497 | ) |
1498 | 1498 | ); |
1499 | 1499 | |
@@ -1543,13 +1543,13 @@ discard block |
||
1543 | 1543 | $this->leftJoin( |
1544 | 1544 | $aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint, |
1545 | 1545 | $expr->andX( |
1546 | - $expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'), |
|
1547 | - $expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id') |
|
1546 | + $expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'), |
|
1547 | + $expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id') |
|
1548 | 1548 | ) |
1549 | 1549 | ); |
1550 | 1550 | |
1551 | - $this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint'); |
|
1552 | - $this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash'); |
|
1551 | + $this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint'); |
|
1552 | + $this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash'); |
|
1553 | 1553 | } |
1554 | 1554 | |
1555 | 1555 | |
@@ -1653,10 +1653,10 @@ discard block |
||
1653 | 1653 | */ |
1654 | 1654 | public function generateAlias(string $base, string $extension, ?array &$options = []): string { |
1655 | 1655 | $search = str_replace('_', '.', $base); |
1656 | - $path = $search . '.' . $extension; |
|
1656 | + $path = $search.'.'.$extension; |
|
1657 | 1657 | if (!$this->validKey($path, self::$SQL_PATH) |
1658 | 1658 | && !in_array($extension, $this->getArray($search, self::$SQL_PATH))) { |
1659 | - throw new RequestBuilderException($extension . ' not found in ' . $search); |
|
1659 | + throw new RequestBuilderException($extension.' not found in '.$search); |
|
1660 | 1660 | } |
1661 | 1661 | |
1662 | 1662 | if (!is_array($options)) { |
@@ -1665,15 +1665,15 @@ discard block |
||
1665 | 1665 | |
1666 | 1666 | $optionPath = ''; |
1667 | 1667 | foreach (explode('.', $path) as $p) { |
1668 | - $optionPath = trim($optionPath . '.' . $p, '.'); |
|
1668 | + $optionPath = trim($optionPath.'.'.$p, '.'); |
|
1669 | 1669 | $options = array_merge( |
1670 | 1670 | $options, |
1671 | - $this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH), |
|
1672 | - $this->getArray($optionPath . '.' . self::OPTIONS, $this->options) |
|
1671 | + $this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH), |
|
1672 | + $this->getArray($optionPath.'.'.self::OPTIONS, $this->options) |
|
1673 | 1673 | ); |
1674 | 1674 | } |
1675 | 1675 | |
1676 | - return $base . '_' . $extension; |
|
1676 | + return $base.'_'.$extension; |
|
1677 | 1677 | } |
1678 | 1678 | |
1679 | 1679 | |
@@ -1693,7 +1693,7 @@ discard block |
||
1693 | 1693 | } else { |
1694 | 1694 | $k = $arr; |
1695 | 1695 | } |
1696 | - $path[$k] = $prefix . '_' . $k . '_'; |
|
1696 | + $path[$k] = $prefix.'_'.$k.'_'; |
|
1697 | 1697 | } |
1698 | 1698 | |
1699 | 1699 | return $path; |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | use Throwable; |
92 | 92 | |
93 | 93 | |
94 | -require_once __DIR__ . '/../../vendor/autoload.php'; |
|
94 | +require_once __DIR__.'/../../vendor/autoload.php'; |
|
95 | 95 | |
96 | 96 | |
97 | 97 | /** |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | // It seems that AccountManager use deprecated dispatcher, let's use a deprecated listener |
180 | 180 | $dispatcher = OC::$server->getEventDispatcher(); |
181 | 181 | $dispatcher->addListener( |
182 | - 'OC\AccountManager::userUpdated', function (GenericEvent $event) { |
|
182 | + 'OC\AccountManager::userUpdated', function(GenericEvent $event) { |
|
183 | 183 | /** @var IUser $user */ |
184 | 184 | $user = $event->getSubject(); |
185 | 185 | /** @var DeprecatedListener $deprecatedListener */ |