@@ -91,11 +91,11 @@ |
||
| 91 | 91 | |
| 92 | 92 | $circle = $event->getCircle(); |
| 93 | 93 | $member = $event->getMember(); |
| 94 | - $info .= 'circleId: ' . $circle->getSingleId() . '; userId: ' . $member->getUserId() . '; userType: ' |
|
| 95 | - . Member::$TYPE[$member->getUserType()] . '; singleId: ' . $member->getSingleId() |
|
| 96 | - . '; memberId: ' . $member->getId() . '; isLocal: ' . json_encode($member->isLocal()) . '; '; |
|
| 94 | + $info .= 'circleId: '.$circle->getSingleId().'; userId: '.$member->getUserId().'; userType: ' |
|
| 95 | + . Member::$TYPE[$member->getUserType()].'; singleId: '.$member->getSingleId() |
|
| 96 | + . '; memberId: '.$member->getId().'; isLocal: '.json_encode($member->isLocal()).'; '; |
|
| 97 | 97 | |
| 98 | - $this->log(3, $prefix . $info); |
|
| 98 | + $this->log(3, $prefix.$info); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | } |
@@ -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); |
@@ -245,16 +245,16 @@ discard block |
||
| 245 | 245 | try { |
| 246 | 246 | $test = new ReflectionClass($class); |
| 247 | 247 | } catch (ReflectionException $e) { |
| 248 | - throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage()); |
|
| 248 | + throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage()); |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) { |
| 252 | - throw new FederatedEventException($class . ' does not implements IFederatedItem'); |
|
| 252 | + throw new FederatedEventException($class.' does not implements IFederatedItem'); |
|
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | $item = OC::$server->get($class); |
| 256 | 256 | if (!($item instanceof IFederatedItem)) { |
| 257 | - throw new FederatedEventException($class . ' not an IFederatedItem'); |
|
| 257 | + throw new FederatedEventException($class.' not an IFederatedItem'); |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | if ($item instanceof IFederatedItemHighSeverity) { |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | $knownInstances = $this->memberRequest->getMemberInstances($circle->getSingleId()); |
| 451 | 451 | $instances = array_filter( |
| 452 | 452 | array_map( |
| 453 | - function (RemoteInstance $instance) use ($knownInstances) { |
|
| 453 | + function(RemoteInstance $instance) use ($knownInstances) { |
|
| 454 | 454 | if (!in_array($instance->getInstance(), $knownInstances)) { |
| 455 | 455 | return null; |
| 456 | 456 | } |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | if ($event->hasMember() |
| 466 | 466 | && !$this->configService->isLocalInstance($event->getMember()->getInstance())) { |
| 467 | 467 | $currentInstances = array_map( |
| 468 | - function (RemoteInstance $instance): string { |
|
| 468 | + function(RemoteInstance $instance): string { |
|
| 469 | 469 | return $instance->getInstance(); |
| 470 | 470 | }, $instances |
| 471 | 471 | ); |
@@ -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 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $prefix = '[Example Event] (ExampleMembershipsRemoved) '; |
| 93 | 93 | |
| 94 | 94 | $memberships = array_map( |
| 95 | - function (Membership $membership) { |
|
| 95 | + function(Membership $membership) { |
|
| 96 | 96 | $inheritance = ($membership->getInheritanceDepth() > 1) ? |
| 97 | 97 | 'an inherited member' : 'a direct member'; |
| 98 | 98 | try { |
@@ -100,15 +100,15 @@ discard block |
||
| 100 | 100 | } catch (Exception $e) { |
| 101 | 101 | $this->e($e); |
| 102 | 102 | |
| 103 | - return $membership->getSingleId() . ' is not ' . $inheritance . ' of ' |
|
| 104 | - . $membership->getCircleId() . ' anymore'; |
|
| 103 | + return $membership->getSingleId().' is not '.$inheritance.' of ' |
|
| 104 | + . $membership->getCircleId().' anymore'; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - return $federatedUser->getUserId() . ' (' . Member::$TYPE[$federatedUser->getUserType()] |
|
| 108 | - . ') is not ' . $inheritance . ' of ' . $membership->getCircleId() . ' anymore'; |
|
| 107 | + return $federatedUser->getUserId().' ('.Member::$TYPE[$federatedUser->getUserType()] |
|
| 108 | + . ') is not '.$inheritance.' of '.$membership->getCircleId().' anymore'; |
|
| 109 | 109 | }, $event->getMemberships() |
| 110 | 110 | ); |
| 111 | 111 | |
| 112 | - $this->log(3, $prefix . implode('. ', $memberships)); |
|
| 112 | + $this->log(3, $prefix.implode('. ', $memberships)); |
|
| 113 | 113 | } |
| 114 | 114 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $prefix = '[Example Event] (ExampleMembershipsCreated) '; |
| 93 | 93 | |
| 94 | 94 | $memberships = array_map( |
| 95 | - function (Membership $membership) { |
|
| 95 | + function(Membership $membership) { |
|
| 96 | 96 | $inheritance = ($membership->getInheritanceDepth() > 1) ? |
| 97 | 97 | 'an inherited member' : 'a direct member'; |
| 98 | 98 | try { |
@@ -100,15 +100,15 @@ discard block |
||
| 100 | 100 | } catch (Exception $e) { |
| 101 | 101 | $this->e($e); |
| 102 | 102 | |
| 103 | - return $membership->getSingleId() . ' is now ' . $inheritance . ' of ' |
|
| 103 | + return $membership->getSingleId().' is now '.$inheritance.' of ' |
|
| 104 | 104 | . $membership->getCircleId(); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - return $federatedUser->getUserId() . ' (' . Member::$TYPE[$federatedUser->getUserType()] |
|
| 108 | - . ') is now ' . $inheritance . ' of ' . $membership->getCircleId(); |
|
| 107 | + return $federatedUser->getUserId().' ('.Member::$TYPE[$federatedUser->getUserType()] |
|
| 108 | + . ') is now '.$inheritance.' of '.$membership->getCircleId(); |
|
| 109 | 109 | }, $event->getMemberships() |
| 110 | 110 | ); |
| 111 | 111 | |
| 112 | - $this->log(3, $prefix . implode('. ', $memberships)); |
|
| 112 | + $this->log(3, $prefix.implode('. ', $memberships)); |
|
| 113 | 113 | } |
| 114 | 114 | } |