@@ -110,7 +110,7 @@ |
||
| 110 | 110 | /** @var FederatedShare $share */ |
| 111 | 111 | $share = $data->gObj('federatedShare', FederatedShare::class); |
| 112 | 112 | if ($share->getLockStatus() === ItemLock::STATUS_INSTANCE_LOCKED) { |
| 113 | - throw new FederatedShareAlreadyLockedException('item already locked by ' . $share->getInstance()); |
|
| 113 | + throw new FederatedShareAlreadyLockedException('item already locked by '.$share->getInstance()); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | return $share; |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | } catch (Exception $e) { |
| 332 | 332 | $this->assertSame( |
| 333 | 333 | true, false, |
| 334 | - 'should have returned a MemberIsNotModeratorException - ' . $e->getMessage() |
|
| 334 | + 'should have returned a MemberIsNotModeratorException - '.$e->getMessage() |
|
| 335 | 335 | ); |
| 336 | 336 | } |
| 337 | 337 | |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | } catch (Exception $e) { |
| 346 | 346 | $this->assertSame( |
| 347 | 347 | true, false, |
| 348 | - 'should have returned a MemberIsNotModeratorException - ' . $e->getMessage() |
|
| 348 | + 'should have returned a MemberIsNotModeratorException - '.$e->getMessage() |
|
| 349 | 349 | ); |
| 350 | 350 | } |
| 351 | 351 | |
@@ -216,8 +216,8 @@ discard block |
||
| 216 | 216 | $qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter); |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | - $qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc'); |
|
| 220 | - $qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc'); |
|
| 219 | + $qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc'); |
|
| 220 | + $qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc'); |
|
| 221 | 221 | |
| 222 | 222 | return $this->getItemsFromRequest($qb); |
| 223 | 223 | } |
@@ -241,8 +241,8 @@ discard block |
||
| 241 | 241 | $qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId); |
| 242 | 242 | |
| 243 | 243 | $aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS); |
| 244 | - $qb->orderBy($aliasMembership . '.inheritance_depth', 'asc'); |
|
| 245 | - $qb->groupBy(CoreQueryBuilder::MEMBER . '.single_id'); |
|
| 244 | + $qb->orderBy($aliasMembership.'.inheritance_depth', 'asc'); |
|
| 245 | + $qb->groupBy(CoreQueryBuilder::MEMBER.'.single_id'); |
|
| 246 | 246 | |
| 247 | 247 | return $this->getItemsFromRequest($qb); |
| 248 | 248 | } |
@@ -278,8 +278,8 @@ discard block |
||
| 278 | 278 | $qb = $this->getMemberSelectSql(); |
| 279 | 279 | $qb->limitToCircleId($circleId); |
| 280 | 280 | |
| 281 | - $qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance')); |
|
| 282 | - $qb->groupBy(CoreQueryBuilder::MEMBER . '.instance'); |
|
| 281 | + $qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance')); |
|
| 282 | + $qb->groupBy(CoreQueryBuilder::MEMBER.'.instance'); |
|
| 283 | 283 | |
| 284 | 284 | return array_map( |
| 285 | 285 | function(Member $member): string { |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | */ |
| 335 | 335 | public function searchFederatedUsers(string $needle): array { |
| 336 | 336 | $qb = $this->getMemberSelectSql(); |
| 337 | - $qb->searchInDBField('user_id', '%' . $needle . '%'); |
|
| 337 | + $qb->searchInDBField('user_id', '%'.$needle.'%'); |
|
| 338 | 338 | $qb->groupBy('single_id'); |
| 339 | 339 | |
| 340 | 340 | return $this->getItemsFromRequest($qb, true); |
@@ -78,13 +78,13 @@ |
||
| 78 | 78 | protected function getRemoteSelectSql(string $alias = CoreQueryBuilder::REMOTE): CoreQueryBuilder { |
| 79 | 79 | $qb = $this->getQueryBuilder(); |
| 80 | 80 | $qb->select( |
| 81 | - $alias . '.id', |
|
| 82 | - $alias . '.type', |
|
| 83 | - $alias . '.uid', |
|
| 84 | - $alias . '.instance', |
|
| 85 | - $alias . '.href', |
|
| 86 | - $alias . '.item', |
|
| 87 | - $alias . '.creation' |
|
| 81 | + $alias.'.id', |
|
| 82 | + $alias.'.type', |
|
| 83 | + $alias.'.uid', |
|
| 84 | + $alias.'.instance', |
|
| 85 | + $alias.'.href', |
|
| 86 | + $alias.'.item', |
|
| 87 | + $alias.'.creation' |
|
| 88 | 88 | ) |
| 89 | 89 | ->from(self::TABLE_REMOTE, $alias) |
| 90 | 90 | ->setDefaultSelectAlias($alias); |
@@ -73,13 +73,13 @@ |
||
| 73 | 73 | protected function getMembershipSelectSql(): CoreQueryBuilder { |
| 74 | 74 | $qb = $this->getQueryBuilder(); |
| 75 | 75 | $qb->select( |
| 76 | - CoreQueryBuilder::MEMBER . '.single_id', |
|
| 77 | - CoreQueryBuilder::MEMBER . '.circle_id', |
|
| 78 | - CoreQueryBuilder::MEMBER . '.level', |
|
| 79 | - CoreQueryBuilder::MEMBER . '.inheritance_first', |
|
| 80 | - CoreQueryBuilder::MEMBER . '.inheritance_last', |
|
| 81 | - CoreQueryBuilder::MEMBER . '.inheritance_path', |
|
| 82 | - CoreQueryBuilder::MEMBER . '.inheritance_depth' |
|
| 76 | + CoreQueryBuilder::MEMBER.'.single_id', |
|
| 77 | + CoreQueryBuilder::MEMBER.'.circle_id', |
|
| 78 | + CoreQueryBuilder::MEMBER.'.level', |
|
| 79 | + CoreQueryBuilder::MEMBER.'.inheritance_first', |
|
| 80 | + CoreQueryBuilder::MEMBER.'.inheritance_last', |
|
| 81 | + CoreQueryBuilder::MEMBER.'.inheritance_path', |
|
| 82 | + CoreQueryBuilder::MEMBER.'.inheritance_depth' |
|
| 83 | 83 | ) |
| 84 | 84 | ->from(self::TABLE_MEMBERSHIP, CoreQueryBuilder::MEMBER) |
| 85 | 85 | ->setDefaultSelectAlias(CoreQueryBuilder::MEMBER); |
@@ -75,21 +75,21 @@ |
||
| 75 | 75 | */ |
| 76 | 76 | protected function getCircleSelectSql(string $alias = CoreQueryBuilder::CIRCLE): CoreQueryBuilder { |
| 77 | 77 | $qb = $this->getQueryBuilder(); |
| 78 | - $qb->selectDistinct($alias . '.unique_id') |
|
| 78 | + $qb->selectDistinct($alias.'.unique_id') |
|
| 79 | 79 | ->addSelect( |
| 80 | - $alias . '.name', |
|
| 81 | - $alias . '.display_name', |
|
| 82 | - $alias . '.source', |
|
| 83 | - $alias . '.description', |
|
| 84 | - $alias . '.settings', |
|
| 85 | - $alias . '.config', |
|
| 86 | - $alias . '.contact_addressbook', |
|
| 87 | - $alias . '.contact_groupname', |
|
| 88 | - $alias . '.creation' |
|
| 80 | + $alias.'.name', |
|
| 81 | + $alias.'.display_name', |
|
| 82 | + $alias.'.source', |
|
| 83 | + $alias.'.description', |
|
| 84 | + $alias.'.settings', |
|
| 85 | + $alias.'.config', |
|
| 86 | + $alias.'.contact_addressbook', |
|
| 87 | + $alias.'.contact_groupname', |
|
| 88 | + $alias.'.creation' |
|
| 89 | 89 | ) |
| 90 | 90 | ->from(self::TABLE_CIRCLE, $alias) |
| 91 | - ->groupBy($alias . '.unique_id') |
|
| 92 | - ->orderBy($alias . '.creation', 'asc') |
|
| 91 | + ->groupBy($alias.'.unique_id') |
|
| 92 | + ->orderBy($alias.'.creation', 'asc') |
|
| 93 | 93 | ->setDefaultSelectAlias($alias); |
| 94 | 94 | |
| 95 | 95 | return $qb; |
@@ -76,14 +76,14 @@ |
||
| 76 | 76 | $qb = $this->getQueryBuilder(); |
| 77 | 77 | |
| 78 | 78 | $qb->select( |
| 79 | - $alias . '.id', |
|
| 80 | - $alias . '.mount_id', |
|
| 81 | - $alias . '.circle_id', |
|
| 82 | - $alias . '.single_id', |
|
| 83 | - $alias . '.token', |
|
| 84 | - $alias . '.parent', |
|
| 85 | - $alias . '.mountpoint', |
|
| 86 | - $alias . '.mountpoint_hash' |
|
| 79 | + $alias.'.id', |
|
| 80 | + $alias.'.mount_id', |
|
| 81 | + $alias.'.circle_id', |
|
| 82 | + $alias.'.single_id', |
|
| 83 | + $alias.'.token', |
|
| 84 | + $alias.'.parent', |
|
| 85 | + $alias.'.mountpoint', |
|
| 86 | + $alias.'.mountpoint_hash' |
|
| 87 | 87 | ) |
| 88 | 88 | ->from(self::TABLE_MOUNT, $alias) |
| 89 | 89 | ->setDefaultSelectAlias($alias); |
@@ -182,10 +182,10 @@ discard block |
||
| 182 | 182 | $qb->leftJoin( |
| 183 | 183 | CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember, |
| 184 | 184 | $expr->andX( |
| 185 | - $expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())), |
|
| 186 | - $expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'), |
|
| 185 | + $expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())), |
|
| 186 | + $expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'), |
|
| 187 | 187 | $expr->gte( |
| 188 | - $aliasMember . '.level', |
|
| 188 | + $aliasMember.'.level', |
|
| 189 | 189 | $qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT) |
| 190 | 190 | ) |
| 191 | 191 | ) |
@@ -193,12 +193,12 @@ discard block |
||
| 193 | 193 | |
| 194 | 194 | $external = $expr->andX(); |
| 195 | 195 | $external->add($qb->exprLimitToDBField('type', RemoteInstance::TYPE_EXTERNAL, true, false)); |
| 196 | - $external->add($expr->isNotNull($aliasMember . '.instance')); |
|
| 196 | + $external->add($expr->isNotNull($aliasMember.'.instance')); |
|
| 197 | 197 | $orX->add($external); |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | $qb->andWhere($orX) |
| 201 | - ->groupBy(CoreQueryBuilder::REMOTE . '.instance'); |
|
| 201 | + ->groupBy(CoreQueryBuilder::REMOTE.'.instance'); |
|
| 202 | 202 | |
| 203 | 203 | return $this->getItemsFromRequest($qb); |
| 204 | 204 | } |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | if ($completeDetails) { |
| 165 | - $qb->addGroupBy($aliasMembership . '.single_id'); |
|
| 165 | + $qb->addGroupBy($aliasMembership.'.single_id'); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | return $this->getItemsFromRequest($qb); |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $qb->leftJoinInheritedMembers(CoreQueryBuilder::SHARE, 'share_with'); |
| 231 | 231 | $qb->leftJoinShareChild(CoreQueryBuilder::SHARE); |
| 232 | 232 | |
| 233 | - $qb->addGroupBy($aliasMembership . '.single_id'); |
|
| 233 | + $qb->addGroupBy($aliasMembership.'.single_id'); |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | return $this->getItemsFromRequest($qb); |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | $qb->leftJoinInheritedMembers(CoreQueryBuilder::SHARE, 'share_with'); |
| 314 | 314 | $qb->leftJoinFileCache(CoreQueryBuilder::SHARE); |
| 315 | 315 | $qb->leftJoinShareChild(CoreQueryBuilder::SHARE, $aliasMembership); |
| 316 | - $qb->addGroupBy($aliasMembership . '.single_id'); |
|
| 316 | + $qb->addGroupBy($aliasMembership.'.single_id'); |
|
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | $qb->chunk($offset, $limit); |