@@ -82,14 +82,14 @@ |
||
82 | 82 | */ |
83 | 83 | public function output(string $message, bool $advance = false): void { |
84 | 84 | if (!is_null($this->occOutput)) { |
85 | - $this->occOutput->writeln((($advance) ? '+' : '-') . ' ' . $message); |
|
85 | + $this->occOutput->writeln((($advance) ? '+' : '-').' '.$message); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | if (!is_null($this->migrationOutput)) { |
89 | 89 | if ($advance) { |
90 | - $this->migrationOutput->advance(1, '(Circles) ' . $message); |
|
90 | + $this->migrationOutput->advance(1, '(Circles) '.$message); |
|
91 | 91 | } else { |
92 | - $this->migrationOutput->info('(Circles) ' . $message); |
|
92 | + $this->migrationOutput->info('(Circles) '.$message); |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 | } |
@@ -194,7 +194,7 @@ |
||
194 | 194 | throw new OCSException('works only from local instance', 404); |
195 | 195 | } |
196 | 196 | |
197 | - $userId = $currentUser->getUserId() . '/' . $userId; |
|
197 | + $userId = $currentUser->getUserId().'/'.$userId; |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | $federatedUser = $this->federatedUserService->generateFederatedUser($userId, $type); |
@@ -251,7 +251,7 @@ |
||
251 | 251 | } |
252 | 252 | |
253 | 253 | $members = array_map( |
254 | - function (FederatedUser $federatedUser) use ($patron) { |
|
254 | + function(FederatedUser $federatedUser) use ($patron) { |
|
255 | 255 | $member = new Member(); |
256 | 256 | $member->importFromIFederatedUser($federatedUser); |
257 | 257 | $member->setInvitedBy($patron); |
@@ -174,7 +174,7 @@ |
||
174 | 174 | */ |
175 | 175 | private function getFailedEvents(array $retryRange): array { |
176 | 176 | $token = array_map( |
177 | - function (EventWrapper $event): string { |
|
177 | + function(EventWrapper $event): string { |
|
178 | 178 | return $event->getToken(); |
179 | 179 | }, $this->eventWrapperRequest->getFailedEvents($retryRange) |
180 | 180 | ); |
@@ -85,35 +85,35 @@ |
||
85 | 85 | |
86 | 86 | $eventType = ($event->getType() === CircleGenericEvent::INVITED) ? 'invited' : 'joined'; |
87 | 87 | |
88 | - $info = 'A new member have been added (' . $eventType . ') to a Circle. '; |
|
88 | + $info = 'A new member have been added ('.$eventType.') to a Circle. '; |
|
89 | 89 | |
90 | - $info .= 'userId: ' . $member->getUserId() . '; userType: ' . Member::$TYPE[$member->getUserType()] |
|
91 | - . '; singleId: ' . $member->getSingleId() . '; memberId: ' . $member->getId() |
|
92 | - . '; isLocal: ' . json_encode($member->isLocal()) . '; level: ' |
|
93 | - . Member::$DEF_LEVEL[$member->getLevel()] . '; '; |
|
90 | + $info .= 'userId: '.$member->getUserId().'; userType: '.Member::$TYPE[$member->getUserType()] |
|
91 | + . '; singleId: '.$member->getSingleId().'; memberId: '.$member->getId() |
|
92 | + . '; isLocal: '.json_encode($member->isLocal()).'; level: ' |
|
93 | + . Member::$DEF_LEVEL[$member->getLevel()].'; '; |
|
94 | 94 | |
95 | 95 | $memberships = array_map( |
96 | - function (Membership $membership) { |
|
96 | + function(Membership $membership) { |
|
97 | 97 | return $membership->getCircleId(); |
98 | 98 | }, $circle->getMemberships() |
99 | 99 | ); |
100 | 100 | |
101 | 101 | $listMemberships = (count($memberships) > 0) ? implode(', ', $memberships) : 'none'; |
102 | - $info .= 'circleName: ' . $circle->getDisplayName() . '; circleId: ' . $circle->getSingleId() |
|
103 | - . '; Circle memberships: ' . $listMemberships . '.'; |
|
102 | + $info .= 'circleName: '.$circle->getDisplayName().'; circleId: '.$circle->getSingleId() |
|
103 | + . '; Circle memberships: '.$listMemberships.'.'; |
|
104 | 104 | |
105 | 105 | if ($member->getUserType() === Member::TYPE_CIRCLE) { |
106 | 106 | $basedOn = $member->getBasedOn(); |
107 | 107 | $members = array_map( |
108 | - function (Member $member) { |
|
109 | - return $member->getUserId() . ' (' . Member::$TYPE[$member->getUserType()] . ')'; |
|
108 | + function(Member $member) { |
|
109 | + return $member->getUserId().' ('.Member::$TYPE[$member->getUserType()].')'; |
|
110 | 110 | }, $basedOn->getInheritedMembers() |
111 | 111 | ); |
112 | 112 | |
113 | - $info .= ' Member is a Circle (singleId: ' . $basedOn->getSingleId() |
|
114 | - . ') that contains those inherited members: ' . implode(', ', $members); |
|
113 | + $info .= ' Member is a Circle (singleId: '.$basedOn->getSingleId() |
|
114 | + . ') that contains those inherited members: '.implode(', ', $members); |
|
115 | 115 | } |
116 | 116 | |
117 | - $this->log(3, $prefix . $info); |
|
117 | + $this->log(3, $prefix.$info); |
|
118 | 118 | } |
119 | 119 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | return $mountPoint; |
153 | 153 | } |
154 | 154 | |
155 | - return '/' . $userId . '/files/' . ltrim($mountPoint, '/'); |
|
155 | + return '/'.$userId.'/files/'.ltrim($mountPoint, '/'); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | /** |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | public function toMount(string $userId, string $protocol = 'https'): array { |
292 | 292 | return [ |
293 | 293 | 'owner' => $this->getOwner(), |
294 | - 'remote' => $protocol . '://' . $this->getInstance(), |
|
294 | + 'remote' => $protocol.'://'.$this->getInstance(), |
|
295 | 295 | 'token' => $this->getToken(), |
296 | 296 | 'share_token' => $this->getToken(), |
297 | 297 | 'password' => $this->getPassword(), |
@@ -409,12 +409,12 @@ discard block |
||
409 | 409 | throw new UnknownInterfaceException('misconfigured scheme'); |
410 | 410 | } |
411 | 411 | |
412 | - $base = $scheme . '://' . $this->getCloudInstance($interface) . $path; |
|
412 | + $base = $scheme.'://'.$this->getCloudInstance($interface).$path; |
|
413 | 413 | if ($route === '') { |
414 | 414 | return $base; |
415 | 415 | } |
416 | 416 | |
417 | - return $base . $this->configService->linkToRoute($route, $args); |
|
417 | + return $base.$this->configService->linkToRoute($route, $args); |
|
418 | 418 | } |
419 | 419 | |
420 | 420 | |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | return $this->configService->getLoopbackPath($route, $args); |
448 | 448 | } |
449 | 449 | |
450 | - return rtrim($base, '/') . $this->configService->linkToRoute($route, $args); |
|
450 | + return rtrim($base, '/').$this->configService->linkToRoute($route, $args); |
|
451 | 451 | } |
452 | 452 | |
453 | 453 |
@@ -338,10 +338,10 @@ |
||
338 | 338 | protected function generateMember(FederatedEvent $event, Circle $circle, Member $member): Member { |
339 | 339 | try { |
340 | 340 | if ($member->getSingleId() !== '') { |
341 | - $userId = $member->getSingleId() . '@' . $member->getInstance(); |
|
341 | + $userId = $member->getSingleId().'@'.$member->getInstance(); |
|
342 | 342 | $federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_SINGLE); |
343 | 343 | } else { |
344 | - $userId = $member->getUserId() . '@' . $member->getInstance(); |
|
344 | + $userId = $member->getUserId().'@'.$member->getInstance(); |
|
345 | 345 | $federatedUser = $this->federatedUserService->getFederatedUser( |
346 | 346 | $userId, |
347 | 347 | $member->getUserType() |
@@ -281,17 +281,17 @@ |
||
281 | 281 | * @throws ShareTokenNotFoundException |
282 | 282 | */ |
283 | 283 | public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { |
284 | - if ($this->get($prefix . 'token', $data) === '') { |
|
284 | + if ($this->get($prefix.'token', $data) === '') { |
|
285 | 285 | throw new ShareTokenNotFoundException(); |
286 | 286 | } |
287 | 287 | |
288 | - $this->setShareId($this->getInt($prefix . 'share_id', $data)); |
|
289 | - $this->setCircleId($this->get($prefix . 'circle_id', $data)); |
|
290 | - $this->setSingleId($this->get($prefix . 'single_id', $data)); |
|
291 | - $this->setMemberId($this->get($prefix . 'member_id', $data)); |
|
292 | - $this->setToken($this->get($prefix . 'token', $data)); |
|
293 | - $this->setPassword($this->get($prefix . 'password', $data)); |
|
294 | - $this->setAccepted($this->getInt($prefix . 'accepted', $data, IShare::STATUS_PENDING)); |
|
288 | + $this->setShareId($this->getInt($prefix.'share_id', $data)); |
|
289 | + $this->setCircleId($this->get($prefix.'circle_id', $data)); |
|
290 | + $this->setSingleId($this->get($prefix.'single_id', $data)); |
|
291 | + $this->setMemberId($this->get($prefix.'member_id', $data)); |
|
292 | + $this->setToken($this->get($prefix.'token', $data)); |
|
293 | + $this->setPassword($this->get($prefix.'password', $data)); |
|
294 | + $this->setAccepted($this->getInt($prefix.'accepted', $data, IShare::STATUS_PENDING)); |
|
295 | 295 | |
296 | 296 | return $this; |
297 | 297 | } |