@@ -296,7 +296,7 @@ |
||
296 | 296 | * @throws RequestBuilderException |
297 | 297 | */ |
298 | 298 | public function move(IShare $share, $recipient): IShare { |
299 | - OC::$server->getLogger()->log(3, 'CSP > move' . $share->getId() . ' ' . $recipient); |
|
299 | + OC::$server->getLogger()->log(3, 'CSP > move'.$share->getId().' '.$recipient); |
|
300 | 300 | |
301 | 301 | $federatedUser = $this->federatedUserService->getLocalFederatedUser($recipient); |
302 | 302 | $child = $this->shareWrapperService->getChild($share, $federatedUser); |
@@ -125,7 +125,7 @@ |
||
125 | 125 | } catch (FederatedItemException $e) { |
126 | 126 | if ($input->getOption('status-code')) { |
127 | 127 | throw new FederatedItemException( |
128 | - ' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage() |
|
128 | + ' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage() |
|
129 | 129 | ); |
130 | 130 | } |
131 | 131 |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | if (($userId = $input->getOption('user')) !== '') { |
124 | 124 | $federatedUser = $this->syncService->syncNextcloudUser($userId); |
125 | 125 | $output->writeln( |
126 | - '- Nextcloud User <info>' . $userId . '</info>/<info>' . $federatedUser->getSingleId() |
|
126 | + '- Nextcloud User <info>'.$userId.'</info>/<info>'.$federatedUser->getSingleId() |
|
127 | 127 | . '</info> synced' |
128 | 128 | ); |
129 | 129 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | if (($groupId = $input->getOption('group')) !== '') { |
137 | 137 | $circle = $this->syncService->syncNextcloudGroup($groupId); |
138 | 138 | $output->writeln( |
139 | - '- Nextcloud Group <info>' . $groupId . '</info>/<info>' . $circle->getSingleId() |
|
139 | + '- Nextcloud Group <info>'.$groupId.'</info>/<info>'.$circle->getSingleId() |
|
140 | 140 | . '</info> synced' |
141 | 141 | ); |
142 | 142 | } |
@@ -126,7 +126,7 @@ |
||
126 | 126 | } catch (FederatedItemException $e) { |
127 | 127 | if ($input->getOption('status-code')) { |
128 | 128 | throw new FederatedItemException( |
129 | - ' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage() |
|
129 | + ' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage() |
|
130 | 130 | ); |
131 | 131 | } |
132 | 132 |
@@ -117,7 +117,7 @@ |
||
117 | 117 | } catch (FederatedItemException $e) { |
118 | 118 | if ($input->getOption('status-code')) { |
119 | 119 | throw new FederatedItemException( |
120 | - ' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage() |
|
120 | + ' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage() |
|
121 | 121 | ); |
122 | 122 | } |
123 | 123 |
@@ -163,19 +163,19 @@ discard block |
||
163 | 163 | |
164 | 164 | $webfinger = $this->getWebfinger($host, Application::APP_SUBJECT); |
165 | 165 | if ($this->input->getOption('all')) { |
166 | - $this->output->writeln('- Webfinger on <info>' . $host . '</info>'); |
|
166 | + $this->output->writeln('- Webfinger on <info>'.$host.'</info>'); |
|
167 | 167 | $this->output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
168 | 168 | $this->output->writeln(''); |
169 | 169 | } |
170 | 170 | |
171 | 171 | if ($this->input->getOption('all')) { |
172 | 172 | $circleLink = $this->extractLink(Application::APP_REL, $webfinger); |
173 | - $this->output->writeln('- Information about Circles app on <info>' . $host . '</info>'); |
|
173 | + $this->output->writeln('- Information about Circles app on <info>'.$host.'</info>'); |
|
174 | 174 | $this->output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
175 | 175 | $this->output->writeln(''); |
176 | 176 | } |
177 | 177 | |
178 | - $this->output->writeln('- Available services on <info>' . $host . '</info>'); |
|
178 | + $this->output->writeln('- Available services on <info>'.$host.'</info>'); |
|
179 | 179 | foreach ($webfinger->getLinks() as $link) { |
180 | 180 | $app = $link->getProperty('name'); |
181 | 181 | $ver = $link->getProperty('version'); |
@@ -183,14 +183,14 @@ discard block |
||
183 | 183 | $app .= ' '; |
184 | 184 | } |
185 | 185 | if ($ver !== '') { |
186 | - $ver = 'v' . $ver; |
|
186 | + $ver = 'v'.$ver; |
|
187 | 187 | } |
188 | 188 | |
189 | - $this->output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver); |
|
189 | + $this->output->writeln(' * '.$link->getRel().' '.$app.$ver); |
|
190 | 190 | } |
191 | 191 | $this->output->writeln(''); |
192 | 192 | |
193 | - $this->output->writeln('- Resources related to Circles on <info>' . $host . '</info>'); |
|
193 | + $this->output->writeln('- Resources related to Circles on <info>'.$host.'</info>'); |
|
194 | 194 | $resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL); |
195 | 195 | $this->output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
196 | 196 | $this->output->writeln(''); |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | |
199 | 199 | $tempUid = $resource->g('uid'); |
200 | 200 | $this->output->writeln( |
201 | - '- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>' |
|
201 | + '- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>' |
|
202 | 202 | ); |
203 | 203 | |
204 | 204 | try { |
@@ -206,15 +206,15 @@ discard block |
||
206 | 206 | $this->output->writeln(' * No SignatureException: <info>Identity authed</info>'); |
207 | 207 | } catch (SignatureException $e) { |
208 | 208 | $this->output->writeln( |
209 | - '<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>' |
|
209 | + '<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>' |
|
210 | 210 | ); |
211 | 211 | |
212 | 212 | return; |
213 | 213 | } |
214 | 214 | |
215 | - $this->output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>'); |
|
215 | + $this->output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>'); |
|
216 | 216 | if ($remoteSignatory->getUid(true) !== $tempUid) { |
217 | - $this->output->writeln('<error>looks like ' . $host . ' is faking its identity'); |
|
217 | + $this->output->writeln('<error>looks like '.$host.' is faking its identity'); |
|
218 | 218 | |
219 | 219 | return; |
220 | 220 | } |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | $this->output->writeln(''); |
223 | 223 | |
224 | 224 | $testUrl = $resource->g('test'); |
225 | - $this->output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>'); |
|
225 | + $this->output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>'); |
|
226 | 226 | |
227 | 227 | try { |
228 | 228 | $localSignatory = $this->remoteStreamService->getAppSignatory(); |
@@ -244,18 +244,18 @@ discard block |
||
244 | 244 | $this->output->writeln(''); |
245 | 245 | |
246 | 246 | $this->output->writeln(' * Clear Signature: '); |
247 | - $this->output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>'); |
|
247 | + $this->output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>'); |
|
248 | 248 | $this->output->writeln(''); |
249 | 249 | |
250 | 250 | $this->output->writeln(' * Signed Signature (base64 encoded): '); |
251 | 251 | $this->output->writeln( |
252 | - '<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>' |
|
252 | + '<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>' |
|
253 | 253 | ); |
254 | 254 | $this->output->writeln(''); |
255 | 255 | |
256 | 256 | $result = $signedRequest->getOutgoingRequest()->getResult(); |
257 | 257 | $code = $result->getStatusCode(); |
258 | - $this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . $code . '</info>' : $code)); |
|
258 | + $this->output->writeln(' * Result: '.(($code === 200) ? '<info>'.$code.'</info>' : $code)); |
|
259 | 259 | $this->output->writeln( |
260 | 260 | json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) |
261 | 261 | ); |
@@ -276,13 +276,13 @@ discard block |
||
276 | 276 | $stored = new RemoteInstance(); |
277 | 277 | $this->remoteStreamService->confirmValidRemote($remoteSignatory, $stored); |
278 | 278 | $this->output->writeln( |
279 | - '<info>The remote instance ' . $host |
|
279 | + '<info>The remote instance '.$host |
|
280 | 280 | . ' is already known with this current identity</info>' |
281 | 281 | ); |
282 | 282 | |
283 | 283 | if ($remoteSignatory->getType() !== $stored->getType()) { |
284 | 284 | $this->output->writeln( |
285 | - '- updating type from ' . $stored->getType() . ' to ' |
|
285 | + '- updating type from '.$stored->getType().' to ' |
|
286 | 286 | . $remoteSignatory->getType() |
287 | 287 | ); |
288 | 288 | $this->remoteStreamService->update( |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | |
293 | 293 | if ($remoteSignatory->getInstance() !== $stored->getInstance()) { |
294 | 294 | $this->output->writeln( |
295 | - '- updating host from ' . $stored->getInstance() . ' to ' |
|
295 | + '- updating host from '.$stored->getInstance().' to ' |
|
296 | 296 | . $remoteSignatory->getInstance() |
297 | 297 | ); |
298 | 298 | $this->remoteStreamService->update( |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | } |
302 | 302 | if ($remoteSignatory->getId() !== $stored->getId()) { |
303 | 303 | $this->output->writeln( |
304 | - '- updating href/Id from ' . $stored->getId() . ' to ' |
|
304 | + '- updating href/Id from '.$stored->getId().' to ' |
|
305 | 305 | . $remoteSignatory->getId() |
306 | 306 | ); |
307 | 307 | $this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF); |
@@ -327,10 +327,10 @@ discard block |
||
327 | 327 | $helper = $this->getHelper('question'); |
328 | 328 | |
329 | 329 | $this->output->writeln( |
330 | - 'The remote instance <info>' . $remoteSignatory->getInstance() . '</info> looks good.' |
|
330 | + 'The remote instance <info>'.$remoteSignatory->getInstance().'</info> looks good.' |
|
331 | 331 | ); |
332 | 332 | $question = new ConfirmationQuestion( |
333 | - 'Would you like to identify this remote instance as \'' . $remoteSignatory->getType() |
|
333 | + 'Would you like to identify this remote instance as \''.$remoteSignatory->getType() |
|
334 | 334 | . '\' ? (y/N) ', |
335 | 335 | false, |
336 | 336 | '/^(y|Y)/i' |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | $helper = $this->getHelper('question'); |
354 | 354 | |
355 | 355 | $this->output->writeln( |
356 | - 'The remote instance <info>' . $remoteSignatory->getInstance() |
|
356 | + 'The remote instance <info>'.$remoteSignatory->getInstance() |
|
357 | 357 | . '</info> is known but <error>its identity has changed.</error>' |
358 | 358 | ); |
359 | 359 | $this->output->writeln( |
@@ -431,13 +431,13 @@ discard block |
||
431 | 431 | if ($this->configService->isLocalInstance($instance)) { |
432 | 432 | return; |
433 | 433 | } |
434 | - $this->output->write('Adding <comment>' . $instance . '</comment>: '); |
|
434 | + $this->output->write('Adding <comment>'.$instance.'</comment>: '); |
|
435 | 435 | try { |
436 | 436 | $this->remoteStreamService->addRemoteInstance($instance, RemoteInstance::TYPE_GLOBAL_SCALE, true); |
437 | 437 | $this->output->writeln('<info>ok</info>'); |
438 | 438 | } catch (Exception $e) { |
439 | - $msg = ($e->getMessage() === '') ? '' : ' (' . $e->getMessage() . ')'; |
|
440 | - $this->output->writeln('<error>' . get_class($e) . $msg . '</error>'); |
|
439 | + $msg = ($e->getMessage() === '') ? '' : ' ('.$e->getMessage().')'; |
|
440 | + $this->output->writeln('<error>'.get_class($e).$msg.'</error>'); |
|
441 | 441 | } |
442 | 442 | } |
443 | 443 | |
@@ -455,12 +455,12 @@ discard block |
||
455 | 455 | try { |
456 | 456 | $current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance()); |
457 | 457 | if ($current->getUid(true) === $instance->getUid(true)) { |
458 | - $currentUid = '<info>' . $current->getUid(true) . '</info>'; |
|
458 | + $currentUid = '<info>'.$current->getUid(true).'</info>'; |
|
459 | 459 | } else { |
460 | - $currentUid = '<error>' . $current->getUid(true) . '</error>'; |
|
460 | + $currentUid = '<error>'.$current->getUid(true).'</error>'; |
|
461 | 461 | } |
462 | 462 | } catch (Exception $e) { |
463 | - $currentUid = '<error>' . $e->getMessage() . '</error>'; |
|
463 | + $currentUid = '<error>'.$e->getMessage().'</error>'; |
|
464 | 464 | } |
465 | 465 | |
466 | 466 | $table->appendRow( |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | } |
486 | 486 | } |
487 | 487 | |
488 | - throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE)); |
|
488 | + throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE)); |
|
489 | 489 | } |
490 | 490 | |
491 | 491 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | } catch (FederatedItemException $e) { |
145 | 145 | if ($input->getOption('status-code')) { |
146 | 146 | throw new FederatedItemException( |
147 | - ' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage() |
|
147 | + ' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage() |
|
148 | 148 | ); |
149 | 149 | } |
150 | 150 | |
@@ -176,8 +176,8 @@ discard block |
||
176 | 176 | $value = array_search(strtoupper($item), $valid); |
177 | 177 | if (!$value) { |
178 | 178 | throw new InvalidArgumentException( |
179 | - 'Invalid config \'' . $item . '\'. Available values: ' |
|
180 | - . implode(', ', array_values($valid)) . '. ' |
|
179 | + 'Invalid config \''.$item.'\'. Available values: ' |
|
180 | + . implode(', ', array_values($valid)).'. ' |
|
181 | 181 | . 'To disable a config, start the value with an underscore' |
182 | 182 | ); |
183 | 183 | } |
@@ -162,7 +162,7 @@ |
||
162 | 162 | } catch (FederatedItemException $e) { |
163 | 163 | if ($input->getOption('status-code')) { |
164 | 164 | throw new FederatedItemException( |
165 | - ' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage() |
|
165 | + ' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage() |
|
166 | 166 | ); |
167 | 167 | } |
168 | 168 |
@@ -150,7 +150,7 @@ |
||
150 | 150 | } catch (FederatedItemException $e) { |
151 | 151 | if ($input->getOption('status-code')) { |
152 | 152 | throw new FederatedItemException( |
153 | - ' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage() |
|
153 | + ' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage() |
|
154 | 154 | ); |
155 | 155 | } |
156 | 156 |