@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | * @throws SingleCircleNotFoundException |
259 | 259 | */ |
260 | 260 | public function syncNextcloudUser(string $userId): FederatedUser { |
261 | - $this->outputService->output('Syncing Nextcloud User \'' . $userId . '\'', true); |
|
261 | + $this->outputService->output('Syncing Nextcloud User \''.$userId.'\'', true); |
|
262 | 262 | |
263 | 263 | return $this->federatedUserService->getLocalFederatedUser($userId); |
264 | 264 | } |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | * @throws RequestBuilderException |
303 | 303 | */ |
304 | 304 | public function syncNextcloudGroup(string $groupId): Circle { |
305 | - $this->outputService->output('Syncing Nextcloud Group \'' . $groupId . '\'', true); |
|
305 | + $this->outputService->output('Syncing Nextcloud Group \''.$groupId.'\'', true); |
|
306 | 306 | |
307 | 307 | $circle = $this->federatedUserService->getGroupCircle($groupId); |
308 | 308 | $group = $this->groupManager->get($groupId); |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | */ |
377 | 377 | public function groupDeleted(string $groupId): void { |
378 | 378 | $circle = new Circle(); |
379 | - $circle->setName('group:' . $groupId) |
|
379 | + $circle->setName('group:'.$groupId) |
|
380 | 380 | ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN) |
381 | 381 | ->setSource(Member::TYPE_GROUP); |
382 | 382 | |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | continue; |
530 | 530 | } |
531 | 531 | |
532 | - echo 'NO NON ' . json_encode($circle) . "\n"; |
|
532 | + echo 'NO NON '.json_encode($circle)."\n"; |
|
533 | 533 | } |
534 | 534 | } |
535 | 535 |
@@ -320,18 +320,18 @@ |
||
320 | 320 | * @throws MembershipNotFoundException |
321 | 321 | */ |
322 | 322 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
323 | - if ($this->get($prefix . 'single_id', $data) === '') { |
|
323 | + if ($this->get($prefix.'single_id', $data) === '') { |
|
324 | 324 | throw new MembershipNotFoundException(); |
325 | 325 | } |
326 | 326 | |
327 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
328 | - $this->setCircleId($this->get($prefix . 'circle_id', $data)); |
|
329 | - $this->setLevel($this->getInt($prefix . 'level', $data)); |
|
330 | - $this->setCircleConfig($this->getInt($prefix . 'circle_config', $data)); |
|
331 | - $this->setInheritanceFirst($this->get($prefix . 'inheritance_first', $data)); |
|
332 | - $this->setInheritanceLast($this->get($prefix . 'inheritance_last', $data)); |
|
333 | - $this->setInheritancePath($this->getArray($prefix . 'inheritance_path', $data)); |
|
334 | - $this->setInheritanceDepth($this->getInt($prefix . 'inheritance_depth', $data)); |
|
327 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
328 | + $this->setCircleId($this->get($prefix.'circle_id', $data)); |
|
329 | + $this->setLevel($this->getInt($prefix.'level', $data)); |
|
330 | + $this->setCircleConfig($this->getInt($prefix.'circle_config', $data)); |
|
331 | + $this->setInheritanceFirst($this->get($prefix.'inheritance_first', $data)); |
|
332 | + $this->setInheritanceLast($this->get($prefix.'inheritance_last', $data)); |
|
333 | + $this->setInheritancePath($this->getArray($prefix.'inheritance_path', $data)); |
|
334 | + $this->setInheritanceDepth($this->getInt($prefix.'inheritance_depth', $data)); |
|
335 | 335 | |
336 | 336 | $this->getManager()->manageImportFromDatabase($this, $data, $prefix); |
337 | 337 |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | } |
403 | 403 | |
404 | 404 | if ($circle->getDisplayName() !== '') { |
405 | - $this->searchInDBField('display_name', '%' . $circle->getDisplayName() . '%'); |
|
405 | + $this->searchInDBField('display_name', '%'.$circle->getDisplayName().'%'); |
|
406 | 406 | } |
407 | 407 | if ($circle->getSource() > 0) { |
408 | 408 | $this->limitInt('source', $circle->getSource()); |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | $this->generateRemoteInstanceSelectAlias($aliasRemoteInstance) |
425 | 425 | ->leftJoin( |
426 | 426 | $alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance, |
427 | - $expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance') |
|
427 | + $expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance') |
|
428 | 428 | ); |
429 | 429 | } catch (RequestBuilderException $e) { |
430 | 430 | } |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | $expr = $this->expr(); |
477 | 477 | $this->leftJoin( |
478 | 478 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote, |
479 | - $expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
479 | + $expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
480 | 480 | ); |
481 | 481 | } |
482 | 482 | |
@@ -504,12 +504,12 @@ discard block |
||
504 | 504 | $this->leftJoin( |
505 | 505 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember, |
506 | 506 | $expr->andX( |
507 | - $expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'), |
|
507 | + $expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'), |
|
508 | 508 | $expr->eq( |
509 | - $aliasRemoteMember . '.instance', |
|
509 | + $aliasRemoteMember.'.instance', |
|
510 | 510 | $this->createNamedParameter($remoteInstance->getInstance()) |
511 | 511 | ), |
512 | - $expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
512 | + $expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
513 | 513 | ) |
514 | 514 | ); |
515 | 515 | } |
@@ -541,21 +541,21 @@ discard block |
||
541 | 541 | $this->leftJoin( |
542 | 542 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle, |
543 | 543 | $expr->andX( |
544 | - $expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'), |
|
545 | - $expr->emptyString($aliasRemoteCircle . '.instance'), |
|
546 | - $expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
544 | + $expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'), |
|
545 | + $expr->emptyString($aliasRemoteCircle.'.instance'), |
|
546 | + $expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
547 | 547 | ) |
548 | 548 | ); |
549 | 549 | $this->leftJoin( |
550 | 550 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner, |
551 | 551 | $expr->andX( |
552 | - $expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'), |
|
552 | + $expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'), |
|
553 | 553 | $expr->eq( |
554 | - $aliasRemoteCircleOwner . '.instance', |
|
554 | + $aliasRemoteCircleOwner.'.instance', |
|
555 | 555 | $this->createNamedParameter($remoteInstance->getInstance()) |
556 | 556 | ), |
557 | 557 | $expr->eq( |
558 | - $aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
558 | + $aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
559 | 559 | ) |
560 | 560 | ) |
561 | 561 | ); |
@@ -588,16 +588,16 @@ discard block |
||
588 | 588 | $expr = $this->expr(); |
589 | 589 | $orX = $expr->orX(); |
590 | 590 | $orX->add( |
591 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
591 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
592 | 592 | ); |
593 | 593 | |
594 | 594 | $orExtOrPassive = $expr->orX(); |
595 | 595 | $orExtOrPassive->add( |
596 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
596 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
597 | 597 | ); |
598 | 598 | if (!$sensitive) { |
599 | 599 | $orExtOrPassive->add( |
600 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
600 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
601 | 601 | ); |
602 | 602 | } else { |
603 | 603 | if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) { |
@@ -606,8 +606,8 @@ discard block |
||
606 | 606 | } |
607 | 607 | |
608 | 608 | $orInstance = $expr->orX(); |
609 | - $orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance')); |
|
610 | - $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance')); |
|
609 | + $orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance')); |
|
610 | + $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance')); |
|
611 | 611 | |
612 | 612 | $andExternal = $expr->andX(); |
613 | 613 | $andExternal->add($orExtOrPassive); |
@@ -616,13 +616,13 @@ discard block |
||
616 | 616 | $orExtOrTrusted = $expr->orX(); |
617 | 617 | $orExtOrTrusted->add($andExternal); |
618 | 618 | $orExtOrTrusted->add( |
619 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
619 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
620 | 620 | ); |
621 | 621 | |
622 | 622 | $andTrusted = $expr->andX(); |
623 | 623 | $andTrusted->add($orExtOrTrusted); |
624 | 624 | $andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle)); |
625 | - $andTrusted->add($expr->emptyString($aliasOwner . '.instance')); |
|
625 | + $andTrusted->add($expr->emptyString($aliasOwner.'.instance')); |
|
626 | 626 | $orX->add($andTrusted); |
627 | 627 | |
628 | 628 | $this->andWhere($orX); |
@@ -649,7 +649,7 @@ discard block |
||
649 | 649 | } |
650 | 650 | $this->innerJoin( |
651 | 651 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
652 | - $expr->eq($aliasMember . '.circle_id', $alias . '.unique_id') |
|
652 | + $expr->eq($aliasMember.'.circle_id', $alias.'.unique_id') |
|
653 | 653 | ); |
654 | 654 | |
655 | 655 | $this->filterDirectMembership($aliasMember, $member); |
@@ -670,19 +670,19 @@ discard block |
||
670 | 670 | |
671 | 671 | if ($member->getUserId() !== '') { |
672 | 672 | $andX->add( |
673 | - $expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId())) |
|
673 | + $expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId())) |
|
674 | 674 | ); |
675 | 675 | } |
676 | 676 | |
677 | 677 | if ($member->getSingleId() !== '') { |
678 | 678 | $andX->add( |
679 | - $expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId())) |
|
679 | + $expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId())) |
|
680 | 680 | ); |
681 | 681 | } |
682 | 682 | |
683 | 683 | if ($member->getUserType() > 0) { |
684 | 684 | $andX->add( |
685 | - $expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType())) |
|
685 | + $expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType())) |
|
686 | 686 | ); |
687 | 687 | } |
688 | 688 | |
@@ -691,7 +691,7 @@ discard block |
||
691 | 691 | if ($member->getLevel() > 0) { |
692 | 692 | $andX->add( |
693 | 693 | $expr->gte( |
694 | - $aliasMember . '.level', |
|
694 | + $aliasMember.'.level', |
|
695 | 695 | $this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT) |
696 | 696 | ) |
697 | 697 | ); |
@@ -732,7 +732,7 @@ discard block |
||
732 | 732 | $helperAlias, |
733 | 733 | CoreRequestBuilder::TABLE_CIRCLE, |
734 | 734 | $aliasCircle, |
735 | - $expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field) |
|
735 | + $expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field) |
|
736 | 736 | ); |
737 | 737 | |
738 | 738 | if (!is_null($initiator)) { |
@@ -762,8 +762,8 @@ discard block |
||
762 | 762 | ->leftJoin( |
763 | 763 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
764 | 764 | $expr->andX( |
765 | - $expr->eq($alias . '.' . $circleId, $aliasInheritedBy . '.circle_id'), |
|
766 | - $expr->eq($alias . '.' . $singleId, $aliasInheritedBy . '.single_id') |
|
765 | + $expr->eq($alias.'.'.$circleId, $aliasInheritedBy.'.circle_id'), |
|
766 | + $expr->eq($alias.'.'.$singleId, $aliasInheritedBy.'.single_id') |
|
767 | 767 | ) |
768 | 768 | ); |
769 | 769 | } |
@@ -789,7 +789,7 @@ discard block |
||
789 | 789 | $this->generateCircleSelectAlias($aliasInvitedBy) |
790 | 790 | ->leftJoin( |
791 | 791 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy, |
792 | - $expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id') |
|
792 | + $expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id') |
|
793 | 793 | ); |
794 | 794 | |
795 | 795 | $this->leftJoinOwner($aliasInvitedBy); |
@@ -820,7 +820,7 @@ discard block |
||
820 | 820 | $this->generateCircleSelectAlias($aliasBasedOn) |
821 | 821 | ->leftJoin( |
822 | 822 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn, |
823 | - $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id') |
|
823 | + $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id') |
|
824 | 824 | ); |
825 | 825 | |
826 | 826 | if (!is_null($initiator)) { |
@@ -853,9 +853,9 @@ discard block |
||
853 | 853 | ->leftJoin( |
854 | 854 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
855 | 855 | $expr->andX( |
856 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field), |
|
856 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field), |
|
857 | 857 | $expr->eq( |
858 | - $aliasMember . '.level', |
|
858 | + $aliasMember.'.level', |
|
859 | 859 | $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT) |
860 | 860 | ) |
861 | 861 | ) |
@@ -893,10 +893,10 @@ discard block |
||
893 | 893 | ->leftJoin( |
894 | 894 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
895 | 895 | $expr->andX( |
896 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId), |
|
897 | - $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId), |
|
896 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId), |
|
897 | + $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId), |
|
898 | 898 | $expr->gte( |
899 | - $aliasMember . '.level', |
|
899 | + $aliasMember.'.level', |
|
900 | 900 | $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT) |
901 | 901 | ) |
902 | 902 | ) |
@@ -929,7 +929,7 @@ discard block |
||
929 | 929 | |
930 | 930 | $this->leftJoin( |
931 | 931 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
932 | - $expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field) |
|
932 | + $expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field) |
|
933 | 933 | ); |
934 | 934 | |
935 | 935 | // if (!$this->getBool('getData', $options, false)) { |
@@ -943,8 +943,8 @@ discard block |
||
943 | 943 | ->leftJoin( |
944 | 944 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
945 | 945 | $expr->andX( |
946 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'), |
|
947 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id') |
|
946 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'), |
|
947 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id') |
|
948 | 948 | ) |
949 | 949 | ); |
950 | 950 | |
@@ -961,12 +961,12 @@ discard block |
||
961 | 961 | $aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options); |
962 | 962 | $this->leftJoin( |
963 | 963 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership, |
964 | - $expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId)) |
|
964 | + $expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId)) |
|
965 | 965 | ); |
966 | 966 | |
967 | 967 | $orX = $expr->orX( |
968 | - $expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field), |
|
969 | - $expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId)) |
|
968 | + $expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field), |
|
969 | + $expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId)) |
|
970 | 970 | ); |
971 | 971 | |
972 | 972 | $this->andWhere($orX); |
@@ -987,11 +987,11 @@ discard block |
||
987 | 987 | |
988 | 988 | $expr = $this->expr(); |
989 | 989 | $aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS); |
990 | - $this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId))); |
|
990 | + $this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId))); |
|
991 | 991 | if ($level > 1) { |
992 | 992 | $this->andWhere( |
993 | 993 | $expr->gte( |
994 | - $aliasMembership . '.level', |
|
994 | + $aliasMembership.'.level', |
|
995 | 995 | $this->createNamedParameter($level, IQueryBuilder::PARAM_INT) |
996 | 996 | ) |
997 | 997 | ); |
@@ -1019,8 +1019,8 @@ discard block |
||
1019 | 1019 | $this->leftJoin( |
1020 | 1020 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
1021 | 1021 | $expr->andX( |
1022 | - $expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field), |
|
1023 | - $expr->eq($aliasMembership . '.single_id', $alias . '.single_id') |
|
1022 | + $expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field), |
|
1023 | + $expr->eq($aliasMembership.'.single_id', $alias.'.single_id') |
|
1024 | 1024 | ) |
1025 | 1025 | ); |
1026 | 1026 | |
@@ -1033,8 +1033,8 @@ discard block |
||
1033 | 1033 | ->leftJoin( |
1034 | 1034 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom, |
1035 | 1035 | $expr->andX( |
1036 | - $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'), |
|
1037 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id') |
|
1036 | + $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'), |
|
1037 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id') |
|
1038 | 1038 | ) |
1039 | 1039 | ); |
1040 | 1040 | } |
@@ -1074,7 +1074,7 @@ discard block |
||
1074 | 1074 | |
1075 | 1075 | $this->leftJoin( |
1076 | 1076 | $alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken, |
1077 | - $expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field) |
|
1077 | + $expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field) |
|
1078 | 1078 | ); |
1079 | 1079 | } |
1080 | 1080 | |
@@ -1116,14 +1116,14 @@ discard block |
||
1116 | 1116 | try { |
1117 | 1117 | $aliasConfig = $this->generateAlias($alias, self::CONFIG, $options); |
1118 | 1118 | $this->selectAlias( |
1119 | - $aliasConfig . '.config', |
|
1120 | - (($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'circle_config' |
|
1119 | + $aliasConfig.'.config', |
|
1120 | + (($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'circle_config' |
|
1121 | 1121 | ); |
1122 | 1122 | $this->leftJoin( |
1123 | 1123 | $alias, |
1124 | 1124 | CoreRequestBuilder::TABLE_CIRCLE, |
1125 | 1125 | $aliasConfig, |
1126 | - $expr->eq($alias . '.circle_id', $aliasConfig . '.unique_id') |
|
1126 | + $expr->eq($alias.'.circle_id', $aliasConfig.'.unique_id') |
|
1127 | 1127 | ); |
1128 | 1128 | } catch (RequestBuilderException $e) { |
1129 | 1129 | } |
@@ -1161,7 +1161,7 @@ discard block |
||
1161 | 1161 | $aliasMembership, |
1162 | 1162 | $expr->andX( |
1163 | 1163 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership), |
1164 | - $expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field) |
|
1164 | + $expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field) |
|
1165 | 1165 | ) |
1166 | 1166 | ); |
1167 | 1167 | |
@@ -1180,11 +1180,11 @@ discard block |
||
1180 | 1180 | $aliasMembershipCircle = $this->generateAlias($aliasMembership, self::CONFIG, $options); |
1181 | 1181 | $orXMembershipCircle = $expr->orX(); |
1182 | 1182 | array_map( |
1183 | - function (string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) { |
|
1183 | + function(string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) { |
|
1184 | 1184 | $orXMembershipCircle->add( |
1185 | 1185 | $this->expr()->eq( |
1186 | - $alias . '.circle_id', |
|
1187 | - $aliasMembershipCircle . '.unique_id' |
|
1186 | + $alias.'.circle_id', |
|
1187 | + $aliasMembershipCircle.'.unique_id' |
|
1188 | 1188 | ) |
1189 | 1189 | ); |
1190 | 1190 | }, |
@@ -1216,7 +1216,7 @@ discard block |
||
1216 | 1216 | $aliasDirectInitiator, |
1217 | 1217 | $expr->andX( |
1218 | 1218 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirectInitiator), |
1219 | - $expr->eq($aliasDirectInitiator . '.circle_id', $helperAlias . '.' . $field) |
|
1219 | + $expr->eq($aliasDirectInitiator.'.circle_id', $helperAlias.'.'.$field) |
|
1220 | 1220 | ) |
1221 | 1221 | ); |
1222 | 1222 | } catch (RequestBuilderException $e) { |
@@ -1230,8 +1230,8 @@ discard block |
||
1230 | 1230 | $this->leftJoin( |
1231 | 1231 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator, |
1232 | 1232 | $expr->andX( |
1233 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'), |
|
1234 | - $expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id') |
|
1233 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'), |
|
1234 | + $expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id') |
|
1235 | 1235 | ) |
1236 | 1236 | ); |
1237 | 1237 | |
@@ -1239,8 +1239,8 @@ discard block |
||
1239 | 1239 | $this->leftJoin( |
1240 | 1240 | $aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
1241 | 1241 | $expr->andX( |
1242 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'), |
|
1243 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id') |
|
1242 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'), |
|
1243 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id') |
|
1244 | 1244 | ) |
1245 | 1245 | ); |
1246 | 1246 | |
@@ -1291,7 +1291,7 @@ discard block |
||
1291 | 1291 | $orX->add( |
1292 | 1292 | $expr->andX( |
1293 | 1293 | $this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle), |
1294 | - $expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
1294 | + $expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
1295 | 1295 | ) |
1296 | 1296 | ); |
1297 | 1297 | } |
@@ -1301,10 +1301,10 @@ discard block |
||
1301 | 1301 | $orXLevelCheck = $expr->orX(); |
1302 | 1302 | |
1303 | 1303 | array_map( |
1304 | - function (string $alias) use ($orXLevelCheck, $minimumLevel) { |
|
1304 | + function(string $alias) use ($orXLevelCheck, $minimumLevel) { |
|
1305 | 1305 | $orXLevelCheck->add( |
1306 | 1306 | $this->expr()->gte( |
1307 | - $alias . '.level', |
|
1307 | + $alias.'.level', |
|
1308 | 1308 | $this->createNamedParameter($minimumLevel) |
1309 | 1309 | ) |
1310 | 1310 | ); |
@@ -1394,21 +1394,21 @@ discard block |
||
1394 | 1394 | $expr = $this->expr(); |
1395 | 1395 | $andPassive = $expr->andX(); |
1396 | 1396 | $andPassive->add( |
1397 | - $expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1397 | + $expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1398 | 1398 | ); |
1399 | 1399 | |
1400 | 1400 | $orMemberOrLevel = $expr->orX(); |
1401 | 1401 | $orMemberOrLevel->add( |
1402 | - $expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance') |
|
1402 | + $expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance') |
|
1403 | 1403 | ); |
1404 | 1404 | // TODO: do we need this ? (display members from the local instance) |
1405 | 1405 | $orMemberOrLevel->add( |
1406 | - $expr->emptyString($this->getDefaultSelectAlias() . '.instance') |
|
1406 | + $expr->emptyString($this->getDefaultSelectAlias().'.instance') |
|
1407 | 1407 | ); |
1408 | 1408 | |
1409 | 1409 | $orMemberOrLevel->add( |
1410 | 1410 | $expr->eq( |
1411 | - $this->getDefaultSelectAlias() . '.level', |
|
1411 | + $this->getDefaultSelectAlias().'.level', |
|
1412 | 1412 | $this->createNamedParameter(Member::LEVEL_OWNER) |
1413 | 1413 | ) |
1414 | 1414 | ); |
@@ -1445,11 +1445,11 @@ discard block |
||
1445 | 1445 | ) |
1446 | 1446 | ->leftJoin( |
1447 | 1447 | $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache, |
1448 | - $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid') |
|
1448 | + $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid') |
|
1449 | 1449 | ) |
1450 | 1450 | ->leftJoin( |
1451 | 1451 | $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages, |
1452 | - $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id') |
|
1452 | + $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id') |
|
1453 | 1453 | ); |
1454 | 1454 | } |
1455 | 1455 | |
@@ -1471,8 +1471,8 @@ discard block |
||
1471 | 1471 | $this->leftJoin( |
1472 | 1472 | $aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild, |
1473 | 1473 | $expr->andX( |
1474 | - $expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'), |
|
1475 | - $expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id') |
|
1474 | + $expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'), |
|
1475 | + $expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id') |
|
1476 | 1476 | ) |
1477 | 1477 | ); |
1478 | 1478 | |
@@ -1522,13 +1522,13 @@ discard block |
||
1522 | 1522 | $this->leftJoin( |
1523 | 1523 | $aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint, |
1524 | 1524 | $expr->andX( |
1525 | - $expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'), |
|
1526 | - $expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id') |
|
1525 | + $expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'), |
|
1526 | + $expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id') |
|
1527 | 1527 | ) |
1528 | 1528 | ); |
1529 | 1529 | |
1530 | - $this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint'); |
|
1531 | - $this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash'); |
|
1530 | + $this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint'); |
|
1531 | + $this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash'); |
|
1532 | 1532 | } |
1533 | 1533 | |
1534 | 1534 | |
@@ -1632,10 +1632,10 @@ discard block |
||
1632 | 1632 | */ |
1633 | 1633 | public function generateAlias(string $base, string $extension, ?array &$options = []): string { |
1634 | 1634 | $search = str_replace('_', '.', $base); |
1635 | - $path = $search . '.' . $extension; |
|
1635 | + $path = $search.'.'.$extension; |
|
1636 | 1636 | if (!$this->validKey($path, self::$SQL_PATH) |
1637 | 1637 | && !in_array($extension, $this->getArray($search, self::$SQL_PATH))) { |
1638 | - throw new RequestBuilderException($extension . ' not found in ' . $search); |
|
1638 | + throw new RequestBuilderException($extension.' not found in '.$search); |
|
1639 | 1639 | } |
1640 | 1640 | |
1641 | 1641 | if (!is_array($options)) { |
@@ -1644,15 +1644,15 @@ discard block |
||
1644 | 1644 | |
1645 | 1645 | $optionPath = ''; |
1646 | 1646 | foreach (explode('.', $path) as $p) { |
1647 | - $optionPath = trim($optionPath . '.' . $p, '.'); |
|
1647 | + $optionPath = trim($optionPath.'.'.$p, '.'); |
|
1648 | 1648 | $options = array_merge( |
1649 | 1649 | $options, |
1650 | - $this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH), |
|
1651 | - $this->getArray($optionPath . '.' . self::OPTIONS, $this->options) |
|
1650 | + $this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH), |
|
1651 | + $this->getArray($optionPath.'.'.self::OPTIONS, $this->options) |
|
1652 | 1652 | ); |
1653 | 1653 | } |
1654 | 1654 | |
1655 | - return $base . '_' . $extension; |
|
1655 | + return $base.'_'.$extension; |
|
1656 | 1656 | } |
1657 | 1657 | |
1658 | 1658 | |
@@ -1672,7 +1672,7 @@ discard block |
||
1672 | 1672 | } else { |
1673 | 1673 | $k = $arr; |
1674 | 1674 | } |
1675 | - $path[$k] = $prefix . '_' . $k . '_'; |
|
1675 | + $path[$k] = $prefix.'_'.$k.'_'; |
|
1676 | 1676 | } |
1677 | 1677 | |
1678 | 1678 | return $path; |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | */ |
271 | 271 | private function getChildrenMembers(string $id, array &$knownIds = []): array { |
272 | 272 | $singleIds = array_map( |
273 | - function (Member $item): string { |
|
273 | + function(Member $item): string { |
|
274 | 274 | return $item->getSingleId(); |
275 | 275 | }, $this->memberRequest->getMembers($id) |
276 | 276 | ); |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | */ |
295 | 295 | private function getChildrenMemberships(string $id, array &$knownIds = []): array { |
296 | 296 | $singleIds = array_map( |
297 | - function (Membership $item): string { |
|
297 | + function(Membership $item): string { |
|
298 | 298 | return $item->getSingleId(); |
299 | 299 | }, $this->membershipRequest->getAccounted($id) |
300 | 300 | ); |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | */ |
349 | 349 | private function removeDeprecatedMemberships(array $memberships, array $known): array { |
350 | 350 | $circleIds = array_map( |
351 | - function (Membership $membership): string { |
|
351 | + function(Membership $membership): string { |
|
352 | 352 | return $membership->getCircleId(); |
353 | 353 | }, $memberships |
354 | 354 | ); |
@@ -465,7 +465,7 @@ discard block |
||
465 | 465 | // valid owner are the one based on an actual local user account. |
466 | 466 | // We do not need to check Circles that cannot be created from the OCS API. |
467 | 467 | $owners = array_filter( |
468 | - array_map(function (Membership $membership): ?Member { |
|
468 | + array_map(function(Membership $membership): ?Member { |
|
469 | 469 | if (!$membership->hasCircle()) { |
470 | 470 | return null; |
471 | 471 | } |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | // with each accounted memberships |
485 | 485 | foreach ($federatedUser->getAccountedMemberships(true) as $accounted) { |
486 | 486 | $accountedMemberships = array_filter( |
487 | - array_map(function (Membership $membership): ?string { |
|
487 | + array_map(function(Membership $membership): ?string { |
|
488 | 488 | if ($membership->getCircle()->getSource() !== Member::TYPE_GROUP) { |
489 | 489 | return null; |
490 | 490 | } |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | |
496 | 496 | foreach ($owners as $owner) { |
497 | 497 | $ownerMemberships = array_filter( |
498 | - array_map(function (Membership $membership): ?string { |
|
498 | + array_map(function(Membership $membership): ?string { |
|
499 | 499 | if ($membership->getCircle()->getSource() !== Member::TYPE_GROUP) { |
500 | 500 | return null; |
501 | 501 | } |