@@ -224,10 +224,10 @@ |
||
| 224 | 224 | * @return INC21QueryRow |
| 225 | 225 | */ |
| 226 | 226 | public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow { |
| 227 | - $this->setSingleId($this->get($prefix . 'member_id', $data)); |
|
| 228 | - $this->setUserId($this->get($prefix . 'user_id', $data)); |
|
| 229 | - $this->setUserType($this->getInt($prefix . 'user_type', $data)); |
|
| 230 | - $this->setInstance($this->get($prefix . 'instance', $data)); |
|
| 227 | + $this->setSingleId($this->get($prefix.'member_id', $data)); |
|
| 228 | + $this->setUserId($this->get($prefix.'user_id', $data)); |
|
| 229 | + $this->setUserType($this->getInt($prefix.'user_type', $data)); |
|
| 230 | + $this->setInstance($this->get($prefix.'instance', $data)); |
|
| 231 | 231 | |
| 232 | 232 | return $this; |
| 233 | 233 | } |
@@ -238,16 +238,16 @@ |
||
| 238 | 238 | try { |
| 239 | 239 | $test = new ReflectionClass($class); |
| 240 | 240 | } catch (ReflectionException $e) { |
| 241 | - throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage()); |
|
| 241 | + throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage()); |
|
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) { |
| 245 | - throw new FederatedEventException($class . ' does not implements IFederatedItem'); |
|
| 245 | + throw new FederatedEventException($class.' does not implements IFederatedItem'); |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | $item = OC::$server->get($class); |
| 249 | 249 | if (!($item instanceof IFederatedItem)) { |
| 250 | - throw new FederatedEventException($class . ' not an IFederatedItem'); |
|
| 250 | + throw new FederatedEventException($class.' not an IFederatedItem'); |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | $this->setFederatedEventBypass($event, $item); |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | try { |
| 105 | 105 | $level = Member::parseLevelString($levelString); |
| 106 | 106 | } catch (MemberLevelException $e) { |
| 107 | - throw new MemberHelperException('method ' . $levelString . ' not found'); |
|
| 107 | + throw new MemberHelperException('method '.$levelString.' not found'); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | $this->mustHaveLevelEqualOrAbove($level); |
@@ -122,11 +122,11 @@ discard block |
||
| 122 | 122 | try { |
| 123 | 123 | $level = Member::parseLevelString($levelString); |
| 124 | 124 | } catch (MemberLevelException $e) { |
| 125 | - throw new MemberHelperException('method ' . $levelString . ' not found'); |
|
| 125 | + throw new MemberHelperException('method '.$levelString.' not found'); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | if ($this->member->getLevel() >= $level) { |
| 129 | - throw new MemberLevelException('Member cannot be ' . $levelString); |
|
| 129 | + throw new MemberLevelException('Member cannot be '.$levelString); |
|
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | |
@@ -108,7 +108,7 @@ |
||
| 108 | 108 | $level = Member::parseLevelString($input->getArgument('level')); |
| 109 | 109 | $outcome = $this->memberService->memberLevel($memberId, $level); |
| 110 | 110 | |
| 111 | - echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n"; |
|
| 111 | + echo json_encode($outcome, JSON_PRETTY_PRINT)."\n"; |
|
| 112 | 112 | |
| 113 | 113 | return 0; |
| 114 | 114 | } |
@@ -106,7 +106,7 @@ |
||
| 106 | 106 | |
| 107 | 107 | $outcome = $this->memberService->removeMember($memberId); |
| 108 | 108 | |
| 109 | - echo json_encode($outcome, JSON_PRETTY_PRINT) . "\n"; |
|
| 109 | + echo json_encode($outcome, JSON_PRETTY_PRINT)."\n"; |
|
| 110 | 110 | |
| 111 | 111 | return 0; |
| 112 | 112 | } |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | |
| 262 | 262 | $request = new NC21Request('', $type); |
| 263 | 263 | if ($this->configService->isLocalInstance($instance)) { |
| 264 | - $this->configService->configureRequest($request, 'circles.Remote.' . $item, $params); |
|
| 264 | + $this->configService->configureRequest($request, 'circles.Remote.'.$item, $params); |
|
| 265 | 265 | } else { |
| 266 | 266 | $this->configService->configureRequest($request); |
| 267 | 267 | $link = $this->getRemoteInstanceEntry($instance, $item, $params); |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | public function getCachedRemoteInstance(string $instance): RemoteInstance { |
| 318 | 318 | $remoteInstance = $this->remoteRequest->getFromInstance($instance); |
| 319 | 319 | if ($remoteInstance->getType() === RemoteInstance::TYPE_UNKNOWN) { |
| 320 | - throw new UnknownRemoteException($instance . ' is set as \'unknown\' in database'); |
|
| 320 | + throw new UnknownRemoteException($instance.' is set as \'unknown\' in database'); |
|
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | return $remoteInstance; |
@@ -166,7 +166,7 @@ |
||
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | if ($input->getOption('json')) { |
| 169 | - echo json_encode($circles, JSON_PRETTY_PRINT) . "\n"; |
|
| 169 | + echo json_encode($circles, JSON_PRETTY_PRINT)."\n"; |
|
| 170 | 170 | |
| 171 | 171 | return 0; |
| 172 | 172 | } |
@@ -157,7 +157,7 @@ |
||
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - echo json_encode($circle, JSON_PRETTY_PRINT) . "\n"; |
|
| 160 | + echo json_encode($circle, JSON_PRETTY_PRINT)."\n"; |
|
| 161 | 161 | |
| 162 | 162 | return 0; |
| 163 | 163 | } |
@@ -121,7 +121,7 @@ |
||
| 121 | 121 | * @param string $name |
| 122 | 122 | * @param FederatedUser|null $owner |
| 123 | 123 | * |
| 124 | - * @return Circle |
|
| 124 | + * @return SimpleDataStore |
|
| 125 | 125 | * @throws FederatedEventException |
| 126 | 126 | * @throws InitiatorNotConfirmedException |
| 127 | 127 | * @throws InitiatorNotFoundException |