@@ -218,13 +218,13 @@ |
||
| 218 | 218 | |
| 219 | 219 | private function generateIncrementedMountpoint(Folder $fs, Mount $mount, IFederatedUser $federatedUser): void { |
| 220 | 220 | $info = pathinfo($mount->getMountPoint()); |
| 221 | - $filename = rtrim($this->get('dirname', $info), '/') . '/' . $this->get('filename', $info); |
|
| 221 | + $filename = rtrim($this->get('dirname', $info), '/').'/'.$this->get('filename', $info); |
|
| 222 | 222 | $extension = $this->get('extension', $info); |
| 223 | - $extension = ($extension === '') ? '' : '.' . $extension; |
|
| 223 | + $extension = ($extension === '') ? '' : '.'.$extension; |
|
| 224 | 224 | |
| 225 | 225 | $n = 2; |
| 226 | 226 | while (true) { |
| 227 | - $path = $filename . " ($n)" . $extension; |
|
| 227 | + $path = $filename." ($n)".$extension; |
|
| 228 | 228 | try { |
| 229 | 229 | $fs->get($path); |
| 230 | 230 | } catch (NotFoundException) { |
@@ -63,13 +63,13 @@ |
||
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
| 66 | - if ($this->get($prefix . 'mountpoint', $data) === '') { |
|
| 66 | + if ($this->get($prefix.'mountpoint', $data) === '') { |
|
| 67 | 67 | throw new MountPointNotFoundException(); |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - $this->setMountId($this->get($prefix . 'mount_id', $data)); |
|
| 71 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
| 72 | - $this->setMountPoint($this->get($prefix . 'mountpoint', $data)); |
|
| 70 | + $this->setMountId($this->get($prefix.'mount_id', $data)); |
|
| 71 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
| 72 | + $this->setMountPoint($this->get($prefix.'mountpoint', $data)); |
|
| 73 | 73 | |
| 74 | 74 | return $this; |
| 75 | 75 | } |
@@ -116,7 +116,7 @@ |
||
| 116 | 116 | return $mountPoint; |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - return '/' . $this->getInitiator()->getUserId() . '/files/' . ltrim($mountPoint, '/'); |
|
| 119 | + return '/'.$this->getInitiator()->getUserId().'/files/'.ltrim($mountPoint, '/'); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | /** |
@@ -378,8 +378,8 @@ discard block |
||
| 378 | 378 | foreach (explode(' ', $circle->getDisplayName()) as $word) { |
| 379 | 379 | $andX->add( |
| 380 | 380 | $expr->iLike( |
| 381 | - $this->getDefaultSelectAlias() . '.' . 'display_name', |
|
| 382 | - $this->createNamedParameter('%' . $word . '%') |
|
| 381 | + $this->getDefaultSelectAlias().'.'.'display_name', |
|
| 382 | + $this->createNamedParameter('%'.$word.'%') |
|
| 383 | 383 | ) |
| 384 | 384 | ); |
| 385 | 385 | } |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | $this->generateRemoteInstanceSelectAlias($aliasRemoteInstance) |
| 411 | 411 | ->leftJoin( |
| 412 | 412 | $alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance, |
| 413 | - $expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance') |
|
| 413 | + $expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance') |
|
| 414 | 414 | ); |
| 415 | 415 | } catch (RequestBuilderException $e) { |
| 416 | 416 | } |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | $expr = $this->expr(); |
| 463 | 463 | $this->leftJoin( |
| 464 | 464 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote, |
| 465 | - $expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
| 465 | + $expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
| 466 | 466 | ); |
| 467 | 467 | } |
| 468 | 468 | |
@@ -490,12 +490,12 @@ discard block |
||
| 490 | 490 | $this->leftJoin( |
| 491 | 491 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember, |
| 492 | 492 | $expr->andX( |
| 493 | - $expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'), |
|
| 493 | + $expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'), |
|
| 494 | 494 | $expr->eq( |
| 495 | - $aliasRemoteMember . '.instance', |
|
| 495 | + $aliasRemoteMember.'.instance', |
|
| 496 | 496 | $this->createNamedParameter($remoteInstance->getInstance()) |
| 497 | 497 | ), |
| 498 | - $expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 498 | + $expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 499 | 499 | ) |
| 500 | 500 | ); |
| 501 | 501 | } |
@@ -527,21 +527,21 @@ discard block |
||
| 527 | 527 | $this->leftJoin( |
| 528 | 528 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle, |
| 529 | 529 | $expr->andX( |
| 530 | - $expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'), |
|
| 531 | - $expr->emptyString($aliasRemoteCircle . '.instance'), |
|
| 532 | - $expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 530 | + $expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'), |
|
| 531 | + $expr->emptyString($aliasRemoteCircle.'.instance'), |
|
| 532 | + $expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 533 | 533 | ) |
| 534 | 534 | ); |
| 535 | 535 | $this->leftJoin( |
| 536 | 536 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner, |
| 537 | 537 | $expr->andX( |
| 538 | - $expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'), |
|
| 538 | + $expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'), |
|
| 539 | 539 | $expr->eq( |
| 540 | - $aliasRemoteCircleOwner . '.instance', |
|
| 540 | + $aliasRemoteCircleOwner.'.instance', |
|
| 541 | 541 | $this->createNamedParameter($remoteInstance->getInstance()) |
| 542 | 542 | ), |
| 543 | 543 | $expr->eq( |
| 544 | - $aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
| 544 | + $aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
| 545 | 545 | ) |
| 546 | 546 | ) |
| 547 | 547 | ); |
@@ -574,16 +574,16 @@ discard block |
||
| 574 | 574 | $expr = $this->expr(); |
| 575 | 575 | $orX = $expr->orX(); |
| 576 | 576 | $orX->add( |
| 577 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
| 577 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE)) |
|
| 578 | 578 | ); |
| 579 | 579 | |
| 580 | 580 | $orExtOrPassive = $expr->orX(); |
| 581 | 581 | $orExtOrPassive->add( |
| 582 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
| 582 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
| 583 | 583 | ); |
| 584 | 584 | if (!$sensitive) { |
| 585 | 585 | $orExtOrPassive->add( |
| 586 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 586 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 587 | 587 | ); |
| 588 | 588 | } else { |
| 589 | 589 | if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) { |
@@ -592,8 +592,8 @@ discard block |
||
| 592 | 592 | } |
| 593 | 593 | |
| 594 | 594 | $orInstance = $expr->orX(); |
| 595 | - $orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance')); |
|
| 596 | - $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance')); |
|
| 595 | + $orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance')); |
|
| 596 | + $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance')); |
|
| 597 | 597 | |
| 598 | 598 | $andExternal = $expr->andX(); |
| 599 | 599 | $andExternal->add($orExtOrPassive); |
@@ -602,13 +602,13 @@ discard block |
||
| 602 | 602 | $orExtOrTrusted = $expr->orX(); |
| 603 | 603 | $orExtOrTrusted->add($andExternal); |
| 604 | 604 | $orExtOrTrusted->add( |
| 605 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
| 605 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
| 606 | 606 | ); |
| 607 | 607 | |
| 608 | 608 | $andTrusted = $expr->andX(); |
| 609 | 609 | $andTrusted->add($orExtOrTrusted); |
| 610 | 610 | $andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle)); |
| 611 | - $andTrusted->add($expr->emptyString($aliasOwner . '.instance')); |
|
| 611 | + $andTrusted->add($expr->emptyString($aliasOwner.'.instance')); |
|
| 612 | 612 | $orX->add($andTrusted); |
| 613 | 613 | |
| 614 | 614 | $this->andWhere($orX); |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | } |
| 636 | 636 | $this->innerJoin( |
| 637 | 637 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
| 638 | - $expr->eq($aliasMember . '.circle_id', $alias . '.unique_id') |
|
| 638 | + $expr->eq($aliasMember.'.circle_id', $alias.'.unique_id') |
|
| 639 | 639 | ); |
| 640 | 640 | |
| 641 | 641 | $this->filterDirectMembership($aliasMember, $member); |
@@ -660,12 +660,12 @@ discard block |
||
| 660 | 660 | $aliasCircle, |
| 661 | 661 | 'circles_membership', |
| 662 | 662 | $aliasMembership, |
| 663 | - $this->expr()->eq($aliasCircle . '.unique_id', $aliasMembership . '.circle_id') |
|
| 663 | + $this->expr()->eq($aliasCircle.'.unique_id', $aliasMembership.'.circle_id') |
|
| 664 | 664 | ); |
| 665 | 665 | |
| 666 | 666 | $this->andWhere( |
| 667 | 667 | $this->expr()->eq( |
| 668 | - $aliasMembership . '.single_id', |
|
| 668 | + $aliasMembership.'.single_id', |
|
| 669 | 669 | $this->createNamedParameter($federatedUser->getSingleId()) |
| 670 | 670 | ) |
| 671 | 671 | ); |
@@ -686,19 +686,19 @@ discard block |
||
| 686 | 686 | |
| 687 | 687 | if ($member->getUserId() !== '') { |
| 688 | 688 | $andX->add( |
| 689 | - $expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId())) |
|
| 689 | + $expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId())) |
|
| 690 | 690 | ); |
| 691 | 691 | } |
| 692 | 692 | |
| 693 | 693 | if ($member->getSingleId() !== '') { |
| 694 | 694 | $andX->add( |
| 695 | - $expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId())) |
|
| 695 | + $expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId())) |
|
| 696 | 696 | ); |
| 697 | 697 | } |
| 698 | 698 | |
| 699 | 699 | if ($member->getUserType() > 0) { |
| 700 | 700 | $andX->add( |
| 701 | - $expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType())) |
|
| 701 | + $expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType())) |
|
| 702 | 702 | ); |
| 703 | 703 | } |
| 704 | 704 | |
@@ -707,7 +707,7 @@ discard block |
||
| 707 | 707 | if ($member->getLevel() > 0) { |
| 708 | 708 | $andX->add( |
| 709 | 709 | $expr->gte( |
| 710 | - $aliasMember . '.level', |
|
| 710 | + $aliasMember.'.level', |
|
| 711 | 711 | $this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT) |
| 712 | 712 | ) |
| 713 | 713 | ); |
@@ -748,7 +748,7 @@ discard block |
||
| 748 | 748 | $helperAlias, |
| 749 | 749 | CoreRequestBuilder::TABLE_CIRCLE, |
| 750 | 750 | $aliasCircle, |
| 751 | - $expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field) |
|
| 751 | + $expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field) |
|
| 752 | 752 | ); |
| 753 | 753 | |
| 754 | 754 | if (!is_null($initiator)) { |
@@ -779,7 +779,7 @@ discard block |
||
| 779 | 779 | $this->generateCircleSelectAlias($aliasInvitedBy) |
| 780 | 780 | ->leftJoin( |
| 781 | 781 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy, |
| 782 | - $expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id') |
|
| 782 | + $expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id') |
|
| 783 | 783 | ); |
| 784 | 784 | |
| 785 | 785 | $this->leftJoinOwner($aliasInvitedBy); |
@@ -810,7 +810,7 @@ discard block |
||
| 810 | 810 | $this->generateCircleSelectAlias($aliasBasedOn) |
| 811 | 811 | ->leftJoin( |
| 812 | 812 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn, |
| 813 | - $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id') |
|
| 813 | + $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id') |
|
| 814 | 814 | ); |
| 815 | 815 | |
| 816 | 816 | if (!is_null($initiator)) { |
@@ -843,9 +843,9 @@ discard block |
||
| 843 | 843 | ->leftJoin( |
| 844 | 844 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
| 845 | 845 | $expr->andX( |
| 846 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field), |
|
| 846 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field), |
|
| 847 | 847 | $expr->eq( |
| 848 | - $aliasMember . '.level', |
|
| 848 | + $aliasMember.'.level', |
|
| 849 | 849 | $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT) |
| 850 | 850 | ) |
| 851 | 851 | ) |
@@ -877,7 +877,7 @@ discard block |
||
| 877 | 877 | |
| 878 | 878 | $expr = $this->expr(); |
| 879 | 879 | |
| 880 | - $on = $expr->andX($expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field)); |
|
| 880 | + $on = $expr->andX($expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field)); |
|
| 881 | 881 | |
| 882 | 882 | // limit on membership level if requested |
| 883 | 883 | $minLevel = $probe->getMinimumLevel(); |
@@ -918,8 +918,8 @@ discard block |
||
| 918 | 918 | ->leftJoin( |
| 919 | 919 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
| 920 | 920 | $expr->andX( |
| 921 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId), |
|
| 922 | - $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId), |
|
| 921 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId), |
|
| 922 | + $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId), |
|
| 923 | 923 | $this->exprGt('level', Member::LEVEL_MEMBER, true, $aliasMember) |
| 924 | 924 | ) |
| 925 | 925 | ); |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | |
| 952 | 952 | $this->leftJoin( |
| 953 | 953 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
| 954 | - $expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field) |
|
| 954 | + $expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field) |
|
| 955 | 955 | ); |
| 956 | 956 | |
| 957 | 957 | // if (!$this->getBool('getData', $options, false)) { |
@@ -965,8 +965,8 @@ discard block |
||
| 965 | 965 | ->leftJoin( |
| 966 | 966 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
| 967 | 967 | $expr->andX( |
| 968 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'), |
|
| 969 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id') |
|
| 968 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'), |
|
| 969 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id') |
|
| 970 | 970 | ) |
| 971 | 971 | ); |
| 972 | 972 | |
@@ -983,12 +983,12 @@ discard block |
||
| 983 | 983 | $aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options); |
| 984 | 984 | $this->leftJoin( |
| 985 | 985 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership, |
| 986 | - $expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId)) |
|
| 986 | + $expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId)) |
|
| 987 | 987 | ); |
| 988 | 988 | |
| 989 | 989 | $orX = $expr->orX( |
| 990 | - $expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field), |
|
| 991 | - $expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId)) |
|
| 990 | + $expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field), |
|
| 991 | + $expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId)) |
|
| 992 | 992 | ); |
| 993 | 993 | |
| 994 | 994 | $this->andWhere($orX); |
@@ -1009,11 +1009,11 @@ discard block |
||
| 1009 | 1009 | |
| 1010 | 1010 | $expr = $this->expr(); |
| 1011 | 1011 | $aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS); |
| 1012 | - $this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId))); |
|
| 1012 | + $this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId))); |
|
| 1013 | 1013 | if ($level > 1) { |
| 1014 | 1014 | $this->andWhere( |
| 1015 | 1015 | $expr->gte( |
| 1016 | - $aliasMembership . '.level', |
|
| 1016 | + $aliasMembership.'.level', |
|
| 1017 | 1017 | $this->createNamedParameter($level, IQueryBuilder::PARAM_INT) |
| 1018 | 1018 | ) |
| 1019 | 1019 | ); |
@@ -1041,8 +1041,8 @@ discard block |
||
| 1041 | 1041 | $this->leftJoin( |
| 1042 | 1042 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
| 1043 | 1043 | $expr->andX( |
| 1044 | - $expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field), |
|
| 1045 | - $expr->eq($aliasMembership . '.single_id', $alias . '.single_id') |
|
| 1044 | + $expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field), |
|
| 1045 | + $expr->eq($aliasMembership.'.single_id', $alias.'.single_id') |
|
| 1046 | 1046 | ) |
| 1047 | 1047 | ); |
| 1048 | 1048 | |
@@ -1055,8 +1055,8 @@ discard block |
||
| 1055 | 1055 | ->leftJoin( |
| 1056 | 1056 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom, |
| 1057 | 1057 | $expr->andX( |
| 1058 | - $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'), |
|
| 1059 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id') |
|
| 1058 | + $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'), |
|
| 1059 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id') |
|
| 1060 | 1060 | ) |
| 1061 | 1061 | ); |
| 1062 | 1062 | } |
@@ -1096,7 +1096,7 @@ discard block |
||
| 1096 | 1096 | |
| 1097 | 1097 | $this->leftJoin( |
| 1098 | 1098 | $alias, CoreRequestBuilder::TABLE_TOKEN, $aliasShareToken, |
| 1099 | - $expr->eq($aliasShareToken . '.share_id', $alias . '.' . $field) |
|
| 1099 | + $expr->eq($aliasShareToken.'.share_id', $alias.'.'.$field) |
|
| 1100 | 1100 | ); |
| 1101 | 1101 | } |
| 1102 | 1102 | |
@@ -1138,14 +1138,14 @@ discard block |
||
| 1138 | 1138 | try { |
| 1139 | 1139 | $aliasConfig = $this->generateAlias($alias, self::CONFIG, $options); |
| 1140 | 1140 | $this->selectAlias( |
| 1141 | - $aliasConfig . '.config', |
|
| 1142 | - (($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'circle_config' |
|
| 1141 | + $aliasConfig.'.config', |
|
| 1142 | + (($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'circle_config' |
|
| 1143 | 1143 | ); |
| 1144 | 1144 | $this->leftJoin( |
| 1145 | 1145 | $alias, |
| 1146 | 1146 | CoreRequestBuilder::TABLE_CIRCLE, |
| 1147 | 1147 | $aliasConfig, |
| 1148 | - $expr->eq($alias . '.circle_id', $aliasConfig . '.unique_id') |
|
| 1148 | + $expr->eq($alias.'.circle_id', $aliasConfig.'.unique_id') |
|
| 1149 | 1149 | ); |
| 1150 | 1150 | } catch (RequestBuilderException $e) { |
| 1151 | 1151 | } |
@@ -1183,7 +1183,7 @@ discard block |
||
| 1183 | 1183 | $aliasMembership, |
| 1184 | 1184 | $expr->andX( |
| 1185 | 1185 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership), |
| 1186 | - $expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field) |
|
| 1186 | + $expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field) |
|
| 1187 | 1187 | ) |
| 1188 | 1188 | ); |
| 1189 | 1189 | |
@@ -1202,11 +1202,11 @@ discard block |
||
| 1202 | 1202 | $aliasMembershipCircle = $this->generateAlias($aliasMembership, self::CONFIG, $options); |
| 1203 | 1203 | $orXMembershipCircle = $expr->orX(); |
| 1204 | 1204 | array_map( |
| 1205 | - function (string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) { |
|
| 1205 | + function(string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) { |
|
| 1206 | 1206 | $orXMembershipCircle->add( |
| 1207 | 1207 | $this->expr()->eq( |
| 1208 | - $alias . '.circle_id', |
|
| 1209 | - $aliasMembershipCircle . '.unique_id' |
|
| 1208 | + $alias.'.circle_id', |
|
| 1209 | + $aliasMembershipCircle.'.unique_id' |
|
| 1210 | 1210 | ) |
| 1211 | 1211 | ); |
| 1212 | 1212 | }, |
@@ -1238,7 +1238,7 @@ discard block |
||
| 1238 | 1238 | $aliasDirectInitiator, |
| 1239 | 1239 | $expr->andX( |
| 1240 | 1240 | $this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirectInitiator), |
| 1241 | - $expr->eq($aliasDirectInitiator . '.circle_id', $helperAlias . '.' . $field) |
|
| 1241 | + $expr->eq($aliasDirectInitiator.'.circle_id', $helperAlias.'.'.$field) |
|
| 1242 | 1242 | ) |
| 1243 | 1243 | ); |
| 1244 | 1244 | } catch (RequestBuilderException $e) { |
@@ -1252,8 +1252,8 @@ discard block |
||
| 1252 | 1252 | $this->leftJoin( |
| 1253 | 1253 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator, |
| 1254 | 1254 | $expr->andX( |
| 1255 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'), |
|
| 1256 | - $expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id') |
|
| 1255 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'), |
|
| 1256 | + $expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id') |
|
| 1257 | 1257 | ) |
| 1258 | 1258 | ); |
| 1259 | 1259 | |
@@ -1261,8 +1261,8 @@ discard block |
||
| 1261 | 1261 | $this->leftJoin( |
| 1262 | 1262 | $aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
| 1263 | 1263 | $expr->andX( |
| 1264 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'), |
|
| 1265 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id') |
|
| 1264 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'), |
|
| 1265 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id') |
|
| 1266 | 1266 | ) |
| 1267 | 1267 | ); |
| 1268 | 1268 | |
@@ -1307,8 +1307,8 @@ discard block |
||
| 1307 | 1307 | ->leftJoin( |
| 1308 | 1308 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator, |
| 1309 | 1309 | $expr->andX( |
| 1310 | - $expr->eq($aliasInitiator . '.circle_id', $alias . '.unique_id'), |
|
| 1311 | - $expr->eq($aliasInitiator . '.' . $field, $helperAlias . '.inheritance_first'), |
|
| 1310 | + $expr->eq($aliasInitiator.'.circle_id', $alias.'.unique_id'), |
|
| 1311 | + $expr->eq($aliasInitiator.'.'.$field, $helperAlias.'.inheritance_first'), |
|
| 1312 | 1312 | ) |
| 1313 | 1313 | ); |
| 1314 | 1314 | // |
@@ -1345,7 +1345,7 @@ discard block |
||
| 1345 | 1345 | $orX->add( |
| 1346 | 1346 | $expr->andX( |
| 1347 | 1347 | $this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle), |
| 1348 | - $expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
| 1348 | + $expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
| 1349 | 1349 | ) |
| 1350 | 1350 | ); |
| 1351 | 1351 | } |
@@ -1355,10 +1355,10 @@ discard block |
||
| 1355 | 1355 | $orXLevelCheck = $expr->orX(); |
| 1356 | 1356 | |
| 1357 | 1357 | array_map( |
| 1358 | - function (string $alias) use ($orXLevelCheck, $minimumLevel) { |
|
| 1358 | + function(string $alias) use ($orXLevelCheck, $minimumLevel) { |
|
| 1359 | 1359 | $orXLevelCheck->add( |
| 1360 | 1360 | $this->expr()->gte( |
| 1361 | - $alias . '.level', |
|
| 1361 | + $alias.'.level', |
|
| 1362 | 1362 | $this->createNamedParameter($minimumLevel, self::PARAM_INT) |
| 1363 | 1363 | ) |
| 1364 | 1364 | ); |
@@ -1439,21 +1439,21 @@ discard block |
||
| 1439 | 1439 | $expr = $this->expr(); |
| 1440 | 1440 | $andPassive = $expr->andX(); |
| 1441 | 1441 | $andPassive->add( |
| 1442 | - $expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 1442 | + $expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 1443 | 1443 | ); |
| 1444 | 1444 | |
| 1445 | 1445 | $orMemberOrLevel = $expr->orX(); |
| 1446 | 1446 | $orMemberOrLevel->add( |
| 1447 | - $expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance') |
|
| 1447 | + $expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance') |
|
| 1448 | 1448 | ); |
| 1449 | 1449 | // TODO: do we need this ? (display members from the local instance) |
| 1450 | 1450 | $orMemberOrLevel->add( |
| 1451 | - $expr->emptyString($this->getDefaultSelectAlias() . '.instance') |
|
| 1451 | + $expr->emptyString($this->getDefaultSelectAlias().'.instance') |
|
| 1452 | 1452 | ); |
| 1453 | 1453 | |
| 1454 | 1454 | $orMemberOrLevel->add( |
| 1455 | 1455 | $expr->eq( |
| 1456 | - $this->getDefaultSelectAlias() . '.level', |
|
| 1456 | + $this->getDefaultSelectAlias().'.level', |
|
| 1457 | 1457 | $this->createNamedParameter(Member::LEVEL_OWNER) |
| 1458 | 1458 | ) |
| 1459 | 1459 | ); |
@@ -1490,11 +1490,11 @@ discard block |
||
| 1490 | 1490 | ) |
| 1491 | 1491 | ->leftJoin( |
| 1492 | 1492 | $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache, |
| 1493 | - $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid') |
|
| 1493 | + $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid') |
|
| 1494 | 1494 | ) |
| 1495 | 1495 | ->leftJoin( |
| 1496 | 1496 | $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages, |
| 1497 | - $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id') |
|
| 1497 | + $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id') |
|
| 1498 | 1498 | ); |
| 1499 | 1499 | } |
| 1500 | 1500 | |
@@ -1516,8 +1516,8 @@ discard block |
||
| 1516 | 1516 | $this->leftJoin( |
| 1517 | 1517 | $aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild, |
| 1518 | 1518 | $expr->andX( |
| 1519 | - $expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'), |
|
| 1520 | - $expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id') |
|
| 1519 | + $expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'), |
|
| 1520 | + $expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id') |
|
| 1521 | 1521 | ) |
| 1522 | 1522 | ); |
| 1523 | 1523 | |
@@ -1575,13 +1575,13 @@ discard block |
||
| 1575 | 1575 | $this->leftJoin( |
| 1576 | 1576 | $aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint, |
| 1577 | 1577 | $expr->andX( |
| 1578 | - $expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'), |
|
| 1579 | - $expr->eq($aliasMountpoint . '.single_id', $this->createNamedParameter($federatedUser->getSingleId())) |
|
| 1578 | + $expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'), |
|
| 1579 | + $expr->eq($aliasMountpoint.'.single_id', $this->createNamedParameter($federatedUser->getSingleId())) |
|
| 1580 | 1580 | ) |
| 1581 | 1581 | ); |
| 1582 | 1582 | |
| 1583 | - $this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint'); |
|
| 1584 | - $this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash'); |
|
| 1583 | + $this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint'); |
|
| 1584 | + $this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash'); |
|
| 1585 | 1585 | } |
| 1586 | 1586 | |
| 1587 | 1587 | |
@@ -1689,10 +1689,10 @@ discard block |
||
| 1689 | 1689 | */ |
| 1690 | 1690 | public function generateAlias(string $base, string $extension, ?array &$options = []): string { |
| 1691 | 1691 | $search = str_replace('_', '.', $base); |
| 1692 | - $path = $search . '.' . $extension; |
|
| 1692 | + $path = $search.'.'.$extension; |
|
| 1693 | 1693 | if (!$this->validKey($path, $this->getSqlPath()) |
| 1694 | 1694 | && !in_array($extension, $this->getArray($search, $this->getSqlPath()))) { |
| 1695 | - throw new RequestBuilderException($extension . ' not found in ' . $search); |
|
| 1695 | + throw new RequestBuilderException($extension.' not found in '.$search); |
|
| 1696 | 1696 | } |
| 1697 | 1697 | |
| 1698 | 1698 | if (!is_array($options)) { |
@@ -1701,15 +1701,15 @@ discard block |
||
| 1701 | 1701 | |
| 1702 | 1702 | $optionPath = ''; |
| 1703 | 1703 | foreach (explode('.', $path) as $p) { |
| 1704 | - $optionPath = trim($optionPath . '.' . $p, '.'); |
|
| 1704 | + $optionPath = trim($optionPath.'.'.$p, '.'); |
|
| 1705 | 1705 | $options = array_merge( |
| 1706 | 1706 | $options, |
| 1707 | - $this->getArray($optionPath . '.' . self::OPTIONS, $this->getSqlPath()), |
|
| 1708 | - $this->getArray($optionPath . '.' . self::OPTIONS, $this->options) |
|
| 1707 | + $this->getArray($optionPath.'.'.self::OPTIONS, $this->getSqlPath()), |
|
| 1708 | + $this->getArray($optionPath.'.'.self::OPTIONS, $this->options) |
|
| 1709 | 1709 | ); |
| 1710 | 1710 | } |
| 1711 | 1711 | |
| 1712 | - return $base . '_' . $extension; |
|
| 1712 | + return $base.'_'.$extension; |
|
| 1713 | 1713 | } |
| 1714 | 1714 | |
| 1715 | 1715 | |
@@ -1729,7 +1729,7 @@ discard block |
||
| 1729 | 1729 | } else { |
| 1730 | 1730 | $k = $arr; |
| 1731 | 1731 | } |
| 1732 | - $path[$k] = $prefix . '_' . $k . '_'; |
|
| 1732 | + $path[$k] = $prefix.'_'.$k.'_'; |
|
| 1733 | 1733 | } |
| 1734 | 1734 | |
| 1735 | 1735 | return $path; |