@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | if ($circle->getDisplayName() !== '') { |
| 355 | - $this->searchInDBField('display_name', '%' . $circle->getDisplayName() . '%'); |
|
| 355 | + $this->searchInDBField('display_name', '%'.$circle->getDisplayName().'%'); |
|
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | $this->generateRemoteInstanceSelectAlias($aliasRemoteInstance) |
| 369 | 369 | ->leftJoin( |
| 370 | 370 | $alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance, |
| 371 | - $expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance') |
|
| 371 | + $expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance') |
|
| 372 | 372 | ); |
| 373 | 373 | } catch (RequestBuilderException $e) { |
| 374 | 374 | } |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | $expr = $this->expr(); |
| 422 | 422 | $this->leftJoin( |
| 423 | 423 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote, |
| 424 | - $expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
| 424 | + $expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
| 425 | 425 | ); |
| 426 | 426 | } |
| 427 | 427 | |
@@ -449,12 +449,12 @@ discard block |
||
| 449 | 449 | $this->leftJoin( |
| 450 | 450 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember, |
| 451 | 451 | $expr->andX( |
| 452 | - $expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'), |
|
| 452 | + $expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'), |
|
| 453 | 453 | $expr->eq( |
| 454 | - $aliasRemoteMember . '.instance', |
|
| 454 | + $aliasRemoteMember.'.instance', |
|
| 455 | 455 | $this->createNamedParameter($remoteInstance->getInstance()) |
| 456 | 456 | ), |
| 457 | - $expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 457 | + $expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 458 | 458 | ) |
| 459 | 459 | ); |
| 460 | 460 | } |
@@ -486,21 +486,21 @@ discard block |
||
| 486 | 486 | $this->leftJoin( |
| 487 | 487 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle, |
| 488 | 488 | $expr->andX( |
| 489 | - $expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'), |
|
| 490 | - $expr->emptyString($aliasRemoteCircle . '.instance'), |
|
| 491 | - $expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 489 | + $expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'), |
|
| 490 | + $expr->emptyString($aliasRemoteCircle.'.instance'), |
|
| 491 | + $expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 492 | 492 | ) |
| 493 | 493 | ); |
| 494 | 494 | $this->leftJoin( |
| 495 | 495 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner, |
| 496 | 496 | $expr->andX( |
| 497 | - $expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'), |
|
| 497 | + $expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'), |
|
| 498 | 498 | $expr->eq( |
| 499 | - $aliasRemoteCircleOwner . '.instance', |
|
| 499 | + $aliasRemoteCircleOwner.'.instance', |
|
| 500 | 500 | $this->createNamedParameter($remoteInstance->getInstance()) |
| 501 | 501 | ), |
| 502 | 502 | $expr->eq( |
| 503 | - $aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
| 503 | + $aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
| 504 | 504 | ) |
| 505 | 505 | ) |
| 506 | 506 | ); |
@@ -533,16 +533,16 @@ discard block |
||
| 533 | 533 | $expr = $this->expr(); |
| 534 | 534 | $orX = $expr->orX(); |
| 535 | 535 | $orX->add( |
| 536 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
| 536 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
| 537 | 537 | ); |
| 538 | 538 | |
| 539 | 539 | $orExtOrPassive = $expr->orX(); |
| 540 | 540 | $orExtOrPassive->add( |
| 541 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
| 541 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
| 542 | 542 | ); |
| 543 | 543 | if (!$sensitive) { |
| 544 | 544 | $orExtOrPassive->add( |
| 545 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 545 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 546 | 546 | ); |
| 547 | 547 | } else { |
| 548 | 548 | if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) { |
@@ -551,8 +551,8 @@ discard block |
||
| 551 | 551 | } |
| 552 | 552 | |
| 553 | 553 | $orInstance = $expr->orX(); |
| 554 | - $orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance')); |
|
| 555 | - $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance')); |
|
| 554 | + $orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance')); |
|
| 555 | + $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance')); |
|
| 556 | 556 | |
| 557 | 557 | $andExternal = $expr->andX(); |
| 558 | 558 | $andExternal->add($orExtOrPassive); |
@@ -561,13 +561,13 @@ discard block |
||
| 561 | 561 | $orExtOrTrusted = $expr->orX(); |
| 562 | 562 | $orExtOrTrusted->add($andExternal); |
| 563 | 563 | $orExtOrTrusted->add( |
| 564 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
| 564 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
| 565 | 565 | ); |
| 566 | 566 | |
| 567 | 567 | $andTrusted = $expr->andX(); |
| 568 | 568 | $andTrusted->add($orExtOrTrusted); |
| 569 | 569 | $andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle)); |
| 570 | - $andTrusted->add($expr->emptyString($aliasOwner . '.instance')); |
|
| 570 | + $andTrusted->add($expr->emptyString($aliasOwner.'.instance')); |
|
| 571 | 571 | $orX->add($andTrusted); |
| 572 | 572 | |
| 573 | 573 | $this->andWhere($orX); |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | } |
| 595 | 595 | $this->leftJoin( |
| 596 | 596 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
| 597 | - $expr->eq($aliasMember . '.circle_id', $alias . '.unique_id') |
|
| 597 | + $expr->eq($aliasMember.'.circle_id', $alias.'.unique_id') |
|
| 598 | 598 | ); |
| 599 | 599 | |
| 600 | 600 | $this->filterDirectMembership($aliasMember, $member); |
@@ -615,30 +615,30 @@ discard block |
||
| 615 | 615 | |
| 616 | 616 | if ($member->getUserId() !== '') { |
| 617 | 617 | $andX->add( |
| 618 | - $expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId())) |
|
| 618 | + $expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId())) |
|
| 619 | 619 | ); |
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | if ($member->getSingleId() !== '') { |
| 623 | 623 | $andX->add( |
| 624 | - $expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId())) |
|
| 624 | + $expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId())) |
|
| 625 | 625 | ); |
| 626 | 626 | } |
| 627 | 627 | |
| 628 | 628 | if ($member->getUserType() > 0) { |
| 629 | 629 | $andX->add( |
| 630 | - $expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType())) |
|
| 630 | + $expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType())) |
|
| 631 | 631 | ); |
| 632 | 632 | } |
| 633 | 633 | |
| 634 | 634 | $andX->add( |
| 635 | - $expr->eq($aliasMember . '.instance', $this->createNamedParameter($this->getInstance($member))) |
|
| 635 | + $expr->eq($aliasMember.'.instance', $this->createNamedParameter($this->getInstance($member))) |
|
| 636 | 636 | ); |
| 637 | 637 | |
| 638 | 638 | if ($member->getLevel() > 0) { |
| 639 | 639 | $andX->add( |
| 640 | 640 | $expr->gte( |
| 641 | - $aliasMember . '.level', |
|
| 641 | + $aliasMember.'.level', |
|
| 642 | 642 | $this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT) |
| 643 | 643 | ) |
| 644 | 644 | ); |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | $helperAlias, |
| 680 | 680 | CoreRequestBuilder::TABLE_CIRCLE, |
| 681 | 681 | $aliasCircle, |
| 682 | - $expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field) |
|
| 682 | + $expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field) |
|
| 683 | 683 | ); |
| 684 | 684 | |
| 685 | 685 | if (!is_null($initiator)) { |
@@ -714,7 +714,7 @@ discard block |
||
| 714 | 714 | $this->generateCircleSelectAlias($aliasBasedOn) |
| 715 | 715 | ->leftJoin( |
| 716 | 716 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn, |
| 717 | - $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id') |
|
| 717 | + $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id') |
|
| 718 | 718 | ); |
| 719 | 719 | |
| 720 | 720 | if (!is_null($initiator)) { |
@@ -747,9 +747,9 @@ discard block |
||
| 747 | 747 | ->leftJoin( |
| 748 | 748 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
| 749 | 749 | $expr->andX( |
| 750 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field), |
|
| 750 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field), |
|
| 751 | 751 | $expr->eq( |
| 752 | - $aliasMember . '.level', |
|
| 752 | + $aliasMember.'.level', |
|
| 753 | 753 | $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT) |
| 754 | 754 | ) |
| 755 | 755 | ) |
@@ -787,10 +787,10 @@ discard block |
||
| 787 | 787 | ->leftJoin( |
| 788 | 788 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
| 789 | 789 | $expr->andX( |
| 790 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId), |
|
| 791 | - $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId), |
|
| 790 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId), |
|
| 791 | + $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId), |
|
| 792 | 792 | $expr->gte( |
| 793 | - $aliasMember . '.level', |
|
| 793 | + $aliasMember.'.level', |
|
| 794 | 794 | $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT) |
| 795 | 795 | ) |
| 796 | 796 | ) |
@@ -820,7 +820,7 @@ discard block |
||
| 820 | 820 | |
| 821 | 821 | $this->leftJoin( |
| 822 | 822 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
| 823 | - $expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field) |
|
| 823 | + $expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field) |
|
| 824 | 824 | ); |
| 825 | 825 | |
| 826 | 826 | // if (!$this->getBool('getData', $options, false)) { |
@@ -834,8 +834,8 @@ discard block |
||
| 834 | 834 | ->leftJoin( |
| 835 | 835 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
| 836 | 836 | $expr->andX( |
| 837 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'), |
|
| 838 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id') |
|
| 837 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'), |
|
| 838 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id') |
|
| 839 | 839 | ) |
| 840 | 840 | ); |
| 841 | 841 | |
@@ -852,12 +852,12 @@ discard block |
||
| 852 | 852 | $aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options); |
| 853 | 853 | $this->leftJoin( |
| 854 | 854 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership, |
| 855 | - $expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId)) |
|
| 855 | + $expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId)) |
|
| 856 | 856 | ); |
| 857 | 857 | |
| 858 | 858 | $orX = $expr->orX( |
| 859 | - $expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field), |
|
| 860 | - $expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId)) |
|
| 859 | + $expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field), |
|
| 860 | + $expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId)) |
|
| 861 | 861 | ); |
| 862 | 862 | |
| 863 | 863 | $this->andWhere($orX); |
@@ -877,7 +877,7 @@ discard block |
||
| 877 | 877 | |
| 878 | 878 | $expr = $this->expr(); |
| 879 | 879 | $aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS); |
| 880 | - $this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId))); |
|
| 880 | + $this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId))); |
|
| 881 | 881 | } |
| 882 | 882 | |
| 883 | 883 | |
@@ -901,7 +901,7 @@ discard block |
||
| 901 | 901 | $this->leftJoin( |
| 902 | 902 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
| 903 | 903 | // $expr->andX( |
| 904 | - $expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field) |
|
| 904 | + $expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field) |
|
| 905 | 905 | // $expr->eq($aliasMembership . '.single_id', $alias . '.single_id') |
| 906 | 906 | // ) |
| 907 | 907 | ); |
@@ -915,8 +915,8 @@ discard block |
||
| 915 | 915 | ->leftJoin( |
| 916 | 916 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom, |
| 917 | 917 | $expr->andX( |
| 918 | - $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'), |
|
| 919 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id') |
|
| 918 | + $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'), |
|
| 919 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id') |
|
| 920 | 920 | ) |
| 921 | 921 | ); |
| 922 | 922 | } |
@@ -982,7 +982,7 @@ discard block |
||
| 982 | 982 | $aliasMembership, |
| 983 | 983 | $expr->andX( |
| 984 | 984 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership), |
| 985 | - $expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field) |
|
| 985 | + $expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field) |
|
| 986 | 986 | ) |
| 987 | 987 | ); |
| 988 | 988 | |
@@ -995,8 +995,8 @@ discard block |
||
| 995 | 995 | $this->leftJoin( |
| 996 | 996 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator, |
| 997 | 997 | $expr->andX( |
| 998 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'), |
|
| 999 | - $expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id') |
|
| 998 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'), |
|
| 999 | + $expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id') |
|
| 1000 | 1000 | ) |
| 1001 | 1001 | ); |
| 1002 | 1002 | |
@@ -1004,8 +1004,8 @@ discard block |
||
| 1004 | 1004 | $this->leftJoin( |
| 1005 | 1005 | $aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
| 1006 | 1006 | $expr->andX( |
| 1007 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'), |
|
| 1008 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id') |
|
| 1007 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'), |
|
| 1008 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id') |
|
| 1009 | 1009 | ) |
| 1010 | 1010 | ); |
| 1011 | 1011 | |
@@ -1024,7 +1024,7 @@ discard block |
||
| 1024 | 1024 | $aliasInheritedByMembership = $this->generateAlias($aliasInheritedBy, self::MEMBERSHIPS); |
| 1025 | 1025 | $this->generateMembershipSelectAlias($aliasMembership, $aliasInheritedByMembership); |
| 1026 | 1026 | } catch (RequestBuilderException $e) { |
| 1027 | - \OC::$server->getLogger()->log(3, '-- ' . $e->getMessage()); |
|
| 1027 | + \OC::$server->getLogger()->log(3, '-- '.$e->getMessage()); |
|
| 1028 | 1028 | } |
| 1029 | 1029 | } |
| 1030 | 1030 | |
@@ -1048,7 +1048,7 @@ discard block |
||
| 1048 | 1048 | $orX = $expr->orX(); |
| 1049 | 1049 | $orX->add( |
| 1050 | 1050 | $expr->andX( |
| 1051 | - $expr->gte($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 1051 | + $expr->gte($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 1052 | 1052 | ) |
| 1053 | 1053 | ); |
| 1054 | 1054 | |
@@ -1056,7 +1056,7 @@ discard block |
||
| 1056 | 1056 | $orX->add( |
| 1057 | 1057 | $expr->andX( |
| 1058 | 1058 | $this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $alias), |
| 1059 | - $expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
| 1059 | + $expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
| 1060 | 1060 | ) |
| 1061 | 1061 | ); |
| 1062 | 1062 | } |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | } |
| 1066 | 1066 | if ($this->getBool('canBeVisitor', $options, false)) { |
| 1067 | 1067 | // TODO: should find a better way, also filter on remote initiator on non-federated ? |
| 1068 | - $orX->add($expr->gte($alias . '.config', $this->createNamedParameter(0))); |
|
| 1068 | + $orX->add($expr->gte($alias.'.config', $this->createNamedParameter(0))); |
|
| 1069 | 1069 | } |
| 1070 | 1070 | if ($this->getBool('canBeVisitorOnOpen', $options, false)) { |
| 1071 | 1071 | $andOpen = $expr->andX(); |
@@ -1133,21 +1133,21 @@ discard block |
||
| 1133 | 1133 | $expr = $this->expr(); |
| 1134 | 1134 | $andPassive = $expr->andX(); |
| 1135 | 1135 | $andPassive->add( |
| 1136 | - $expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 1136 | + $expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 1137 | 1137 | ); |
| 1138 | 1138 | |
| 1139 | 1139 | $orMemberOrLevel = $expr->orX(); |
| 1140 | 1140 | $orMemberOrLevel->add( |
| 1141 | - $expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance') |
|
| 1141 | + $expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance') |
|
| 1142 | 1142 | ); |
| 1143 | 1143 | // TODO: do we need this ? (display members from the local instance) |
| 1144 | 1144 | $orMemberOrLevel->add( |
| 1145 | - $expr->emptyString($this->getDefaultSelectAlias() . '.instance') |
|
| 1145 | + $expr->emptyString($this->getDefaultSelectAlias().'.instance') |
|
| 1146 | 1146 | ); |
| 1147 | 1147 | |
| 1148 | 1148 | $orMemberOrLevel->add( |
| 1149 | 1149 | $expr->eq( |
| 1150 | - $this->getDefaultSelectAlias() . '.level', |
|
| 1150 | + $this->getDefaultSelectAlias().'.level', |
|
| 1151 | 1151 | $this->createNamedParameter(Member::LEVEL_OWNER) |
| 1152 | 1152 | ) |
| 1153 | 1153 | ); |
@@ -1185,11 +1185,11 @@ discard block |
||
| 1185 | 1185 | ) |
| 1186 | 1186 | ->leftJoin( |
| 1187 | 1187 | $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache, |
| 1188 | - $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid') |
|
| 1188 | + $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid') |
|
| 1189 | 1189 | ) |
| 1190 | 1190 | ->leftJoin( |
| 1191 | 1191 | $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages, |
| 1192 | - $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id') |
|
| 1192 | + $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id') |
|
| 1193 | 1193 | ); |
| 1194 | 1194 | } |
| 1195 | 1195 | |
@@ -1211,8 +1211,8 @@ discard block |
||
| 1211 | 1211 | $this->leftJoin( |
| 1212 | 1212 | $aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild, |
| 1213 | 1213 | $expr->andX( |
| 1214 | - $expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'), |
|
| 1215 | - $expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id') |
|
| 1214 | + $expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'), |
|
| 1215 | + $expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id') |
|
| 1216 | 1216 | ) |
| 1217 | 1217 | ); |
| 1218 | 1218 | |
@@ -1262,13 +1262,13 @@ discard block |
||
| 1262 | 1262 | $this->leftJoin( |
| 1263 | 1263 | $aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint, |
| 1264 | 1264 | $expr->andX( |
| 1265 | - $expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'), |
|
| 1266 | - $expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id') |
|
| 1265 | + $expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'), |
|
| 1266 | + $expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id') |
|
| 1267 | 1267 | ) |
| 1268 | 1268 | ); |
| 1269 | 1269 | |
| 1270 | - $this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint'); |
|
| 1271 | - $this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash'); |
|
| 1270 | + $this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint'); |
|
| 1271 | + $this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash'); |
|
| 1272 | 1272 | } |
| 1273 | 1273 | |
| 1274 | 1274 | |
@@ -1372,10 +1372,10 @@ discard block |
||
| 1372 | 1372 | */ |
| 1373 | 1373 | public function generateAlias(string $base, string $extension, ?array &$options = []): string { |
| 1374 | 1374 | $search = str_replace('_', '.', $base); |
| 1375 | - $path = $search . '.' . $extension; |
|
| 1375 | + $path = $search.'.'.$extension; |
|
| 1376 | 1376 | if (!$this->validKey($path, self::$SQL_PATH) |
| 1377 | 1377 | && !in_array($extension, $this->getArray($search, self::$SQL_PATH))) { |
| 1378 | - throw new RequestBuilderException($extension . ' not found in ' . $search); |
|
| 1378 | + throw new RequestBuilderException($extension.' not found in '.$search); |
|
| 1379 | 1379 | } |
| 1380 | 1380 | |
| 1381 | 1381 | if (!is_array($options)) { |
@@ -1384,15 +1384,15 @@ discard block |
||
| 1384 | 1384 | |
| 1385 | 1385 | $optionPath = ''; |
| 1386 | 1386 | foreach (explode('.', $path) as $p) { |
| 1387 | - $optionPath = trim($optionPath . '.' . $p, '.'); |
|
| 1387 | + $optionPath = trim($optionPath.'.'.$p, '.'); |
|
| 1388 | 1388 | $options = array_merge( |
| 1389 | 1389 | $options, |
| 1390 | - $this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH), |
|
| 1391 | - $this->getArray($optionPath . '.' . self::OPTIONS, $this->options) |
|
| 1390 | + $this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH), |
|
| 1391 | + $this->getArray($optionPath.'.'.self::OPTIONS, $this->options) |
|
| 1392 | 1392 | ); |
| 1393 | 1393 | } |
| 1394 | 1394 | |
| 1395 | - return $base . '_' . $extension; |
|
| 1395 | + return $base.'_'.$extension; |
|
| 1396 | 1396 | } |
| 1397 | 1397 | |
| 1398 | 1398 | |
@@ -1412,7 +1412,7 @@ discard block |
||
| 1412 | 1412 | } else { |
| 1413 | 1413 | $k = $arr; |
| 1414 | 1414 | } |
| 1415 | - $path[$k] = $prefix . '_' . $k . '_'; |
|
| 1415 | + $path[$k] = $prefix.'_'.$k.'_'; |
|
| 1416 | 1416 | } |
| 1417 | 1417 | |
| 1418 | 1418 | return $path; |