@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | } |
382 | 382 | |
383 | 383 | if ($circle->getDisplayName() !== '') { |
384 | - $this->searchInDBField('display_name', '%' . $circle->getDisplayName() . '%'); |
|
384 | + $this->searchInDBField('display_name', '%'.$circle->getDisplayName().'%'); |
|
385 | 385 | } |
386 | 386 | if ($circle->getConfig() > 0) { |
387 | 387 | $this->limitBitwise('config', $circle->getConfig()); |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | $this->generateRemoteInstanceSelectAlias($aliasRemoteInstance) |
401 | 401 | ->leftJoin( |
402 | 402 | $alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance, |
403 | - $expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance') |
|
403 | + $expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance') |
|
404 | 404 | ); |
405 | 405 | } catch (RequestBuilderException $e) { |
406 | 406 | } |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | $expr = $this->expr(); |
454 | 454 | $this->leftJoin( |
455 | 455 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote, |
456 | - $expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
456 | + $expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
457 | 457 | ); |
458 | 458 | } |
459 | 459 | |
@@ -481,12 +481,12 @@ discard block |
||
481 | 481 | $this->leftJoin( |
482 | 482 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember, |
483 | 483 | $expr->andX( |
484 | - $expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'), |
|
484 | + $expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'), |
|
485 | 485 | $expr->eq( |
486 | - $aliasRemoteMember . '.instance', |
|
486 | + $aliasRemoteMember.'.instance', |
|
487 | 487 | $this->createNamedParameter($remoteInstance->getInstance()) |
488 | 488 | ), |
489 | - $expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
489 | + $expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
490 | 490 | ) |
491 | 491 | ); |
492 | 492 | } |
@@ -518,21 +518,21 @@ discard block |
||
518 | 518 | $this->leftJoin( |
519 | 519 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle, |
520 | 520 | $expr->andX( |
521 | - $expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'), |
|
522 | - $expr->emptyString($aliasRemoteCircle . '.instance'), |
|
523 | - $expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
521 | + $expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'), |
|
522 | + $expr->emptyString($aliasRemoteCircle.'.instance'), |
|
523 | + $expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
524 | 524 | ) |
525 | 525 | ); |
526 | 526 | $this->leftJoin( |
527 | 527 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner, |
528 | 528 | $expr->andX( |
529 | - $expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'), |
|
529 | + $expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'), |
|
530 | 530 | $expr->eq( |
531 | - $aliasRemoteCircleOwner . '.instance', |
|
531 | + $aliasRemoteCircleOwner.'.instance', |
|
532 | 532 | $this->createNamedParameter($remoteInstance->getInstance()) |
533 | 533 | ), |
534 | 534 | $expr->eq( |
535 | - $aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
535 | + $aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
536 | 536 | ) |
537 | 537 | ) |
538 | 538 | ); |
@@ -565,16 +565,16 @@ discard block |
||
565 | 565 | $expr = $this->expr(); |
566 | 566 | $orX = $expr->orX(); |
567 | 567 | $orX->add( |
568 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
568 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
569 | 569 | ); |
570 | 570 | |
571 | 571 | $orExtOrPassive = $expr->orX(); |
572 | 572 | $orExtOrPassive->add( |
573 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
573 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
574 | 574 | ); |
575 | 575 | if (!$sensitive) { |
576 | 576 | $orExtOrPassive->add( |
577 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
577 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
578 | 578 | ); |
579 | 579 | } else { |
580 | 580 | if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) { |
@@ -583,8 +583,8 @@ discard block |
||
583 | 583 | } |
584 | 584 | |
585 | 585 | $orInstance = $expr->orX(); |
586 | - $orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance')); |
|
587 | - $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance')); |
|
586 | + $orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance')); |
|
587 | + $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance')); |
|
588 | 588 | |
589 | 589 | $andExternal = $expr->andX(); |
590 | 590 | $andExternal->add($orExtOrPassive); |
@@ -593,13 +593,13 @@ discard block |
||
593 | 593 | $orExtOrTrusted = $expr->orX(); |
594 | 594 | $orExtOrTrusted->add($andExternal); |
595 | 595 | $orExtOrTrusted->add( |
596 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
596 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
597 | 597 | ); |
598 | 598 | |
599 | 599 | $andTrusted = $expr->andX(); |
600 | 600 | $andTrusted->add($orExtOrTrusted); |
601 | 601 | $andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle)); |
602 | - $andTrusted->add($expr->emptyString($aliasOwner . '.instance')); |
|
602 | + $andTrusted->add($expr->emptyString($aliasOwner.'.instance')); |
|
603 | 603 | $orX->add($andTrusted); |
604 | 604 | |
605 | 605 | $this->andWhere($orX); |
@@ -626,7 +626,7 @@ discard block |
||
626 | 626 | } |
627 | 627 | $this->leftJoin( |
628 | 628 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
629 | - $expr->eq($aliasMember . '.circle_id', $alias . '.unique_id') |
|
629 | + $expr->eq($aliasMember.'.circle_id', $alias.'.unique_id') |
|
630 | 630 | ); |
631 | 631 | |
632 | 632 | $this->filterDirectMembership($aliasMember, $member); |
@@ -647,30 +647,30 @@ discard block |
||
647 | 647 | |
648 | 648 | if ($member->getUserId() !== '') { |
649 | 649 | $andX->add( |
650 | - $expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId())) |
|
650 | + $expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId())) |
|
651 | 651 | ); |
652 | 652 | } |
653 | 653 | |
654 | 654 | if ($member->getSingleId() !== '') { |
655 | 655 | $andX->add( |
656 | - $expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId())) |
|
656 | + $expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId())) |
|
657 | 657 | ); |
658 | 658 | } |
659 | 659 | |
660 | 660 | if ($member->getUserType() > 0) { |
661 | 661 | $andX->add( |
662 | - $expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType())) |
|
662 | + $expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType())) |
|
663 | 663 | ); |
664 | 664 | } |
665 | 665 | |
666 | 666 | $andX->add( |
667 | - $expr->eq($aliasMember . '.instance', $this->createNamedParameter($this->getInstance($member))) |
|
667 | + $expr->eq($aliasMember.'.instance', $this->createNamedParameter($this->getInstance($member))) |
|
668 | 668 | ); |
669 | 669 | |
670 | 670 | if ($member->getLevel() > 0) { |
671 | 671 | $andX->add( |
672 | 672 | $expr->gte( |
673 | - $aliasMember . '.level', |
|
673 | + $aliasMember.'.level', |
|
674 | 674 | $this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT) |
675 | 675 | ) |
676 | 676 | ); |
@@ -701,12 +701,12 @@ discard block |
||
701 | 701 | |
702 | 702 | $expr = $this->expr(); |
703 | 703 | $this->selectAlias( |
704 | - $this->createFunction('COUNT(`' . $aliasMemberCount . '`.`member_id`)'), |
|
705 | - (($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'population' |
|
704 | + $this->createFunction('COUNT(`'.$aliasMemberCount.'`.`member_id`)'), |
|
705 | + (($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'population' |
|
706 | 706 | ); |
707 | 707 | $this->leftJoin( |
708 | 708 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMemberCount, |
709 | - $expr->eq($alias . '.unique_id', $aliasMemberCount . '.circle_id') |
|
709 | + $expr->eq($alias.'.unique_id', $aliasMemberCount.'.circle_id') |
|
710 | 710 | ); |
711 | 711 | } |
712 | 712 | |
@@ -742,7 +742,7 @@ discard block |
||
742 | 742 | $helperAlias, |
743 | 743 | CoreRequestBuilder::TABLE_CIRCLE, |
744 | 744 | $aliasCircle, |
745 | - $expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field) |
|
745 | + $expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field) |
|
746 | 746 | ); |
747 | 747 | |
748 | 748 | if (!is_null($initiator)) { |
@@ -773,7 +773,7 @@ discard block |
||
773 | 773 | $this->generateCircleSelectAlias($aliasInvitedBy) |
774 | 774 | ->leftJoin( |
775 | 775 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy, |
776 | - $expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id') |
|
776 | + $expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id') |
|
777 | 777 | ); |
778 | 778 | |
779 | 779 | $this->leftJoinOwner($aliasInvitedBy); |
@@ -804,7 +804,7 @@ discard block |
||
804 | 804 | $this->generateCircleSelectAlias($aliasBasedOn) |
805 | 805 | ->leftJoin( |
806 | 806 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn, |
807 | - $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id') |
|
807 | + $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id') |
|
808 | 808 | ); |
809 | 809 | |
810 | 810 | if (!is_null($initiator)) { |
@@ -837,9 +837,9 @@ discard block |
||
837 | 837 | ->leftJoin( |
838 | 838 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
839 | 839 | $expr->andX( |
840 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field), |
|
840 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field), |
|
841 | 841 | $expr->eq( |
842 | - $aliasMember . '.level', |
|
842 | + $aliasMember.'.level', |
|
843 | 843 | $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT) |
844 | 844 | ) |
845 | 845 | ) |
@@ -877,10 +877,10 @@ discard block |
||
877 | 877 | ->leftJoin( |
878 | 878 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
879 | 879 | $expr->andX( |
880 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId), |
|
881 | - $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId), |
|
880 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId), |
|
881 | + $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId), |
|
882 | 882 | $expr->gte( |
883 | - $aliasMember . '.level', |
|
883 | + $aliasMember.'.level', |
|
884 | 884 | $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT) |
885 | 885 | ) |
886 | 886 | ) |
@@ -913,7 +913,7 @@ discard block |
||
913 | 913 | |
914 | 914 | $this->leftJoin( |
915 | 915 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
916 | - $expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field) |
|
916 | + $expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field) |
|
917 | 917 | ); |
918 | 918 | |
919 | 919 | // if (!$this->getBool('getData', $options, false)) { |
@@ -927,8 +927,8 @@ discard block |
||
927 | 927 | ->leftJoin( |
928 | 928 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
929 | 929 | $expr->andX( |
930 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'), |
|
931 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id') |
|
930 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'), |
|
931 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id') |
|
932 | 932 | ) |
933 | 933 | ); |
934 | 934 | |
@@ -945,12 +945,12 @@ discard block |
||
945 | 945 | $aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options); |
946 | 946 | $this->leftJoin( |
947 | 947 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership, |
948 | - $expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId)) |
|
948 | + $expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId)) |
|
949 | 949 | ); |
950 | 950 | |
951 | 951 | $orX = $expr->orX( |
952 | - $expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field), |
|
953 | - $expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId)) |
|
952 | + $expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field), |
|
953 | + $expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId)) |
|
954 | 954 | ); |
955 | 955 | |
956 | 956 | $this->andWhere($orX); |
@@ -971,11 +971,11 @@ discard block |
||
971 | 971 | |
972 | 972 | $expr = $this->expr(); |
973 | 973 | $aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS); |
974 | - $this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId))); |
|
974 | + $this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId))); |
|
975 | 975 | if ($level > 1) { |
976 | 976 | $this->andWhere( |
977 | 977 | $expr->gte( |
978 | - $aliasMembership . '.level', |
|
978 | + $aliasMembership.'.level', |
|
979 | 979 | $this->createNamedParameter($level, IQueryBuilder::PARAM_INT) |
980 | 980 | ) |
981 | 981 | ); |
@@ -1003,8 +1003,8 @@ discard block |
||
1003 | 1003 | $this->leftJoin( |
1004 | 1004 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
1005 | 1005 | $expr->andX( |
1006 | - $expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field), |
|
1007 | - $expr->eq($aliasMembership . '.single_id', $alias . '.single_id') |
|
1006 | + $expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field), |
|
1007 | + $expr->eq($aliasMembership.'.single_id', $alias.'.single_id') |
|
1008 | 1008 | ) |
1009 | 1009 | ); |
1010 | 1010 | |
@@ -1017,8 +1017,8 @@ discard block |
||
1017 | 1017 | ->leftJoin( |
1018 | 1018 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom, |
1019 | 1019 | $expr->andX( |
1020 | - $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'), |
|
1021 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id') |
|
1020 | + $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'), |
|
1021 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id') |
|
1022 | 1022 | ) |
1023 | 1023 | ); |
1024 | 1024 | } |
@@ -1084,7 +1084,7 @@ discard block |
||
1084 | 1084 | $aliasMembership, |
1085 | 1085 | $expr->andX( |
1086 | 1086 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership), |
1087 | - $expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field) |
|
1087 | + $expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field) |
|
1088 | 1088 | ) |
1089 | 1089 | ); |
1090 | 1090 | |
@@ -1102,7 +1102,7 @@ discard block |
||
1102 | 1102 | $aliasDirectInitiator, |
1103 | 1103 | $expr->andX( |
1104 | 1104 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirectInitiator), |
1105 | - $expr->eq($aliasDirectInitiator . '.circle_id', $helperAlias . '.' . $field) |
|
1105 | + $expr->eq($aliasDirectInitiator.'.circle_id', $helperAlias.'.'.$field) |
|
1106 | 1106 | ) |
1107 | 1107 | ); |
1108 | 1108 | } catch (RequestBuilderException $e) { |
@@ -1115,8 +1115,8 @@ discard block |
||
1115 | 1115 | $this->leftJoin( |
1116 | 1116 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator, |
1117 | 1117 | $expr->andX( |
1118 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'), |
|
1119 | - $expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id') |
|
1118 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'), |
|
1119 | + $expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id') |
|
1120 | 1120 | ) |
1121 | 1121 | ); |
1122 | 1122 | |
@@ -1124,8 +1124,8 @@ discard block |
||
1124 | 1124 | $this->leftJoin( |
1125 | 1125 | $aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
1126 | 1126 | $expr->andX( |
1127 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'), |
|
1128 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id') |
|
1127 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'), |
|
1128 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id') |
|
1129 | 1129 | ) |
1130 | 1130 | ); |
1131 | 1131 | |
@@ -1195,7 +1195,7 @@ discard block |
||
1195 | 1195 | } |
1196 | 1196 | if ($this->getBool('canBeVisitor', $options, false)) { |
1197 | 1197 | // TODO: should find a better way, also filter on remote initiator on non-federated ? |
1198 | - $orX->add($expr->gte($alias . '.config', $this->createNamedParameter(0))); |
|
1198 | + $orX->add($expr->gte($alias.'.config', $this->createNamedParameter(0))); |
|
1199 | 1199 | } |
1200 | 1200 | if ($this->getBool('canBeVisitorOnOpen', $options, false)) { |
1201 | 1201 | $andOpen = $expr->andX(); |
@@ -1263,21 +1263,21 @@ discard block |
||
1263 | 1263 | $expr = $this->expr(); |
1264 | 1264 | $andPassive = $expr->andX(); |
1265 | 1265 | $andPassive->add( |
1266 | - $expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1266 | + $expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1267 | 1267 | ); |
1268 | 1268 | |
1269 | 1269 | $orMemberOrLevel = $expr->orX(); |
1270 | 1270 | $orMemberOrLevel->add( |
1271 | - $expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance') |
|
1271 | + $expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance') |
|
1272 | 1272 | ); |
1273 | 1273 | // TODO: do we need this ? (display members from the local instance) |
1274 | 1274 | $orMemberOrLevel->add( |
1275 | - $expr->emptyString($this->getDefaultSelectAlias() . '.instance') |
|
1275 | + $expr->emptyString($this->getDefaultSelectAlias().'.instance') |
|
1276 | 1276 | ); |
1277 | 1277 | |
1278 | 1278 | $orMemberOrLevel->add( |
1279 | 1279 | $expr->eq( |
1280 | - $this->getDefaultSelectAlias() . '.level', |
|
1280 | + $this->getDefaultSelectAlias().'.level', |
|
1281 | 1281 | $this->createNamedParameter(Member::LEVEL_OWNER) |
1282 | 1282 | ) |
1283 | 1283 | ); |
@@ -1314,11 +1314,11 @@ discard block |
||
1314 | 1314 | ) |
1315 | 1315 | ->leftJoin( |
1316 | 1316 | $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache, |
1317 | - $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid') |
|
1317 | + $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid') |
|
1318 | 1318 | ) |
1319 | 1319 | ->leftJoin( |
1320 | 1320 | $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages, |
1321 | - $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id') |
|
1321 | + $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id') |
|
1322 | 1322 | ); |
1323 | 1323 | } |
1324 | 1324 | |
@@ -1340,8 +1340,8 @@ discard block |
||
1340 | 1340 | $this->leftJoin( |
1341 | 1341 | $aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild, |
1342 | 1342 | $expr->andX( |
1343 | - $expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'), |
|
1344 | - $expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id') |
|
1343 | + $expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'), |
|
1344 | + $expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id') |
|
1345 | 1345 | ) |
1346 | 1346 | ); |
1347 | 1347 | |
@@ -1391,13 +1391,13 @@ discard block |
||
1391 | 1391 | $this->leftJoin( |
1392 | 1392 | $aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint, |
1393 | 1393 | $expr->andX( |
1394 | - $expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'), |
|
1395 | - $expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id') |
|
1394 | + $expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'), |
|
1395 | + $expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id') |
|
1396 | 1396 | ) |
1397 | 1397 | ); |
1398 | 1398 | |
1399 | - $this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint'); |
|
1400 | - $this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash'); |
|
1399 | + $this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint'); |
|
1400 | + $this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash'); |
|
1401 | 1401 | } |
1402 | 1402 | |
1403 | 1403 | |
@@ -1501,10 +1501,10 @@ discard block |
||
1501 | 1501 | */ |
1502 | 1502 | public function generateAlias(string $base, string $extension, ?array &$options = []): string { |
1503 | 1503 | $search = str_replace('_', '.', $base); |
1504 | - $path = $search . '.' . $extension; |
|
1504 | + $path = $search.'.'.$extension; |
|
1505 | 1505 | if (!$this->validKey($path, self::$SQL_PATH) |
1506 | 1506 | && !in_array($extension, $this->getArray($search, self::$SQL_PATH))) { |
1507 | - throw new RequestBuilderException($extension . ' not found in ' . $search); |
|
1507 | + throw new RequestBuilderException($extension.' not found in '.$search); |
|
1508 | 1508 | } |
1509 | 1509 | |
1510 | 1510 | if (!is_array($options)) { |
@@ -1513,15 +1513,15 @@ discard block |
||
1513 | 1513 | |
1514 | 1514 | $optionPath = ''; |
1515 | 1515 | foreach (explode('.', $path) as $p) { |
1516 | - $optionPath = trim($optionPath . '.' . $p, '.'); |
|
1516 | + $optionPath = trim($optionPath.'.'.$p, '.'); |
|
1517 | 1517 | $options = array_merge( |
1518 | 1518 | $options, |
1519 | - $this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH), |
|
1520 | - $this->getArray($optionPath . '.' . self::OPTIONS, $this->options) |
|
1519 | + $this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH), |
|
1520 | + $this->getArray($optionPath.'.'.self::OPTIONS, $this->options) |
|
1521 | 1521 | ); |
1522 | 1522 | } |
1523 | 1523 | |
1524 | - return $base . '_' . $extension; |
|
1524 | + return $base.'_'.$extension; |
|
1525 | 1525 | } |
1526 | 1526 | |
1527 | 1527 | |
@@ -1541,7 +1541,7 @@ discard block |
||
1541 | 1541 | } else { |
1542 | 1542 | $k = $arr; |
1543 | 1543 | } |
1544 | - $path[$k] = $prefix . '_' . $k . '_'; |
|
1544 | + $path[$k] = $prefix.'_'.$k.'_'; |
|
1545 | 1545 | } |
1546 | 1546 | |
1547 | 1547 | return $path; |
@@ -1558,7 +1558,7 @@ discard block |
||
1558 | 1558 | $expr = $this->expr(); |
1559 | 1559 | $orX = $expr->orX(); |
1560 | 1560 | foreach ($aliases as $alias) { |
1561 | - $orX->add($expr->gte($alias . '.level', $this->createNamedParameter($level))); |
|
1561 | + $orX->add($expr->gte($alias.'.level', $this->createNamedParameter($level))); |
|
1562 | 1562 | } |
1563 | 1563 | |
1564 | 1564 | return $orX; |