@@ -253,8 +253,8 @@ discard block |
||
253 | 253 | $qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $probe->getFilterMember()); |
254 | 254 | } |
255 | 255 | |
256 | - $qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc'); |
|
257 | - $qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc'); |
|
256 | + $qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc'); |
|
257 | + $qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc'); |
|
258 | 258 | |
259 | 259 | return $this->getItemsFromRequest($qb); |
260 | 260 | } |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | $qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId, $level); |
280 | 280 | |
281 | 281 | $aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS); |
282 | - $qb->orderBy($aliasMembership . '.inheritance_depth', 'asc'); |
|
282 | + $qb->orderBy($aliasMembership.'.inheritance_depth', 'asc'); |
|
283 | 283 | |
284 | 284 | return $this->getItemsFromRequest($qb); |
285 | 285 | } |
@@ -347,10 +347,10 @@ discard block |
||
347 | 347 | $qb = $this->getMemberSelectSql(); |
348 | 348 | $qb->limitToCircleId($circleId); |
349 | 349 | |
350 | - $qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance')); |
|
350 | + $qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance')); |
|
351 | 351 | |
352 | 352 | return array_map( |
353 | - function (Member $member): string { |
|
353 | + function(Member $member): string { |
|
354 | 354 | return $member->getInstance(); |
355 | 355 | }, $this->getItemsFromRequest($qb) |
356 | 356 | ); |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | */ |
401 | 401 | public function searchFederatedUsers(string $needle): array { |
402 | 402 | $qb = $this->getMemberSelectSql(); |
403 | - $qb->searchInDBField('user_id', '%' . $needle . '%'); |
|
403 | + $qb->searchInDBField('user_id', '%'.$needle.'%'); |
|
404 | 404 | |
405 | 405 | return $this->getItemsFromRequest($qb, true); |
406 | 406 | } |
@@ -80,7 +80,7 @@ |
||
80 | 80 | $qb->generateSelect(self::TABLE_CIRCLE, self::$tables[self::TABLE_CIRCLE], $alias); |
81 | 81 | |
82 | 82 | if (!$single) { |
83 | - $qb->orderBy($alias . '.creation', 'asc'); |
|
83 | + $qb->orderBy($alias.'.creation', 'asc'); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | return $qb; |
@@ -198,10 +198,10 @@ discard block |
||
198 | 198 | $qb->leftJoin( |
199 | 199 | CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember, |
200 | 200 | $expr->andX( |
201 | - $expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())), |
|
202 | - $expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'), |
|
201 | + $expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())), |
|
202 | + $expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'), |
|
203 | 203 | $expr->gte( |
204 | - $aliasMember . '.level', |
|
204 | + $aliasMember.'.level', |
|
205 | 205 | $qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT) |
206 | 206 | ) |
207 | 207 | ) |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | |
210 | 210 | $external = $expr->andX(); |
211 | 211 | $external->add($qb->exprLimit('type', RemoteInstance::TYPE_EXTERNAL, '', false)); |
212 | - $external->add($expr->isNotNull($aliasMember . '.instance')); |
|
212 | + $external->add($expr->isNotNull($aliasMember.'.instance')); |
|
213 | 213 | $orX->add($external); |
214 | 214 | } |
215 | 215 |
@@ -86,7 +86,7 @@ |
||
86 | 86 | self::$tables[self::TABLE_MEMBER], |
87 | 87 | CoreQueryBuilder::MEMBER |
88 | 88 | ) |
89 | - ->orderBy(CoreQueryBuilder::MEMBER . '.joined'); |
|
89 | + ->orderBy(CoreQueryBuilder::MEMBER.'.joined'); |
|
90 | 90 | |
91 | 91 | if ($getBasedOn) { |
92 | 92 | $qb->leftJoinBasedOn(CoreQueryBuilder::MEMBER, $initiator); |
@@ -187,11 +187,11 @@ discard block |
||
187 | 187 | $this->federatedUserService->commandLineInitiator($initiator, $initiatorType, $circleId, true); |
188 | 188 | $circle = $this->circleService->getCircle($circleId); |
189 | 189 | |
190 | - $output->writeln('<info>Name</info>: ' . $circle->getName()); |
|
190 | + $output->writeln('<info>Name</info>: '.$circle->getName()); |
|
191 | 191 | $owner = $circle->getOwner(); |
192 | - $output->writeln('<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance()); |
|
192 | + $output->writeln('<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance()); |
|
193 | 193 | $type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG)); |
194 | - $output->writeln('<info>Config</info>: ' . $type); |
|
194 | + $output->writeln('<info>Config</info>: '.$type); |
|
195 | 195 | $output->writeln(' '); |
196 | 196 | |
197 | 197 | $tree = new TreeNode(null, new SimpleDataStore(['circle' => $circle])); |
@@ -256,8 +256,7 @@ discard block |
||
256 | 256 | $member, |
257 | 257 | $this->input->getOption('display-name') |
258 | 258 | ), |
259 | - ($level > 0) ? Member::$DEF_LEVEL[$level] : |
|
260 | - '(' . strtolower($member->getStatus()) . ')', |
|
259 | + ($level > 0) ? Member::$DEF_LEVEL[$level] : '('.strtolower($member->getStatus()).')', |
|
261 | 260 | ($member->hasInvitedBy()) ? $this->configService->displayFederatedUser( |
262 | 261 | $member->getInvitedBy(), |
263 | 262 | $this->input->getOption('display-name') |
@@ -423,14 +422,14 @@ discard block |
||
423 | 422 | $member = $data->gObj('member', Member::class); |
424 | 423 | |
425 | 424 | if ($lineNumber === 1) { |
426 | - $line .= '<info>' . $member->getSingleId() . '</info>'; |
|
425 | + $line .= '<info>'.$member->getSingleId().'</info>'; |
|
427 | 426 | if (!$this->configService->isLocalInstance($member->getInstance())) { |
428 | - $line .= '@' . $member->getInstance(); |
|
427 | + $line .= '@'.$member->getInstance(); |
|
429 | 428 | } |
430 | - $line .= ' (' . Member::$DEF_LEVEL[$member->getLevel()] . ')'; |
|
429 | + $line .= ' ('.Member::$DEF_LEVEL[$member->getLevel()].')'; |
|
431 | 430 | |
432 | - $line .= ' <info>MemberId</info>: ' . $member->getId(); |
|
433 | - $line .= ' <info>Name</info>: ' . $this->configService->displayFederatedUser( |
|
431 | + $line .= ' <info>MemberId</info>: '.$member->getId(); |
|
432 | + $line .= ' <info>Name</info>: '.$this->configService->displayFederatedUser( |
|
434 | 433 | $member, |
435 | 434 | $this->input->getOption('display-name') |
436 | 435 | ); |
@@ -438,7 +437,7 @@ discard block |
||
438 | 437 | $line .= ' <info>Source</info>: ' |
439 | 438 | . Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()]; |
440 | 439 | } else { |
441 | - $line .= ' <info>Type</info>: ' . Member::$TYPE[$member->getUserType()]; |
|
440 | + $line .= ' <info>Type</info>: '.Member::$TYPE[$member->getUserType()]; |
|
442 | 441 | } |
443 | 442 | } |
444 | 443 | |
@@ -451,15 +450,15 @@ discard block |
||
451 | 450 | return $line; |
452 | 451 | } |
453 | 452 | $owner = $circle->getOwner(); |
454 | - $line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance(); |
|
453 | + $line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance(); |
|
455 | 454 | $type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG)); |
456 | - $line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type; |
|
455 | + $line .= ($type === '') ? '' : ' <info>Config</info>: '.$type; |
|
457 | 456 | } |
458 | 457 | } else { |
459 | 458 | if ($lineNumber === 1 && !is_null($circle)) { |
460 | - $line .= '<info>' . $circle->getSingleId() . '</info>'; |
|
459 | + $line .= '<info>'.$circle->getSingleId().'</info>'; |
|
461 | 460 | if (!$this->configService->isLocalInstance($circle->getInstance())) { |
462 | - $line .= '@' . $circle->getInstance(); |
|
461 | + $line .= '@'.$circle->getInstance(); |
|
463 | 462 | } |
464 | 463 | } |
465 | 464 | } |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | public function getInstance(): string { |
258 | 258 | $instance = $this->getHost(); |
259 | 259 | if ($this->getPort() > 0) { |
260 | - $instance .= ':' . $this->getPort(); |
|
260 | + $instance .= ':'.$this->getPort(); |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | return $instance; |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | if ($protocol === null) { |
282 | 282 | if (strpos($url, '/') > -1) { |
283 | 283 | [$address, $baseUrl] = explode('/', $url, 2); |
284 | - $this->setBaseUrl('/' . $baseUrl); |
|
284 | + $this->setBaseUrl('/'.$baseUrl); |
|
285 | 285 | } else { |
286 | 286 | $address = $url; |
287 | 287 | } |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | continue; |
392 | 392 | } |
393 | 393 | |
394 | - $url = str_replace(':' . $k, $this->data[$k], $url); |
|
394 | + $url = str_replace(':'.$k, $this->data[$k], $url); |
|
395 | 395 | } |
396 | 396 | |
397 | 397 | return $url; |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | continue; |
409 | 409 | } |
410 | 410 | |
411 | - $url = str_replace(':' . $k, $this->params[$k], $url); |
|
411 | + $url = str_replace(':'.$k, $this->params[$k], $url); |
|
412 | 412 | } |
413 | 413 | |
414 | 414 | return $url; |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | * @return string |
420 | 420 | */ |
421 | 421 | public function getPath(): string { |
422 | - return $this->baseUrl . $this->url; |
|
422 | + return $this->baseUrl.$this->url; |
|
423 | 423 | } |
424 | 424 | |
425 | 425 | |
@@ -436,9 +436,9 @@ discard block |
||
436 | 436 | * @return string |
437 | 437 | */ |
438 | 438 | public function getCompleteUrl(): string { |
439 | - $port = ($this->getPort() > 0) ? ':' . $this->getPort() : ''; |
|
439 | + $port = ($this->getPort() > 0) ? ':'.$this->getPort() : ''; |
|
440 | 440 | |
441 | - return $this->getUsedProtocol() . '://' . $this->getHost() . $port . $this->getParametersUrl(); |
|
441 | + return $this->getUsedProtocol().'://'.$this->getHost().$port.$this->getParametersUrl(); |
|
442 | 442 | } |
443 | 443 | |
444 | 444 | |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | public function addHeader($key, $value): Request { |
454 | 454 | $header = $this->get($key, $this->headers); |
455 | 455 | if ($header !== '') { |
456 | - $header .= ', ' . $value; |
|
456 | + $header .= ', '.$value; |
|
457 | 457 | } else { |
458 | 458 | $header = $value; |
459 | 459 | } |
@@ -683,11 +683,11 @@ discard block |
||
683 | 683 | |
684 | 684 | switch ($this->getQueryStringType()) { |
685 | 685 | case self::QS_VAR_ARRAY: |
686 | - return '?' . http_build_query($this->getParams()); |
|
686 | + return '?'.http_build_query($this->getParams()); |
|
687 | 687 | |
688 | 688 | case self::QS_VAR_DUPLICATE: |
689 | 689 | default: |
690 | - return '?' . preg_replace( |
|
690 | + return '?'.preg_replace( |
|
691 | 691 | '/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', http_build_query($this->getParams()) |
692 | 692 | ); |
693 | 693 | } |
@@ -169,10 +169,10 @@ |
||
169 | 169 | return $client->delete($request->getCompleteUrl(), $request->getClientOptions()); |
170 | 170 | case Request::TYPE_GET: |
171 | 171 | return $client->get( |
172 | - $request->getCompleteUrl() . $request->getQueryString(), $request->getClientOptions() |
|
172 | + $request->getCompleteUrl().$request->getQueryString(), $request->getClientOptions() |
|
173 | 173 | ); |
174 | 174 | default: |
175 | - throw new Exception('unknown request type ' . json_encode($request)); |
|
175 | + throw new Exception('unknown request type '.json_encode($request)); |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | } |
@@ -177,7 +177,7 @@ |
||
177 | 177 | // It seems that AccountManager use deprecated dispatcher, let's use a deprecated listener |
178 | 178 | $dispatcher = OC::$server->getEventDispatcher(); |
179 | 179 | $dispatcher->addListener( |
180 | - 'OC\AccountManager::userUpdated', function (GenericEvent $event) { |
|
180 | + 'OC\AccountManager::userUpdated', function(GenericEvent $event) { |
|
181 | 181 | /** @var IUser $user */ |
182 | 182 | $user = $event->getSubject(); |
183 | 183 | /** @var DeprecatedListener $deprecatedListener */ |
@@ -324,8 +324,8 @@ |
||
324 | 324 | int $nodeId, |
325 | 325 | string $probeSum |
326 | 326 | ): string { |
327 | - return $federatedUser->getSingleId() . '#' |
|
328 | - . $nodeId . '#' |
|
327 | + return $federatedUser->getSingleId().'#' |
|
328 | + . $nodeId.'#' |
|
329 | 329 | . $probeSum; |
330 | 330 | } |
331 | 331 | } |