nextcloud /
circles
@@ -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); |
@@ -74,27 +74,27 @@ |
||
| 74 | 74 | protected function getShareSelectSql(): CoreQueryBuilder { |
| 75 | 75 | $qb = $this->getQueryBuilder(); |
| 76 | 76 | $qb->select( |
| 77 | - CoreQueryBuilder::SHARE . '.id', |
|
| 78 | - CoreQueryBuilder::SHARE . '.share_type', |
|
| 79 | - CoreQueryBuilder::SHARE . '.share_with', |
|
| 80 | - CoreQueryBuilder::SHARE . '.uid_owner', |
|
| 81 | - CoreQueryBuilder::SHARE . '.uid_initiator', |
|
| 82 | - CoreQueryBuilder::SHARE . '.parent', |
|
| 83 | - CoreQueryBuilder::SHARE . '.item_type', |
|
| 84 | - CoreQueryBuilder::SHARE . '.item_source', |
|
| 85 | - CoreQueryBuilder::SHARE . '.item_target', |
|
| 86 | - CoreQueryBuilder::SHARE . '.file_source', |
|
| 87 | - CoreQueryBuilder::SHARE . '.file_target', |
|
| 88 | - CoreQueryBuilder::SHARE . '.permissions', |
|
| 89 | - CoreQueryBuilder::SHARE . '.stime', |
|
| 90 | - CoreQueryBuilder::SHARE . '.accepted', |
|
| 91 | - CoreQueryBuilder::SHARE . '.expiration', |
|
| 92 | - CoreQueryBuilder::SHARE . '.token', |
|
| 93 | - CoreQueryBuilder::SHARE . '.mail_send' |
|
| 77 | + CoreQueryBuilder::SHARE.'.id', |
|
| 78 | + CoreQueryBuilder::SHARE.'.share_type', |
|
| 79 | + CoreQueryBuilder::SHARE.'.share_with', |
|
| 80 | + CoreQueryBuilder::SHARE.'.uid_owner', |
|
| 81 | + CoreQueryBuilder::SHARE.'.uid_initiator', |
|
| 82 | + CoreQueryBuilder::SHARE.'.parent', |
|
| 83 | + CoreQueryBuilder::SHARE.'.item_type', |
|
| 84 | + CoreQueryBuilder::SHARE.'.item_source', |
|
| 85 | + CoreQueryBuilder::SHARE.'.item_target', |
|
| 86 | + CoreQueryBuilder::SHARE.'.file_source', |
|
| 87 | + CoreQueryBuilder::SHARE.'.file_target', |
|
| 88 | + CoreQueryBuilder::SHARE.'.permissions', |
|
| 89 | + CoreQueryBuilder::SHARE.'.stime', |
|
| 90 | + CoreQueryBuilder::SHARE.'.accepted', |
|
| 91 | + CoreQueryBuilder::SHARE.'.expiration', |
|
| 92 | + CoreQueryBuilder::SHARE.'.token', |
|
| 93 | + CoreQueryBuilder::SHARE.'.mail_send' |
|
| 94 | 94 | ) |
| 95 | 95 | ->from(self::TABLE_SHARE, CoreQueryBuilder::SHARE) |
| 96 | 96 | ->setDefaultSelectAlias(CoreQueryBuilder::SHARE) |
| 97 | - ->groupBy(CoreQueryBuilder::SHARE . '.id') |
|
| 97 | + ->groupBy(CoreQueryBuilder::SHARE.'.id') |
|
| 98 | 98 | ->limitToShareType(Share::TYPE_CIRCLE); |
| 99 | 99 | |
| 100 | 100 | |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | * @param int $config |
| 247 | 247 | */ |
| 248 | 248 | public function limitToConfigFlag(int $config): void { |
| 249 | - $this->andWhere($this->expr()->bitwiseAnd($this->getDefaultSelectAlias() . '.config', $config)); |
|
| 249 | + $this->andWhere($this->expr()->bitwiseAnd($this->getDefaultSelectAlias().'.config', $config)); |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | if ($circle->getDisplayName() !== '') { |
| 333 | - $this->searchInDBField('display_name', '%' . $circle->getDisplayName() . '%'); |
|
| 333 | + $this->searchInDBField('display_name', '%'.$circle->getDisplayName().'%'); |
|
| 334 | 334 | } |
| 335 | 335 | } |
| 336 | 336 | |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | $this->generateRemoteInstanceSelectAlias($aliasRemoteInstance) |
| 347 | 347 | ->leftJoin( |
| 348 | 348 | $alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance, |
| 349 | - $expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance') |
|
| 349 | + $expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance') |
|
| 350 | 350 | ); |
| 351 | 351 | } catch (RequestBuilderException $e) { |
| 352 | 352 | } |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | $expr = $this->expr(); |
| 400 | 400 | $this->leftJoin( |
| 401 | 401 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote, |
| 402 | - $expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
| 402 | + $expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance())) |
|
| 403 | 403 | ); |
| 404 | 404 | } |
| 405 | 405 | |
@@ -427,12 +427,12 @@ discard block |
||
| 427 | 427 | $this->leftJoin( |
| 428 | 428 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember, |
| 429 | 429 | $expr->andX( |
| 430 | - $expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'), |
|
| 430 | + $expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'), |
|
| 431 | 431 | $expr->eq( |
| 432 | - $aliasRemoteMember . '.instance', |
|
| 432 | + $aliasRemoteMember.'.instance', |
|
| 433 | 433 | $this->createNamedParameter($remoteInstance->getInstance()) |
| 434 | 434 | ), |
| 435 | - $expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 435 | + $expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 436 | 436 | ) |
| 437 | 437 | ); |
| 438 | 438 | } |
@@ -464,21 +464,21 @@ discard block |
||
| 464 | 464 | $this->leftJoin( |
| 465 | 465 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle, |
| 466 | 466 | $expr->andX( |
| 467 | - $expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'), |
|
| 468 | - $expr->emptyString($aliasRemoteCircle . '.instance'), |
|
| 469 | - $expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 467 | + $expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'), |
|
| 468 | + $expr->emptyString($aliasRemoteCircle.'.instance'), |
|
| 469 | + $expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 470 | 470 | ) |
| 471 | 471 | ); |
| 472 | 472 | $this->leftJoin( |
| 473 | 473 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner, |
| 474 | 474 | $expr->andX( |
| 475 | - $expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'), |
|
| 475 | + $expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'), |
|
| 476 | 476 | $expr->eq( |
| 477 | - $aliasRemoteCircleOwner . '.instance', |
|
| 477 | + $aliasRemoteCircleOwner.'.instance', |
|
| 478 | 478 | $this->createNamedParameter($remoteInstance->getInstance()) |
| 479 | 479 | ), |
| 480 | 480 | $expr->eq( |
| 481 | - $aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
| 481 | + $aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER) |
|
| 482 | 482 | ) |
| 483 | 483 | ) |
| 484 | 484 | ); |
@@ -511,16 +511,16 @@ discard block |
||
| 511 | 511 | $expr = $this->expr(); |
| 512 | 512 | $orX = $expr->orX(); |
| 513 | 513 | $orX->add( |
| 514 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBAL_SCALE)) |
|
| 514 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBAL_SCALE)) |
|
| 515 | 515 | ); |
| 516 | 516 | |
| 517 | 517 | $orExtOrPassive = $expr->orX(); |
| 518 | 518 | $orExtOrPassive->add( |
| 519 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
| 519 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL)) |
|
| 520 | 520 | ); |
| 521 | 521 | if (!$sensitive) { |
| 522 | 522 | $orExtOrPassive->add( |
| 523 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 523 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 524 | 524 | ); |
| 525 | 525 | } else { |
| 526 | 526 | if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) { |
@@ -529,8 +529,8 @@ discard block |
||
| 529 | 529 | } |
| 530 | 530 | |
| 531 | 531 | $orInstance = $expr->orX(); |
| 532 | - $orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance')); |
|
| 533 | - $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance')); |
|
| 532 | + $orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance')); |
|
| 533 | + $orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance')); |
|
| 534 | 534 | |
| 535 | 535 | $andExternal = $expr->andX(); |
| 536 | 536 | $andExternal->add($orExtOrPassive); |
@@ -539,13 +539,13 @@ discard block |
||
| 539 | 539 | $orExtOrTrusted = $expr->orX(); |
| 540 | 540 | $orExtOrTrusted->add($andExternal); |
| 541 | 541 | $orExtOrTrusted->add( |
| 542 | - $expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
| 542 | + $expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED)) |
|
| 543 | 543 | ); |
| 544 | 544 | |
| 545 | 545 | $andTrusted = $expr->andX(); |
| 546 | 546 | $andTrusted->add($orExtOrTrusted); |
| 547 | - $andTrusted->add($expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_FEDERATED)); |
|
| 548 | - $andTrusted->add($expr->emptyString($aliasOwner . '.instance')); |
|
| 547 | + $andTrusted->add($expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_FEDERATED)); |
|
| 548 | + $andTrusted->add($expr->emptyString($aliasOwner.'.instance')); |
|
| 549 | 549 | $orX->add($andTrusted); |
| 550 | 550 | |
| 551 | 551 | $this->andWhere($orX); |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | } |
| 573 | 573 | $this->leftJoin( |
| 574 | 574 | $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
| 575 | - $expr->eq($aliasMember . '.circle_id', $alias . '.unique_id') |
|
| 575 | + $expr->eq($aliasMember.'.circle_id', $alias.'.unique_id') |
|
| 576 | 576 | ); |
| 577 | 577 | |
| 578 | 578 | $this->filterDirectMembership($aliasMember, $member); |
@@ -593,28 +593,28 @@ discard block |
||
| 593 | 593 | |
| 594 | 594 | if ($member->getUserId() !== '') { |
| 595 | 595 | $andX->add( |
| 596 | - $expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId())) |
|
| 596 | + $expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId())) |
|
| 597 | 597 | ); |
| 598 | 598 | } |
| 599 | 599 | |
| 600 | 600 | if ($member->getSingleId() !== '') { |
| 601 | 601 | $andX->add( |
| 602 | - $expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId())) |
|
| 602 | + $expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId())) |
|
| 603 | 603 | ); |
| 604 | 604 | } |
| 605 | 605 | |
| 606 | 606 | if ($member->getUserType() > 0) { |
| 607 | 607 | $andX->add( |
| 608 | - $expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType())) |
|
| 608 | + $expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType())) |
|
| 609 | 609 | ); |
| 610 | 610 | } |
| 611 | 611 | |
| 612 | 612 | $andX->add( |
| 613 | - $expr->eq($aliasMember . '.instance', $this->createNamedParameter($this->getInstance($member))) |
|
| 613 | + $expr->eq($aliasMember.'.instance', $this->createNamedParameter($this->getInstance($member))) |
|
| 614 | 614 | ); |
| 615 | 615 | |
| 616 | 616 | if ($member->getLevel() > 0) { |
| 617 | - $andX->add($expr->gte($aliasMember . '.level', $this->createNamedParameter($member->getLevel()))); |
|
| 617 | + $andX->add($expr->gte($aliasMember.'.level', $this->createNamedParameter($member->getLevel()))); |
|
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | $this->andWhere($andX); |
@@ -647,7 +647,7 @@ discard block |
||
| 647 | 647 | |
| 648 | 648 | $this->leftJoin( |
| 649 | 649 | $alias, CoreRequestBuilder::TABLE_CIRCLE, $aliasCircle, |
| 650 | - $expr->eq($aliasCircle . '.unique_id', $alias . '.' . $field) |
|
| 650 | + $expr->eq($aliasCircle.'.unique_id', $alias.'.'.$field) |
|
| 651 | 651 | ); |
| 652 | 652 | |
| 653 | 653 | if (!is_null($initiator)) { |
@@ -689,7 +689,7 @@ discard block |
||
| 689 | 689 | $this->generateCircleSelectAlias($aliasBasedOn) |
| 690 | 690 | ->leftJoin( |
| 691 | 691 | $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn, |
| 692 | - $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id') |
|
| 692 | + $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id') |
|
| 693 | 693 | ); |
| 694 | 694 | |
| 695 | 695 | if (!is_null($initiator)) { |
@@ -722,9 +722,9 @@ discard block |
||
| 722 | 722 | ->leftJoin( |
| 723 | 723 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
| 724 | 724 | $expr->andX( |
| 725 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field), |
|
| 725 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field), |
|
| 726 | 726 | $expr->eq( |
| 727 | - $aliasMember . '.level', |
|
| 727 | + $aliasMember.'.level', |
|
| 728 | 728 | $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT) |
| 729 | 729 | ) |
| 730 | 730 | ) |
@@ -762,10 +762,10 @@ discard block |
||
| 762 | 762 | ->leftJoin( |
| 763 | 763 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember, |
| 764 | 764 | $expr->andX( |
| 765 | - $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId), |
|
| 766 | - $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId), |
|
| 765 | + $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId), |
|
| 766 | + $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId), |
|
| 767 | 767 | $expr->gte( |
| 768 | - $aliasMember . '.level', |
|
| 768 | + $aliasMember.'.level', |
|
| 769 | 769 | $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT) |
| 770 | 770 | ) |
| 771 | 771 | ) |
@@ -795,7 +795,7 @@ discard block |
||
| 795 | 795 | |
| 796 | 796 | $this->leftJoin( |
| 797 | 797 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
| 798 | - $expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field) |
|
| 798 | + $expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field) |
|
| 799 | 799 | ); |
| 800 | 800 | |
| 801 | 801 | // if (!$this->getBool('getData', $options, false)) { |
@@ -809,8 +809,8 @@ discard block |
||
| 809 | 809 | ->leftJoin( |
| 810 | 810 | $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
| 811 | 811 | $expr->andX( |
| 812 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'), |
|
| 813 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id') |
|
| 812 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'), |
|
| 813 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id') |
|
| 814 | 814 | ) |
| 815 | 815 | ); |
| 816 | 816 | |
@@ -827,12 +827,12 @@ discard block |
||
| 827 | 827 | $aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options); |
| 828 | 828 | $this->leftJoin( |
| 829 | 829 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership, |
| 830 | - $expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId)) |
|
| 830 | + $expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId)) |
|
| 831 | 831 | ); |
| 832 | 832 | |
| 833 | 833 | $orX = $expr->orX( |
| 834 | - $expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field), |
|
| 835 | - $expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId)) |
|
| 834 | + $expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field), |
|
| 835 | + $expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId)) |
|
| 836 | 836 | ); |
| 837 | 837 | |
| 838 | 838 | $this->andWhere($orX); |
@@ -852,7 +852,7 @@ discard block |
||
| 852 | 852 | |
| 853 | 853 | $expr = $this->expr(); |
| 854 | 854 | $aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS); |
| 855 | - $this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId))); |
|
| 855 | + $this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId))); |
|
| 856 | 856 | } |
| 857 | 857 | |
| 858 | 858 | |
@@ -876,7 +876,7 @@ discard block |
||
| 876 | 876 | $this->leftJoin( |
| 877 | 877 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
| 878 | 878 | // $expr->andX( |
| 879 | - $expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field) |
|
| 879 | + $expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field) |
|
| 880 | 880 | // $expr->eq($aliasMembership . '.single_id', $alias . '.single_id') |
| 881 | 881 | // ) |
| 882 | 882 | ); |
@@ -890,8 +890,8 @@ discard block |
||
| 890 | 890 | ->leftJoin( |
| 891 | 891 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom, |
| 892 | 892 | $expr->andX( |
| 893 | - $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'), |
|
| 894 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id') |
|
| 893 | + $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'), |
|
| 894 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id') |
|
| 895 | 895 | ) |
| 896 | 896 | ); |
| 897 | 897 | } |
@@ -939,10 +939,10 @@ discard block |
||
| 939 | 939 | $alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership, |
| 940 | 940 | $expr->andX( |
| 941 | 941 | $expr->eq( |
| 942 | - $aliasMembership . '.single_id', |
|
| 942 | + $aliasMembership.'.single_id', |
|
| 943 | 943 | $this->createNamedParameter($initiator->getSingleId()) |
| 944 | 944 | ), |
| 945 | - $expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field) |
|
| 945 | + $expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field) |
|
| 946 | 946 | ) |
| 947 | 947 | ); |
| 948 | 948 | |
@@ -955,8 +955,8 @@ discard block |
||
| 955 | 955 | $this->leftJoin( |
| 956 | 956 | $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator, |
| 957 | 957 | $expr->andX( |
| 958 | - $expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'), |
|
| 959 | - $expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id') |
|
| 958 | + $expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'), |
|
| 959 | + $expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id') |
|
| 960 | 960 | ) |
| 961 | 961 | ); |
| 962 | 962 | |
@@ -964,8 +964,8 @@ discard block |
||
| 964 | 964 | $this->leftJoin( |
| 965 | 965 | $aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy, |
| 966 | 966 | $expr->andX( |
| 967 | - $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'), |
|
| 968 | - $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id') |
|
| 967 | + $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'), |
|
| 968 | + $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id') |
|
| 969 | 969 | ) |
| 970 | 970 | ); |
| 971 | 971 | |
@@ -984,7 +984,7 @@ discard block |
||
| 984 | 984 | $aliasInheritedByMembership = $this->generateAlias($aliasInheritedBy, self::MEMBERSHIPS); |
| 985 | 985 | $this->generateMembershipSelectAlias($aliasMembership, $aliasInheritedByMembership); |
| 986 | 986 | } catch (RequestBuilderException $e) { |
| 987 | - \OC::$server->getLogger()->log(3, '-- ' . $e->getMessage()); |
|
| 987 | + \OC::$server->getLogger()->log(3, '-- '.$e->getMessage()); |
|
| 988 | 988 | } |
| 989 | 989 | } |
| 990 | 990 | |
@@ -1009,24 +1009,24 @@ discard block |
||
| 1009 | 1009 | $orX = $expr->orX(); |
| 1010 | 1010 | $orX->add( |
| 1011 | 1011 | $expr->andX( |
| 1012 | - $expr->gte($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 1012 | + $expr->gte($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)) |
|
| 1013 | 1013 | ) |
| 1014 | 1014 | ); |
| 1015 | 1015 | |
| 1016 | 1016 | if ($getPersonalCircle) { |
| 1017 | 1017 | $orX->add( |
| 1018 | 1018 | $expr->andX( |
| 1019 | - $expr->bitwiseAnd($alias . '.config', Circle::CFG_PERSONAL), |
|
| 1020 | - $expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
| 1019 | + $expr->bitwiseAnd($alias.'.config', Circle::CFG_PERSONAL), |
|
| 1020 | + $expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)) |
|
| 1021 | 1021 | ) |
| 1022 | 1022 | ); |
| 1023 | 1023 | } |
| 1024 | 1024 | if (!$mustBeMember) { |
| 1025 | - $orX->add($expr->bitwiseAnd($alias . '.config', Circle::CFG_VISIBLE)); |
|
| 1025 | + $orX->add($expr->bitwiseAnd($alias.'.config', Circle::CFG_VISIBLE)); |
|
| 1026 | 1026 | } |
| 1027 | 1027 | if ($canBeVisitor) { |
| 1028 | 1028 | // TODO: should find a better way, also filter on remote initiator on non-federated ? |
| 1029 | - $orX->add($expr->gte($alias . '.config', $this->createNamedParameter(0))); |
|
| 1029 | + $orX->add($expr->gte($alias.'.config', $this->createNamedParameter(0))); |
|
| 1030 | 1030 | } |
| 1031 | 1031 | $this->andWhere($orX); |
| 1032 | 1032 | |
@@ -1068,7 +1068,7 @@ discard block |
||
| 1068 | 1068 | $hide = $expr->andX(); |
| 1069 | 1069 | foreach (Circle::$DEF_CFG as $cfg => $v) { |
| 1070 | 1070 | if ($flag & $cfg) { |
| 1071 | - $hide->add($this->createFunction('NOT') . $expr->bitwiseAnd($aliasCircle . '.config', $cfg)); |
|
| 1071 | + $hide->add($this->createFunction('NOT').$expr->bitwiseAnd($aliasCircle.'.config', $cfg)); |
|
| 1072 | 1072 | } |
| 1073 | 1073 | } |
| 1074 | 1074 | |
@@ -1087,21 +1087,21 @@ discard block |
||
| 1087 | 1087 | $expr = $this->expr(); |
| 1088 | 1088 | $andPassive = $expr->andX(); |
| 1089 | 1089 | $andPassive->add( |
| 1090 | - $expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 1090 | + $expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE)) |
|
| 1091 | 1091 | ); |
| 1092 | 1092 | |
| 1093 | 1093 | $orMemberOrLevel = $expr->orX(); |
| 1094 | 1094 | $orMemberOrLevel->add( |
| 1095 | - $expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance') |
|
| 1095 | + $expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance') |
|
| 1096 | 1096 | ); |
| 1097 | 1097 | // TODO: do we need this ? (display members from the local instance) |
| 1098 | 1098 | $orMemberOrLevel->add( |
| 1099 | - $expr->emptyString($this->getDefaultSelectAlias() . '.instance') |
|
| 1099 | + $expr->emptyString($this->getDefaultSelectAlias().'.instance') |
|
| 1100 | 1100 | ); |
| 1101 | 1101 | |
| 1102 | 1102 | $orMemberOrLevel->add( |
| 1103 | 1103 | $expr->eq( |
| 1104 | - $this->getDefaultSelectAlias() . '.level', |
|
| 1104 | + $this->getDefaultSelectAlias().'.level', |
|
| 1105 | 1105 | $this->createNamedParameter(Member::LEVEL_OWNER) |
| 1106 | 1106 | ) |
| 1107 | 1107 | ); |
@@ -1117,7 +1117,7 @@ discard block |
||
| 1117 | 1117 | * @param int $flag |
| 1118 | 1118 | */ |
| 1119 | 1119 | public function filterConfig(string $aliasCircle, int $flag): void { |
| 1120 | - $this->andWhere($this->expr()->bitwiseAnd($aliasCircle . '.config', $flag)); |
|
| 1120 | + $this->andWhere($this->expr()->bitwiseAnd($aliasCircle.'.config', $flag)); |
|
| 1121 | 1121 | } |
| 1122 | 1122 | |
| 1123 | 1123 | |
@@ -1143,11 +1143,11 @@ discard block |
||
| 1143 | 1143 | ->generateSelectAlias(['id'], $aliasStorages, $aliasStorages, []) |
| 1144 | 1144 | ->leftJoin( |
| 1145 | 1145 | $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache, |
| 1146 | - $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid') |
|
| 1146 | + $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid') |
|
| 1147 | 1147 | ) |
| 1148 | 1148 | ->leftJoin( |
| 1149 | 1149 | $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages, |
| 1150 | - $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id') |
|
| 1150 | + $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id') |
|
| 1151 | 1151 | ); |
| 1152 | 1152 | } |
| 1153 | 1153 | |
@@ -1169,13 +1169,13 @@ discard block |
||
| 1169 | 1169 | $this->leftJoin( |
| 1170 | 1170 | $aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild, |
| 1171 | 1171 | $expr->andX( |
| 1172 | - $expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'), |
|
| 1173 | - $expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id') |
|
| 1172 | + $expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'), |
|
| 1173 | + $expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id') |
|
| 1174 | 1174 | ) |
| 1175 | 1175 | ); |
| 1176 | 1176 | |
| 1177 | - $this->selectAlias($aliasShareChild . '.id', 'child_id'); |
|
| 1178 | - $this->selectAlias($aliasShareChild . '.file_target', 'child_file_target'); |
|
| 1177 | + $this->selectAlias($aliasShareChild.'.id', 'child_id'); |
|
| 1178 | + $this->selectAlias($aliasShareChild.'.file_target', 'child_file_target'); |
|
| 1179 | 1179 | // $this->selectAlias($aliasShareParent . '.permissions', 'parent_perms'); |
| 1180 | 1180 | } |
| 1181 | 1181 | |
@@ -1189,12 +1189,12 @@ discard block |
||
| 1189 | 1189 | $expr = $this->expr(); |
| 1190 | 1190 | |
| 1191 | 1191 | $orX = $expr->orX( |
| 1192 | - $expr->eq($alias . '.uid_initiator', $this->createNamedParameter($federatedUser->getUserId())) |
|
| 1192 | + $expr->eq($alias.'.uid_initiator', $this->createNamedParameter($federatedUser->getUserId())) |
|
| 1193 | 1193 | ); |
| 1194 | 1194 | |
| 1195 | 1195 | if ($reshares) { |
| 1196 | 1196 | $orX->add( |
| 1197 | - $expr->eq($alias . '.uid_owner', $this->createNamedParameter($federatedUser->getUserId())) |
|
| 1197 | + $expr->eq($alias.'.uid_owner', $this->createNamedParameter($federatedUser->getUserId())) |
|
| 1198 | 1198 | ); |
| 1199 | 1199 | } |
| 1200 | 1200 | |
@@ -1219,13 +1219,13 @@ discard block |
||
| 1219 | 1219 | $this->leftJoin( |
| 1220 | 1220 | $aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint, |
| 1221 | 1221 | $expr->andX( |
| 1222 | - $expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'), |
|
| 1223 | - $expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id') |
|
| 1222 | + $expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'), |
|
| 1223 | + $expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id') |
|
| 1224 | 1224 | ) |
| 1225 | 1225 | ); |
| 1226 | 1226 | |
| 1227 | - $this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint'); |
|
| 1228 | - $this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash'); |
|
| 1227 | + $this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint'); |
|
| 1228 | + $this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash'); |
|
| 1229 | 1229 | } |
| 1230 | 1230 | |
| 1231 | 1231 | |
@@ -1325,10 +1325,10 @@ discard block |
||
| 1325 | 1325 | */ |
| 1326 | 1326 | public function generateAlias(string $base, string $extension, ?array &$options = []): string { |
| 1327 | 1327 | $search = str_replace('_', '.', $base); |
| 1328 | - $path = $search . '.' . $extension; |
|
| 1328 | + $path = $search.'.'.$extension; |
|
| 1329 | 1329 | if (!$this->validKey($path, self::$SQL_PATH) |
| 1330 | 1330 | && !in_array($extension, $this->getArray($search, self::$SQL_PATH))) { |
| 1331 | - throw new RequestBuilderException($extension . ' not found in ' . $search); |
|
| 1331 | + throw new RequestBuilderException($extension.' not found in '.$search); |
|
| 1332 | 1332 | } |
| 1333 | 1333 | |
| 1334 | 1334 | if (!is_array($options)) { |
@@ -1337,15 +1337,15 @@ discard block |
||
| 1337 | 1337 | |
| 1338 | 1338 | $optionPath = ''; |
| 1339 | 1339 | foreach (explode('.', $path) as $p) { |
| 1340 | - $optionPath = trim($optionPath . '.' . $p, '.'); |
|
| 1340 | + $optionPath = trim($optionPath.'.'.$p, '.'); |
|
| 1341 | 1341 | $options = array_merge( |
| 1342 | 1342 | $options, |
| 1343 | - $this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH), |
|
| 1344 | - $this->getArray($optionPath . '.' . self::OPTIONS, $this->options) |
|
| 1343 | + $this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH), |
|
| 1344 | + $this->getArray($optionPath.'.'.self::OPTIONS, $this->options) |
|
| 1345 | 1345 | ); |
| 1346 | 1346 | } |
| 1347 | 1347 | |
| 1348 | - return $base . '_' . $extension; |
|
| 1348 | + return $base.'_'.$extension; |
|
| 1349 | 1349 | } |
| 1350 | 1350 | |
| 1351 | 1351 | |
@@ -1365,7 +1365,7 @@ discard block |
||
| 1365 | 1365 | } else { |
| 1366 | 1366 | $k = $arr; |
| 1367 | 1367 | } |
| 1368 | - $path[$k] = $prefix . '_' . $k . '_'; |
|
| 1368 | + $path[$k] = $prefix.'_'.$k.'_'; |
|
| 1369 | 1369 | } |
| 1370 | 1370 | |
| 1371 | 1371 | return $path; |
