@@ -260,18 +260,18 @@ |
||
260 | 260 | * @throws SyncedItemNotFoundException |
261 | 261 | */ |
262 | 262 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
263 | - if ($this->get($prefix . 'single_id', $data) === '') { |
|
263 | + if ($this->get($prefix.'single_id', $data) === '') { |
|
264 | 264 | throw new SyncedItemNotFoundException(); |
265 | 265 | } |
266 | 266 | |
267 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
268 | - $this->setInstance($this->get($prefix . 'instance', $data)); |
|
269 | - $this->setInstance($this->get($prefix . 'instance', $data)); |
|
270 | - $this->setAppId($this->get($prefix . 'app_id', $data)); |
|
271 | - $this->setItemType($this->get($prefix . 'item_type', $data)); |
|
272 | - $this->setItemId($this->get($prefix . 'item_id', $data)); |
|
273 | - $this->setChecksum($this->get($prefix . 'checksum', $data)); |
|
274 | - $this->setDeleted($this->getBool($prefix . 'deleted', $data)); |
|
267 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
268 | + $this->setInstance($this->get($prefix.'instance', $data)); |
|
269 | + $this->setInstance($this->get($prefix.'instance', $data)); |
|
270 | + $this->setAppId($this->get($prefix.'app_id', $data)); |
|
271 | + $this->setItemType($this->get($prefix.'item_type', $data)); |
|
272 | + $this->setItemId($this->get($prefix.'item_id', $data)); |
|
273 | + $this->setChecksum($this->get($prefix.'checksum', $data)); |
|
274 | + $this->setDeleted($this->getBool($prefix.'deleted', $data)); |
|
275 | 275 | |
276 | 276 | if ($this->getInstance() === '') { |
277 | 277 | $this->setInstance($this->getManager()->getLocalInstance()); |
@@ -133,12 +133,12 @@ |
||
133 | 133 | * @throws SyncedShareNotFoundException |
134 | 134 | */ |
135 | 135 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
136 | - if ($this->get($prefix . 'single_id', $data) === '') { |
|
136 | + if ($this->get($prefix.'single_id', $data) === '') { |
|
137 | 137 | throw new SyncedShareNotFoundException(); |
138 | 138 | } |
139 | 139 | |
140 | - $this->setCircleId($this->get($prefix . 'circle_id', $data)); |
|
141 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
140 | + $this->setCircleId($this->get($prefix.'circle_id', $data)); |
|
141 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
142 | 142 | |
143 | 143 | return $this; |
144 | 144 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | try { |
235 | 235 | $reflection = new ReflectionClass($class); |
236 | 236 | } catch (ReflectionException $e) { |
237 | - throw new InvalidItemException('reflection issue with ' . $class); |
|
237 | + throw new InvalidItemException('reflection issue with '.$class); |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | if (!$reflection->implementsInterface(IDeserializable::class)) { |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | * @return string |
355 | 355 | */ |
356 | 356 | private function getRef(string $key, string $ref): string { |
357 | - return $this->get($key . '.' . $ref, $this->ref); |
|
357 | + return $this->get($key.'.'.$ref, $this->ref); |
|
358 | 358 | } |
359 | 359 | |
360 | 360 | /** |
@@ -242,16 +242,16 @@ |
||
242 | 242 | * @throws InvalidItemException |
243 | 243 | */ |
244 | 244 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
245 | - if (empty($this->getArray($prefix . 'debug', $data))) { |
|
245 | + if (empty($this->getArray($prefix.'debug', $data))) { |
|
246 | 246 | throw new InvalidItemException(); |
247 | 247 | } |
248 | 248 | |
249 | - $this->setId($this->getInt($prefix . 'id', $data)); |
|
250 | - $this->setThread($this->get($prefix . 'thread', $data)); |
|
251 | - $this->setType($this->get($prefix . 'type', $data)); |
|
252 | - $this->setCircleId($this->get($prefix . 'circle_id', $data)); |
|
253 | - $this->setInstance($this->get($prefix . 'instance', $data)); |
|
254 | - $this->setTime($this->getInt($prefix . 'time', $data)); |
|
249 | + $this->setId($this->getInt($prefix.'id', $data)); |
|
250 | + $this->setThread($this->get($prefix.'thread', $data)); |
|
251 | + $this->setType($this->get($prefix.'type', $data)); |
|
252 | + $this->setCircleId($this->get($prefix.'circle_id', $data)); |
|
253 | + $this->setInstance($this->get($prefix.'instance', $data)); |
|
254 | + $this->setTime($this->getInt($prefix.'time', $data)); |
|
255 | 255 | |
256 | 256 | /** @var ReferencedDataStore $store */ |
257 | 257 | $store = $this->deserialize($this->getArray('debug', $data), ReferencedDataStore::class); |
@@ -145,7 +145,7 @@ |
||
145 | 145 | |
146 | 146 | $msg = $e->getMessage(); |
147 | 147 | $store = new ReferencedDataStore(); |
148 | - $store->s(self::ACTION, '{?' . self::E_CLASS . '}' . (($msg !== '') ? ' (' . $msg . ')' : '')); |
|
148 | + $store->s(self::ACTION, '{?'.self::E_CLASS.'}'.(($msg !== '') ? ' ('.$msg.')' : '')); |
|
149 | 149 | $store->s(self::E_CLASS, get_class($e)); |
150 | 150 | $store->s(self::EXCEPTION, $e->getMessage()); |
151 | 151 | $store->sArray(self::E_TRACE, debug_backtrace()); |
@@ -134,7 +134,7 @@ |
||
134 | 134 | */ |
135 | 135 | public function extractObjectFromRequest( |
136 | 136 | string $class, |
137 | - ?NCSignedRequest &$signed = null |
|
137 | + ?NCSignedRequest & $signed = null |
|
138 | 138 | ): IDeserializable { |
139 | 139 | $signed = $this->remoteStreamService->incomingSignedRequest(); |
140 | 140 | $this->confirmRemoteInstance($signed); |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | public function confirmRemoteInstanceAccess(string $syncedId, string $instance): void { |
286 | 286 | $circleIds = array_values( |
287 | 287 | array_map( |
288 | - function (SyncedShare $share): string { |
|
288 | + function(SyncedShare $share): string { |
|
289 | 289 | return $share->getCircleId(); |
290 | 290 | }, |
291 | 291 | $this->syncedShareRequest->getShares($syncedId) |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | // federated circles only works as root, so sub-circles cannot spread on multiple instances. |
298 | 298 | $links = $this->memberRequest->getLinksWithInstance($instance, $circleIds); |
299 | 299 | $this->debugService->info( |
300 | - 'SyncedItem {singleId} is shared to ' . count($circleIds) . ' circles', '', |
|
300 | + 'SyncedItem {singleId} is shared to '.count($circleIds).' circles', '', |
|
301 | 301 | [ |
302 | 302 | 'syncedId' => $syncedId, |
303 | 303 | 'circleIds' => $circleIds, |
@@ -416,7 +416,7 @@ discard block |
||
416 | 416 | } |
417 | 417 | |
418 | 418 | if ($circle->getDisplayName() !== '') { |
419 | - $this->searchInDBField('display_name', '%' . $circle->getDisplayName() . '%'); |
|
419 | + $this->searchInDBField('display_name', '%'.$circle->getDisplayName().'%'); |
|
420 | 420 | } |
421 | 421 | if ($circle->getSource() > 0) { |
422 | 422 | $this->limitInt('source', $circle->getSource()); |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | $this->generateRemoteInstanceSelectAlias($aliasRemoteInstance) |
439 | 439 | ->leftJoin( |
440 | 440 | $alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance, |
441 | - $expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance') |
|
441 | + $expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance') |
|
442 | 442 | ); |
443 | 443 | } catch (RequestBuilderException $e) { |
444 | 444 | } |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | $expr = $this->expr(); |
491 | 491 | $this->leftJoin( |
492 | 492 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote, |
493 | - $expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
493 | + $expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
494 | 494 | ); |
495 | 495 | } |
496 | 496 | |
@@ -518,12 +518,12 @@ discard block |
||
518 | 518 | $this->leftJoin( |
519 | 519 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember, |
520 | 520 | $expr->andX( |
521 | - $expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'), |
|
521 | + $expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'), |
|
522 | 522 | $expr->eq( |
523 | - $aliasRemoteMember . '.instance', |
|
523 | + $aliasRemoteMember.'.instance', |
|
524 | 524 | $this->createNamedParameter($remoteInstance->getInstance()) |
525 | 525 | ), |
526 | - $expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
526 | + $expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
527 | 527 | ) |
528 | 528 | ); |
529 | 529 | } |
@@ -555,21 +555,21 @@ discard block |
||
555 | 555 | $this->leftJoin( |
556 | 556 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle, |
557 | 557 | $expr->andX( |
558 | - $expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'), |
|
559 | - $expr->emptyString($aliasRemoteCircle . '.instance'), |
|
560 | - $expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
558 | + $expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'), |
|
559 | + $expr->emptyString($aliasRemoteCircle.'.instance'), |
|
560 | + $expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
561 | 561 | ) |
562 | 562 | ); |
563 | 563 | $this->leftJoin( |
564 | 564 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner, |
565 | 565 | $expr->andX( |
566 | - $expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'), |
|
566 | + $expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'), |
|
567 | 567 | $expr->eq( |
568 | - $aliasRemoteCircleOwner . '.instance', |
|
568 | + $aliasRemoteCircleOwner.'.instance', |
|
569 | 569 | $this->createNamedParameter($remoteInstance->getInstance()) |
570 | 570 | ), |
571 | 571 | $expr->eq( |
572 | - $aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
572 | + $aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
573 | 573 | ) |
574 | 574 | ) |
575 | 575 | ); |
@@ -602,16 +602,16 @@ discard block |
||
602 | 602 | $expr = $this->expr(); |
603 | 603 | $orX = $expr->orX(); |
604 | 604 | $orX->add( |
605 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
605 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
606 | 606 | ); |
607 | 607 | |
608 | 608 | $orExtOrPassive = $expr->orX(); |
609 | 609 | $orExtOrPassive->add( |
610 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
610 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
611 | 611 | ); |
612 | 612 | if (!$sensitive) { |
613 | 613 | $orExtOrPassive->add( |
614 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
614 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
615 | 615 | ); |
616 | 616 | } else { |
617 | 617 | if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) { |
@@ -620,8 +620,8 @@ discard block |
||
620 | 620 | } |
621 | 621 | |
622 | 622 | $orInstance = $expr->orX(); |
623 | - $orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance')); |
|
624 | - $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance')); |
|
623 | + $orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance')); |
|
624 | + $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance')); |
|
625 | 625 | |
626 | 626 | $andExternal = $expr->andX(); |
627 | 627 | $andExternal->add($orExtOrPassive); |
@@ -630,13 +630,13 @@ discard block |
||
630 | 630 | $orExtOrTrusted = $expr->orX(); |
631 | 631 | $orExtOrTrusted->add($andExternal); |
632 | 632 | $orExtOrTrusted->add( |
633 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
633 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
634 | 634 | ); |
635 | 635 | |
636 | 636 | $andTrusted = $expr->andX(); |
637 | 637 | $andTrusted->add($orExtOrTrusted); |
638 | 638 | $andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle)); |
639 | - $andTrusted->add($expr->emptyString($aliasOwner . '.instance')); |
|
639 | + $andTrusted->add($expr->emptyString($aliasOwner.'.instance')); |
|
640 | 640 | $orX->add($andTrusted); |
641 | 641 | |
642 | 642 | $this->andWhere($orX); |
@@ -663,7 +663,7 @@ discard block |
||
663 | 663 | } |
664 | 664 | $this->innerJoin( |
665 | 665 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
666 | - $expr->eq($aliasMember . '.circle_id', $alias . '.unique_id') |
|
666 | + $expr->eq($aliasMember.'.circle_id', $alias.'.unique_id') |
|
667 | 667 | ); |
668 | 668 | |
669 | 669 | $this->filterDirectMembership($aliasMember, $member); |
@@ -688,12 +688,12 @@ discard block |
||
688 | 688 | $aliasCircle, |
689 | 689 | 'circles_membership', |
690 | 690 | $aliasMembership, |
691 | - $this->expr()->eq($aliasCircle . '.unique_id', $aliasMembership . '.circle_id') |
|
691 | + $this->expr()->eq($aliasCircle.'.unique_id', $aliasMembership.'.circle_id') |
|
692 | 692 | ); |
693 | 693 | |
694 | 694 | $this->andWhere( |
695 | 695 | $this->expr()->eq( |
696 | - $aliasMembership . '.single_id', |
|
696 | + $aliasMembership.'.single_id', |
|
697 | 697 | $this->createNamedParameter($federatedUser->getSingleId()) |
698 | 698 | ) |
699 | 699 | ); |
@@ -714,19 +714,19 @@ discard block |
||
714 | 714 | |
715 | 715 | if ($member->getUserId() !== '') { |
716 | 716 | $andX->add( |
717 | - $expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId())) |
|
717 | + $expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId())) |
|
718 | 718 | ); |
719 | 719 | } |
720 | 720 | |
721 | 721 | if ($member->getSingleId() !== '') { |
722 | 722 | $andX->add( |
723 | - $expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId())) |
|
723 | + $expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId())) |
|
724 | 724 | ); |
725 | 725 | } |
726 | 726 | |
727 | 727 | if ($member->getUserType() > 0) { |
728 | 728 | $andX->add( |
729 | - $expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType())) |
|
729 | + $expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType())) |
|
730 | 730 | ); |
731 | 731 | } |
732 | 732 | |
@@ -735,7 +735,7 @@ discard block |
||
735 | 735 | if ($member->getLevel() > 0) { |
736 | 736 | $andX->add( |
737 | 737 | $expr->gte( |
738 | - $aliasMember . '.level', |
|
738 | + $aliasMember.'.level', |
|
739 | 739 | $this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT) |
740 | 740 | ) |
741 | 741 | ); |
@@ -776,7 +776,7 @@ discard block |
||
776 | 776 | $helperAlias, |
777 | 777 | CoreRequestBuilder::TABLE_CIRCLE, |
778 | 778 | $aliasCircle, |
779 | - $expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field) |
|
779 | + $expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field) |
|
780 | 780 | ); |
781 | 781 | |
782 | 782 | if (!is_null($initiator)) { |
@@ -807,7 +807,7 @@ discard block |
||
807 | 807 | $this->generateCircleSelectAlias($aliasInvitedBy) |
808 | 808 | ->leftJoin( |
809 | 809 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy, |
810 | - $expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id') |
|
810 | + $expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id') |
|
811 | 811 | ); |
812 | 812 | |
813 | 813 | $this->leftJoinOwner($aliasInvitedBy); |
@@ -838,7 +838,7 @@ discard block |
||
838 | 838 | $this->generateCircleSelectAlias($aliasBasedOn) |
839 | 839 | ->leftJoin( |
840 | 840 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn, |
841 | - $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id') |
|
841 | + $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id') |
|
842 | 842 | ); |
843 | 843 | |
844 | 844 | if (!is_null($initiator)) { |
@@ -871,9 +871,9 @@ discard block |
||
871 | 871 | ->leftJoin( |
872 | 872 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
873 | 873 | $expr->andX( |
874 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field), |
|
874 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field), |
|
875 | 875 | $expr->eq( |
876 | - $aliasMember . '.level', |
|
876 | + $aliasMember.'.level', |
|
877 | 877 | $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT) |
878 | 878 | ) |
879 | 879 | ) |
@@ -911,10 +911,10 @@ discard block |
||
911 | 911 | ->leftJoin( |
912 | 912 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
913 | 913 | $expr->andX( |
914 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId), |
|
915 | - $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId), |
|
914 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId), |
|
915 | + $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId), |
|
916 | 916 | $expr->gte( |
917 | - $aliasMember . '.level', |
|
917 | + $aliasMember.'.level', |
|
918 | 918 | $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT) |
919 | 919 | ) |
920 | 920 | ) |
@@ -947,7 +947,7 @@ discard block |
||
947 | 947 | |
948 | 948 | $this->leftJoin( |
949 | 949 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
950 | - $expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field) |
|
950 | + $expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field) |
|
951 | 951 | ); |
952 | 952 | |
953 | 953 | // if (!$this->getBool('getData', $options, false)) { |
@@ -961,8 +961,8 @@ discard block |
||
961 | 961 | ->leftJoin( |
962 | 962 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
963 | 963 | $expr->andX( |
964 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'), |
|
965 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id') |
|
964 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'), |
|
965 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id') |
|
966 | 966 | ) |
967 | 967 | ); |
968 | 968 | |
@@ -979,12 +979,12 @@ discard block |
||
979 | 979 | $aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options); |
980 | 980 | $this->leftJoin( |
981 | 981 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership, |
982 | - $expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId)) |
|
982 | + $expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId)) |
|
983 | 983 | ); |
984 | 984 | |
985 | 985 | $orX = $expr->orX( |
986 | - $expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field), |
|
987 | - $expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId)) |
|
986 | + $expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field), |
|
987 | + $expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId)) |
|
988 | 988 | ); |
989 | 989 | |
990 | 990 | $this->andWhere($orX); |
@@ -1005,11 +1005,11 @@ discard block |
||
1005 | 1005 | |
1006 | 1006 | $expr = $this->expr(); |
1007 | 1007 | $aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS); |
1008 | - $this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId))); |
|
1008 | + $this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId))); |
|
1009 | 1009 | if ($level > 1) { |
1010 | 1010 | $this->andWhere( |
1011 | 1011 | $expr->gte( |
1012 | - $aliasMembership . '.level', |
|
1012 | + $aliasMembership.'.level', |
|
1013 | 1013 | $this->createNamedParameter($level, IQueryBuilder::PARAM_INT) |
1014 | 1014 | ) |
1015 | 1015 | ); |
@@ -1037,8 +1037,8 @@ discard block |
||
1037 | 1037 | $this->leftJoin( |
1038 | 1038 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
1039 | 1039 | $expr->andX( |
1040 | - $expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field), |
|
1041 | - $expr->eq($aliasMembership . '.single_id', $alias . '.single_id') |
|
1040 | + $expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field), |
|
1041 | + $expr->eq($aliasMembership.'.single_id', $alias.'.single_id') |
|
1042 | 1042 | ) |
1043 | 1043 | ); |
1044 | 1044 | |
@@ -1051,8 +1051,8 @@ discard block |
||
1051 | 1051 | ->leftJoin( |
1052 | 1052 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom, |
1053 | 1053 | $expr->andX( |
1054 | - $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'), |
|
1055 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id') |
|
1054 | + $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'), |
|
1055 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id') |
|
1056 | 1056 | ) |
1057 | 1057 | ); |
1058 | 1058 | } |
@@ -1092,7 +1092,7 @@ discard block |
||
1092 | 1092 | |
1093 | 1093 | $this->leftJoin( |
1094 | 1094 | $alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken, |
1095 | - $expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field) |
|
1095 | + $expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field) |
|
1096 | 1096 | ); |
1097 | 1097 | } |
1098 | 1098 | |
@@ -1136,14 +1136,14 @@ discard block |
||
1136 | 1136 | try { |
1137 | 1137 | $aliasConfig = $this->generateAlias($alias, self::CONFIG, $options); |
1138 | 1138 | $this->selectAlias( |
1139 | - $aliasConfig . '.config', |
|
1140 | - (($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'circle_config' |
|
1139 | + $aliasConfig.'.config', |
|
1140 | + (($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'circle_config' |
|
1141 | 1141 | ); |
1142 | 1142 | $this->leftJoin( |
1143 | 1143 | $alias, |
1144 | 1144 | CoreRequestBuilder::TABLE_CIRCLE, |
1145 | 1145 | $aliasConfig, |
1146 | - $expr->eq($alias . '.circle_id', $aliasConfig . '.unique_id') |
|
1146 | + $expr->eq($alias.'.circle_id', $aliasConfig.'.unique_id') |
|
1147 | 1147 | ); |
1148 | 1148 | } catch (RequestBuilderException $e) { |
1149 | 1149 | } |
@@ -1173,7 +1173,7 @@ discard block |
||
1173 | 1173 | } |
1174 | 1174 | |
1175 | 1175 | if (!empty($helperMoreFields)) { |
1176 | - $helperMoreFields[] = $helperAlias . '.' . $field; |
|
1176 | + $helperMoreFields[] = $helperAlias.'.'.$field; |
|
1177 | 1177 | } |
1178 | 1178 | |
1179 | 1179 | $expr = $this->expr(); |
@@ -1184,7 +1184,7 @@ discard block |
||
1184 | 1184 | |
1185 | 1185 | $orXMembershipFields = $expr->orX(); |
1186 | 1186 | foreach ($helperMoreFields as $f) { |
1187 | - $orXMembershipFields->add($expr->eq($aliasMembership . '.circle_id', $f)); |
|
1187 | + $orXMembershipFields->add($expr->eq($aliasMembership.'.circle_id', $f)); |
|
1188 | 1188 | } |
1189 | 1189 | |
1190 | 1190 | $this->leftJoin( |
@@ -1194,8 +1194,7 @@ discard block |
||
1194 | 1194 | $expr->andX( |
1195 | 1195 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership), |
1196 | 1196 | (empty($helperMoreFields)) ? |
1197 | - $expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field) : |
|
1198 | - $orXMembershipFields |
|
1197 | + $expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field) : $orXMembershipFields |
|
1199 | 1198 | ) |
1200 | 1199 | ); |
1201 | 1200 | |
@@ -1214,11 +1213,11 @@ discard block |
||
1214 | 1213 | $aliasMembershipCircle = $this->generateAlias($aliasMembership, self::CONFIG, $options); |
1215 | 1214 | $orXMembershipCircle = $expr->orX(); |
1216 | 1215 | array_map( |
1217 | - function (string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) { |
|
1216 | + function(string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) { |
|
1218 | 1217 | $orXMembershipCircle->add( |
1219 | 1218 | $this->expr()->eq( |
1220 | - $alias . '.circle_id', |
|
1221 | - $aliasMembershipCircle . '.unique_id' |
|
1219 | + $alias.'.circle_id', |
|
1220 | + $aliasMembershipCircle.'.unique_id' |
|
1222 | 1221 | ) |
1223 | 1222 | ); |
1224 | 1223 | }, |
@@ -1246,7 +1245,7 @@ discard block |
||
1246 | 1245 | |
1247 | 1246 | $orXDirectFields = $expr->orX(); |
1248 | 1247 | foreach ($helperMoreFields as $f) { |
1249 | - $orXDirectFields->add($expr->eq($aliasMembership . '.circle_id', $f)); |
|
1248 | + $orXDirectFields->add($expr->eq($aliasMembership.'.circle_id', $f)); |
|
1250 | 1249 | } |
1251 | 1250 | |
1252 | 1251 | $this->generateMemberSelectAlias($aliasDirect) |
@@ -1257,8 +1256,7 @@ discard block |
||
1257 | 1256 | $expr->andX( |
1258 | 1257 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirect), |
1259 | 1258 | (empty($helperMoreFields)) ? |
1260 | - $expr->eq($aliasDirect . '.circle_id', $helperAlias . '.' . $field) : |
|
1261 | - $orXDirectFields |
|
1259 | + $expr->eq($aliasDirect.'.circle_id', $helperAlias.'.'.$field) : $orXDirectFields |
|
1262 | 1260 | ) |
1263 | 1261 | ); |
1264 | 1262 | } catch (RequestBuilderException $e) { |
@@ -1272,8 +1270,8 @@ discard block |
||
1272 | 1270 | $this->leftJoin( |
1273 | 1271 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator, |
1274 | 1272 | $expr->andX( |
1275 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'), |
|
1276 | - $expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id') |
|
1273 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'), |
|
1274 | + $expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id') |
|
1277 | 1275 | ) |
1278 | 1276 | ); |
1279 | 1277 | |
@@ -1281,8 +1279,8 @@ discard block |
||
1281 | 1279 | $this->leftJoin( |
1282 | 1280 | $aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
1283 | 1281 | $expr->andX( |
1284 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'), |
|
1285 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id') |
|
1282 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'), |
|
1283 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id') |
|
1286 | 1284 | ) |
1287 | 1285 | ); |
1288 | 1286 | |
@@ -1333,7 +1331,7 @@ discard block |
||
1333 | 1331 | $orX->add( |
1334 | 1332 | $expr->andX( |
1335 | 1333 | $this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle), |
1336 | - $expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
1334 | + $expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
1337 | 1335 | ) |
1338 | 1336 | ); |
1339 | 1337 | } |
@@ -1343,10 +1341,10 @@ discard block |
||
1343 | 1341 | $orXLevelCheck = $expr->orX(); |
1344 | 1342 | |
1345 | 1343 | array_map( |
1346 | - function (string $alias) use ($orXLevelCheck, $minimumLevel) { |
|
1344 | + function(string $alias) use ($orXLevelCheck, $minimumLevel) { |
|
1347 | 1345 | $orXLevelCheck->add( |
1348 | 1346 | $this->expr()->gte( |
1349 | - $alias . '.level', |
|
1347 | + $alias.'.level', |
|
1350 | 1348 | $this->createNamedParameter($minimumLevel) |
1351 | 1349 | ) |
1352 | 1350 | ); |
@@ -1436,21 +1434,21 @@ discard block |
||
1436 | 1434 | $expr = $this->expr(); |
1437 | 1435 | $andPassive = $expr->andX(); |
1438 | 1436 | $andPassive->add( |
1439 | - $expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1437 | + $expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
1440 | 1438 | ); |
1441 | 1439 | |
1442 | 1440 | $orMemberOrLevel = $expr->orX(); |
1443 | 1441 | $orMemberOrLevel->add( |
1444 | - $expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance') |
|
1442 | + $expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance') |
|
1445 | 1443 | ); |
1446 | 1444 | // TODO: do we need this ? (display members from the local instance) |
1447 | 1445 | $orMemberOrLevel->add( |
1448 | - $expr->emptyString($this->getDefaultSelectAlias() . '.instance') |
|
1446 | + $expr->emptyString($this->getDefaultSelectAlias().'.instance') |
|
1449 | 1447 | ); |
1450 | 1448 | |
1451 | 1449 | $orMemberOrLevel->add( |
1452 | 1450 | $expr->eq( |
1453 | - $this->getDefaultSelectAlias() . '.level', |
|
1451 | + $this->getDefaultSelectAlias().'.level', |
|
1454 | 1452 | $this->createNamedParameter(Member::LEVEL_OWNER) |
1455 | 1453 | ) |
1456 | 1454 | ); |
@@ -1487,11 +1485,11 @@ discard block |
||
1487 | 1485 | ) |
1488 | 1486 | ->leftJoin( |
1489 | 1487 | $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache, |
1490 | - $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid') |
|
1488 | + $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid') |
|
1491 | 1489 | ) |
1492 | 1490 | ->leftJoin( |
1493 | 1491 | $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages, |
1494 | - $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id') |
|
1492 | + $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id') |
|
1495 | 1493 | ); |
1496 | 1494 | } |
1497 | 1495 | |
@@ -1513,8 +1511,8 @@ discard block |
||
1513 | 1511 | $this->leftJoin( |
1514 | 1512 | $aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild, |
1515 | 1513 | $expr->andX( |
1516 | - $expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'), |
|
1517 | - $expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id') |
|
1514 | + $expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'), |
|
1515 | + $expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id') |
|
1518 | 1516 | ) |
1519 | 1517 | ); |
1520 | 1518 | |
@@ -1564,13 +1562,13 @@ discard block |
||
1564 | 1562 | $this->leftJoin( |
1565 | 1563 | $aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint, |
1566 | 1564 | $expr->andX( |
1567 | - $expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'), |
|
1568 | - $expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id') |
|
1565 | + $expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'), |
|
1566 | + $expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id') |
|
1569 | 1567 | ) |
1570 | 1568 | ); |
1571 | 1569 | |
1572 | - $this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint'); |
|
1573 | - $this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash'); |
|
1570 | + $this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint'); |
|
1571 | + $this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash'); |
|
1574 | 1572 | } |
1575 | 1573 | |
1576 | 1574 | |
@@ -1674,10 +1672,10 @@ discard block |
||
1674 | 1672 | */ |
1675 | 1673 | public function generateAlias(string $base, string $extension, ?array &$options = []): string { |
1676 | 1674 | $search = str_replace('_', '.', $base); |
1677 | - $path = $search . '.' . $extension; |
|
1675 | + $path = $search.'.'.$extension; |
|
1678 | 1676 | if (!$this->validKey($path, self::$SQL_PATH) |
1679 | 1677 | && !in_array($extension, $this->getArray($search, self::$SQL_PATH))) { |
1680 | - throw new RequestBuilderException($extension . ' not found in ' . $search); |
|
1678 | + throw new RequestBuilderException($extension.' not found in '.$search); |
|
1681 | 1679 | } |
1682 | 1680 | |
1683 | 1681 | if (!is_array($options)) { |
@@ -1686,15 +1684,15 @@ discard block |
||
1686 | 1684 | |
1687 | 1685 | $optionPath = ''; |
1688 | 1686 | foreach (explode('.', $path) as $p) { |
1689 | - $optionPath = trim($optionPath . '.' . $p, '.'); |
|
1687 | + $optionPath = trim($optionPath.'.'.$p, '.'); |
|
1690 | 1688 | $options = array_merge( |
1691 | 1689 | $options, |
1692 | - $this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH), |
|
1693 | - $this->getArray($optionPath . '.' . self::OPTIONS, $this->options) |
|
1690 | + $this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH), |
|
1691 | + $this->getArray($optionPath.'.'.self::OPTIONS, $this->options) |
|
1694 | 1692 | ); |
1695 | 1693 | } |
1696 | 1694 | |
1697 | - return $base . '_' . $extension; |
|
1695 | + return $base.'_'.$extension; |
|
1698 | 1696 | } |
1699 | 1697 | |
1700 | 1698 | |
@@ -1714,7 +1712,7 @@ discard block |
||
1714 | 1712 | } else { |
1715 | 1713 | $k = $arr; |
1716 | 1714 | } |
1717 | - $path[$k] = $prefix . '_' . $k . '_'; |
|
1715 | + $path[$k] = $prefix.'_'.$k.'_'; |
|
1718 | 1716 | } |
1719 | 1717 | |
1720 | 1718 | return $path; |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | stream_set_blocking(STDIN, false); |
138 | 138 | readline_callback_handler_install( |
139 | 139 | '', |
140 | - function () { |
|
140 | + function() { |
|
141 | 141 | } |
142 | 142 | ); |
143 | 143 | |
@@ -203,8 +203,8 @@ discard block |
||
203 | 203 | |
204 | 204 | for ($i = 0; $i < $this->bottomLeftPanel->getMaxLines(); $i++) { |
205 | 205 | $lines[] = '<fg=white>│</>' |
206 | - . $this->incrementString($i, 'bottomLeftPanelCurrentLine', '%') . ' ' |
|
207 | - . $this->incrementString($i, 'lineBL', ':42s%') . ' </>' |
|
206 | + . $this->incrementString($i, 'bottomLeftPanelCurrentLine', '%').' ' |
|
207 | + . $this->incrementString($i, 'lineBL', ':42s%').' </>' |
|
208 | 208 | . '<fg=white>│</> ' |
209 | 209 | . $this->incrementString($i, 'lineBR', '%'); |
210 | 210 | |
@@ -215,8 +215,8 @@ discard block |
||
215 | 215 | |
216 | 216 | $more = [' Thread', ' Type', 'CircleId', 'Instance', ' Time']; |
217 | 217 | for ($j = 0; $j < count($more); $j++) { |
218 | - $lines[] = '<fg=white>│ ' . strtolower($more[$j]) . ':</> %curr' |
|
219 | - . trim($more[$j]) . ':-32s% <fg=white>│</> ' |
|
218 | + $lines[] = '<fg=white>│ '.strtolower($more[$j]).':</> %curr' |
|
219 | + . trim($more[$j]).':-32s% <fg=white>│</> ' |
|
220 | 220 | . $this->incrementString($i + $j, 'lineBR', '%'); |
221 | 221 | $this->update($this->incrementString($i + $j, 'lineBR'), ''); |
222 | 222 | } |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | $this->setCurr(); |
226 | 226 | |
227 | 227 | // $this->display->clear(); |
228 | - $this->display->setFormat(implode("\n", $lines) . "\n"); |
|
228 | + $this->display->setFormat(implode("\n", $lines)."\n"); |
|
229 | 229 | $this->display->start(); |
230 | 230 | } |
231 | 231 | |
@@ -279,12 +279,12 @@ discard block |
||
279 | 279 | $instance = ($this->configService->isLocalInstance($item->getInstance())) ? |
280 | 280 | $this->localDisplayName : $item->getInstance(); |
281 | 281 | |
282 | - $instanceColor = $this->configService->getAppValue('debug_instance.' . $instance); |
|
282 | + $instanceColor = $this->configService->getAppValue('debug_instance.'.$instance); |
|
283 | 283 | if ($instanceColor === '') { |
284 | 284 | $instanceColor = 'white'; |
285 | 285 | } |
286 | 286 | |
287 | - $line = '<fg=' . $instanceColor . '>' . $instance . '</> - '; |
|
287 | + $line = '<fg='.$instanceColor.'>'.$instance.'</> - '; |
|
288 | 288 | $action = $debug->g(DebugService::ACTION); |
289 | 289 | |
290 | 290 | preg_match_all('/{((?:[^{}]*|(?R))*)}/x', $action, $match); |
@@ -313,8 +313,8 @@ discard block |
||
313 | 313 | } |
314 | 314 | |
315 | 315 | $action = str_replace( |
316 | - '{' . $entry . '}', |
|
317 | - '<' . $color . '>' . $value . '</>', |
|
316 | + '{'.$entry.'}', |
|
317 | + '<'.$color.'>'.$value.'</>', |
|
318 | 318 | $action |
319 | 319 | ); |
320 | 320 | } |
@@ -569,7 +569,7 @@ discard block |
||
569 | 569 | |
570 | 570 | $this->update( |
571 | 571 | $this->incrementString($i, 'lineBL'), |
572 | - ($i + 1) . '. ' . $name . ' (' . $type . ')' |
|
572 | + ($i + 1).'. '.$name.' ('.$type.')' |
|
573 | 573 | ); |
574 | 574 | } |
575 | 575 | } |
@@ -675,10 +675,10 @@ discard block |
||
675 | 675 | } |
676 | 676 | |
677 | 677 | if ($wrapper !== '') { |
678 | - $prefix = '%' . $prefix; |
|
678 | + $prefix = '%'.$prefix; |
|
679 | 679 | } |
680 | 680 | |
681 | - return $prefix . $result . $wrapper; |
|
681 | + return $prefix.$result.$wrapper; |
|
682 | 682 | } |
683 | 683 | |
684 | 684 | private function setCurr(?Debug $debug = null) { |